1.1-13 Update

This commit is contained in:
Arcaratus committed 2015-07-01 16:04:09 -04:00
1 parent b1584702c6
commit 672c7803be
159 files changed
+1778 -531

No files matched your search

@@ -1,22 +1,25 @@
package com.arc.bloodarsenal;
package com.arc.bloodarsenal.client;
import com.arc.bloodarsenal.block.ModBlocks;
import com.arc.bloodarsenal.entity.EntityBloodTNT;
import com.arc.bloodarsenal.entity.mob.EntityBloodHound;
import com.arc.bloodarsenal.entity.projectile.EntityBloodBall;
import com.arc.bloodarsenal.entity.projectile.EntityGatlingProjectile;
import com.arc.bloodarsenal.items.ModItems;
import com.arc.bloodarsenal.items.sigil.SigilUtils;
import com.arc.bloodarsenal.misc.VersionChecker;
import com.arc.bloodarsenal.renderer.block.*;
import com.arc.bloodarsenal.renderer.entity.RenderEntityBloodHound;
import com.arc.bloodarsenal.renderer.item.ItemRenderGatling;
import com.arc.bloodarsenal.renderer.item.RenderBow;
import com.arc.bloodarsenal.renderer.projectile.RenderEntityGatlingProjectile;
import com.arc.bloodarsenal.renderer.block.TilePortableAltarRenderer;
import com.arc.bloodarsenal.renderer.block.item.TilePortableAltarItemRenderer;
import com.arc.bloodarsenal.tileentity.TileLifeInfuser;
import com.arc.bloodarsenal.tileentity.TilePortableAltar;
import com.arc.bloodarsenal.common.BloodArsenalConfig;
import com.arc.bloodarsenal.common.CommonProxy;
import com.arc.bloodarsenal.common.block.ModBlocks;
import com.arc.bloodarsenal.common.entity.EntityBloodTNT;
import com.arc.bloodarsenal.common.entity.mob.EntityBloodHound;
import com.arc.bloodarsenal.common.entity.projectile.EntityBloodBall;
import com.arc.bloodarsenal.common.entity.projectile.EntityGatlingProjectile;
import com.arc.bloodarsenal.common.items.ModItems;
import com.arc.bloodarsenal.common.items.sigil.SigilUtils;
import com.arc.bloodarsenal.common.misc.VersionChecker;
import com.arc.bloodarsenal.client.renderer.block.*;
import com.arc.bloodarsenal.client.renderer.entity.RenderEntityBloodHound;
import com.arc.bloodarsenal.client.renderer.item.ItemRenderGatling;
import com.arc.bloodarsenal.client.renderer.item.RenderBow;
import com.arc.bloodarsenal.client.renderer.projectile.RenderEntityGatlingProjectile;
import com.arc.bloodarsenal.client.renderer.block.TilePortableAltarRenderer;
import com.arc.bloodarsenal.client.renderer.block.item.TilePortableAltarItemRenderer;
import com.arc.bloodarsenal.common.tileentity.TileLifeInfuser;
import com.arc.bloodarsenal.common.tileentity.TilePortableAltar;
import com.arc.bloodarsenal.common.tinkers.IClientCode;
import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.client.registry.ClientRegistry;
import cpw.mods.fml.client.registry.RenderingRegistry;
@@ -49,7 +52,7 @@ public class ClientProxy extends CommonProxy
RenderingRegistry.registerEntityRenderingHandler(EntityGatlingProjectile.class, new RenderEntityGatlingProjectile());
RenderingRegistry.registerEntityRenderingHandler(EntityBloodTNT.class, new RenderTNTPrimed());
RenderingRegistry.registerEntityRenderingHandler(EntityBloodBall.class, new RenderSnowball(ModItems.blood_ball));
RenderingRegistry.registerEntityRenderingHandler(EntityBloodHound.class, new RenderEntityBloodHound(new ModelWolf(), new ModelWolf(), 0.5F));
// RenderingRegistry.registerEntityRenderingHandler(EntityBloodHound.class, new RenderEntityBloodHound(new ModelWolf(), new ModelWolf(), 0.5F));
MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.life_infuser), new RenderTileLifeInfuser());
@@ -81,4 +84,6 @@ public class ClientProxy extends CommonProxy
{
MinecraftForgeClient.registerItemRenderer(ItemBlock.getItemFromBlock(ModBlocks.portable_altar), new TilePortableAltarItemRenderer());
}
public void executeClientCode(IClientCode clientCode) {}
}
@@ -1,6 +1,6 @@
package com.arc.bloodarsenal.renderer.block;
package com.arc.bloodarsenal.client.renderer.block;
import com.arc.bloodarsenal.renderer.model.ModelLifeInfuser;
import com.arc.bloodarsenal.client.renderer.model.ModelLifeInfuser;
import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -1,4 +1,4 @@
package com.arc.bloodarsenal.renderer.block;
package com.arc.bloodarsenal.client.renderer.block;
import org.lwjgl.opengl.ARBFragmentShader;
import org.lwjgl.opengl.ARBShaderObjects;
@@ -1,7 +1,7 @@
package com.arc.bloodarsenal.renderer.block;
package com.arc.bloodarsenal.client.renderer.block;
import com.arc.bloodarsenal.renderer.model.ModelLifeInfuser;
import com.arc.bloodarsenal.tileentity.TileLifeInfuser;
import com.arc.bloodarsenal.client.renderer.model.ModelLifeInfuser;
import com.arc.bloodarsenal.common.tileentity.TileLifeInfuser;
import cpw.mods.fml.client.FMLClientHandler;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.entity.RenderItem;
@@ -12,7 +12,6 @@ import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.common.util.ForgeDirection;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;
@@ -55,11 +54,11 @@ public class TileLifeInfuserRenderer extends TileEntitySpecialRenderer
if (tile.getStackInSlot(0) != null)
{
float scaleFactor = getGhostItemScaleFactor(tile.getStackInSlot(0));
float rotationAngle = (float) (720.0 * (System.currentTimeMillis() & 0x3FFFL) / 0x3FFFL);
float rotationAngle = Minecraft.getMinecraft().gameSettings.fancyGraphics ? (float) (720.0 * (System.currentTimeMillis() & 0x3FFFL) / 0x3FFFL) : 0;
EntityItem ghostEntityItem = new EntityItem(tile.getWorldObj());
ghostEntityItem.hoverStart = 0.0F;
ghostEntityItem.setEntityItemStack(tile.getStackInSlot(0));
float displacement = 0.2F;
float displacement = 0.3F;
if (ghostEntityItem.getEntityItem().getItem() instanceof ItemBlock)
{
@@ -103,22 +102,22 @@ public class TileLifeInfuserRenderer extends TileEntitySpecialRenderer
switch (customRenderItem.getMiniBlockCount(itemStack, (byte) 1))
{
case 1:
return 0.90F;
return 1.20F;
case 2:
return 0.90F;
return 1.20F;
case 3:
return 0.90F;
return 1.20F;
case 4:
return 0.90F;
return 1.20F;
case 5:
return 0.80F;
return 1.10F;
default:
return 0.90F;
return 1.20F;
}
}
else
@@ -126,19 +125,19 @@ public class TileLifeInfuserRenderer extends TileEntitySpecialRenderer
switch (customRenderItem.getMiniItemCount(itemStack, (byte) 1))
{
case 1:
return 0.65F;
return 0.95F;
case 2:
return 0.65F;
return 0.95F;
case 3:
return 0.65F;
return 0.95F;
case 4:
return 0.65F;
return 0.95F;
default:
return 0.65F;
return 0.95F;
}
}
}
@@ -1,7 +1,7 @@
package com.arc.bloodarsenal.renderer.block;
package com.arc.bloodarsenal.client.renderer.block;
import com.arc.bloodarsenal.renderer.model.ModelPortableBloodAltar;
import com.arc.bloodarsenal.tileentity.TilePortableAltar;
import com.arc.bloodarsenal.client.renderer.model.ModelPortableBloodAltar;
import com.arc.bloodarsenal.common.tileentity.TilePortableAltar;
import net.minecraft.client.renderer.entity.RenderItem;
import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
@@ -1,6 +1,6 @@
package com.arc.bloodarsenal.renderer.block.item;
package com.arc.bloodarsenal.client.renderer.block.item;
import com.arc.bloodarsenal.renderer.model.ModelPortableBloodAltar;
import com.arc.bloodarsenal.client.renderer.model.ModelPortableBloodAltar;
import cpw.mods.fml.client.FMLClientHandler;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.item.ItemStack;
@@ -1,13 +1,12 @@
package com.arc.bloodarsenal.renderer.entity;
package com.arc.bloodarsenal.client.renderer.entity;
import com.arc.bloodarsenal.entity.mob.EntityBloodHound;
import com.arc.bloodarsenal.common.entity.mob.EntityBloodHound;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.renderer.entity.RenderLiving;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.passive.EntitySheep;
import net.minecraft.util.ResourceLocation;
import org.lwjgl.opengl.GL11;
@@ -1,7 +1,7 @@
package com.arc.bloodarsenal.renderer.item;
package com.arc.bloodarsenal.client.renderer.item;
import com.arc.bloodarsenal.BloodArsenalConfig;
import com.arc.bloodarsenal.renderer.model.ModelEnergyGatling;
import com.arc.bloodarsenal.common.BloodArsenalConfig;
import com.arc.bloodarsenal.client.renderer.model.ModelEnergyGatling;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.Entity;
import net.minecraft.item.ItemStack;
@@ -1,4 +1,4 @@
package com.arc.bloodarsenal.renderer.item;
package com.arc.bloodarsenal.client.renderer.item;
import cpw.mods.fml.relauncher.ReflectionHelper;
import net.minecraft.client.renderer.ItemRenderer;
@@ -1,4 +1,4 @@
package com.arc.bloodarsenal.renderer.model;
package com.arc.bloodarsenal.client.renderer.model;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
@@ -1,10 +1,9 @@
package com.arc.bloodarsenal.renderer.model;
package com.arc.bloodarsenal.client.renderer.model;
import com.arc.bloodarsenal.tileentity.TileLifeInfuser;
import com.arc.bloodarsenal.common.tileentity.TileLifeInfuser;
import cpw.mods.fml.client.FMLClientHandler;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.model.IModelCustom;
import org.lwjgl.opengl.GL11;
@@ -1,7 +1,7 @@
package com.arc.bloodarsenal.renderer.model;
package com.arc.bloodarsenal.client.renderer.model;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import com.arc.bloodarsenal.tileentity.TilePortableAltar;
import com.arc.bloodarsenal.common.tileentity.TilePortableAltar;
import cpw.mods.fml.client.FMLClientHandler;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.renderer.Tessellator;
@@ -1,4 +1,4 @@
package com.arc.bloodarsenal.renderer.model;
package com.arc.bloodarsenal.client.renderer.model;
import net.minecraft.client.model.ModelBiped;
import net.minecraft.client.model.ModelRenderer;
@@ -1,8 +1,7 @@
package com.arc.bloodarsenal.renderer.projectile;
package com.arc.bloodarsenal.client.renderer.projectile;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.entity.Render;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.entity.Entity;
import net.minecraft.entity.projectile.EntityPotion;
import net.minecraft.item.Item;
@@ -1,7 +1,7 @@
package com.arc.bloodarsenal.renderer.projectile;
package com.arc.bloodarsenal.client.renderer.projectile;
import com.arc.bloodarsenal.BloodArsenalConfig;
import com.arc.bloodarsenal.entity.projectile.EntityGatlingProjectile;
import com.arc.bloodarsenal.common.BloodArsenalConfig;
import com.arc.bloodarsenal.common.entity.projectile.EntityGatlingProjectile;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.Tessellator;
@@ -1,17 +1,16 @@
package com.arc.bloodarsenal;
package com.arc.bloodarsenal.common;
import com.arc.bloodarsenal.entity.ModEntities;
import com.arc.bloodarsenal.entity.ModLivingDropsEvent;
import com.arc.bloodarsenal.gui.GuiHandler;
import com.arc.bloodarsenal.items.ModItems;
import com.arc.bloodarsenal.items.sigil.SigilUtils;
import com.arc.bloodarsenal.items.sigil.holding.AHPacketHandler;
import com.arc.bloodarsenal.items.tinkers.BloodArsenalModifiers;
import com.arc.bloodarsenal.items.tinkers.BloodArsenalTinkers;
import com.arc.bloodarsenal.items.tinkers.RecipeHelper;
import com.arc.bloodarsenal.misc.CommandDownloadMod;
import com.arc.bloodarsenal.potion.PotionBloodArsenal;
import com.arc.bloodarsenal.rituals.RitualRegistry;
import com.arc.bloodarsenal.common.entity.ModEntities;
import com.arc.bloodarsenal.common.entity.ModLivingDropsEvent;
import com.arc.bloodarsenal.common.gui.GuiHandler;
import com.arc.bloodarsenal.common.items.ModItems;
import com.arc.bloodarsenal.common.items.sigil.holding.AHPacketHandler;
import com.arc.bloodarsenal.common.tinkers.BloodArsenalModifiers;
import com.arc.bloodarsenal.common.tinkers.BloodArsenalTinkers;
import com.arc.bloodarsenal.common.tinkers.RecipeHelper;
import com.arc.bloodarsenal.common.misc.CommandDownloadMod;
import com.arc.bloodarsenal.common.potion.PotionBloodArsenal;
import com.arc.bloodarsenal.common.rituals.RitualRegistry;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.Mod;
@@ -23,7 +22,7 @@ import cpw.mods.fml.common.event.FMLServerStartingEvent;
import cpw.mods.fml.common.network.NetworkRegistry;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import com.arc.bloodarsenal.block.ModBlocks;
import com.arc.bloodarsenal.common.block.ModBlocks;
import net.minecraft.item.ItemArmor;
import net.minecraft.potion.Potion;
import net.minecraft.util.DamageSource;
@@ -37,13 +36,13 @@ import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.util.Calendar;
@Mod(modid = BloodArsenal.MODID, version = BloodArsenal.VERSION, name = "Blood Arsenal", dependencies = "required-after:AWWayofTime;after:NotEnoughItems;after:Baubles;after:TConstruct", guiFactory = "com.arc.bloodarsenal.gui.ConfigGuiFactory")
@Mod(modid = BloodArsenal.MODID, version = BloodArsenal.VERSION, name = "Blood Arsenal", dependencies = "required-after:AWWayofTime;after:NotEnoughItems;after:Baubles;after:TConstruct;after:Waila", guiFactory = "com.arc.bloodarsenal.common.gui.ConfigGuiFactory")
public class BloodArsenal
{
public final static String MODID = "BloodArsenal";
public final static String VERSION = "1.1-12";
public final static String VERSION = "@VERSION@";
@SidedProxy(clientSide = "com.arc.bloodarsenal.ClientProxy", serverSide = "com.arc.bloodarsenal.CommonProxy")
@SidedProxy(clientSide = "com.arc.bloodarsenal.client.ClientProxy", serverSide = "com.arc.bloodarsenal.common.CommonProxy")
public static CommonProxy proxy;
@Mod.Instance("BloodArsenal")
public static BloodArsenal instance;
@@ -53,12 +52,12 @@ public class BloodArsenal
public static Potion swimming;
public static Item.ToolMaterial infusedWood = EnumHelper.addToolMaterial("InfusedWood", 1, 0, 5.0F, 1.0F, 0);
public static Item.ToolMaterial infusedIron = EnumHelper.addToolMaterial("InfusedIron", 4, 0, 11.0F, 4.0F, 0);
public static Item.ToolMaterial infusedDiamond = EnumHelper.addToolMaterial("InfusedDiamond", 6, 0, 17.0F, 9.0F, 0);
public static Item.ToolMaterial infusedNetherium = EnumHelper.addToolMaterial("InfusedNetherium", 9, 0, 31.0F, 18.0F, 0);
public static Item.ToolMaterial infusedIron = EnumHelper.addToolMaterial("InfusedIron", 3, 0, 11.0F, 4.0F, 0);
public static Item.ToolMaterial infusedDiamond = EnumHelper.addToolMaterial("InfusedDiamond", 5, 0, 17.0F, 9.0F, 0);
public static Item.ToolMaterial infusedNetherium = EnumHelper.addToolMaterial("InfusedNetherium", 8, 0, 31.0F, 18.0F, 0);
public static ItemArmor.ArmorMaterial vampireArmor = EnumHelper.addArmorMaterial("VampireArmor", 0, new int[]{2, 7, 4, 2}, 0);
public static ItemArmor.ArmorMaterial lifeImbuedArmor = EnumHelper.addArmorMaterial("ImbuedArmor", 0, new int[]{4, 10, 8, 4}, 7);
public static ItemArmor.ArmorMaterial lifeImbuedArmor = EnumHelper.addArmorMaterial("ImbuedArmor", 0, new int[]{4, 13, 9, 4}, 8);
public static ItemArmor.ArmorMaterial glassArmor = EnumHelper.addArmorMaterial("GlassArmor", 0, new int[]{1, 4, 3, 1}, 4);
public static Logger logger = LogManager.getLogger(MODID);
@@ -1,8 +1,5 @@
package com.arc.bloodarsenal;
package com.arc.bloodarsenal.common;
import com.arc.bloodarsenal.items.ModItems;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.config.Configuration;
import java.io.File;
@@ -1,15 +1,15 @@
package com.arc.bloodarsenal;
package com.arc.bloodarsenal.common;
import baubles.common.container.InventoryBaubles;
import baubles.common.lib.PlayerHandler;
import baubles.common.network.PacketHandler;
import baubles.common.network.PacketSyncBauble;
import com.arc.bloodarsenal.items.ModItems;
import com.arc.bloodarsenal.items.armor.GlassArmor;
import com.arc.bloodarsenal.items.bauble.EmpoweredSacrificeAmulet;
import com.arc.bloodarsenal.items.bauble.EmpoweredSelfSacrificeAmulet;
import com.arc.bloodarsenal.items.bauble.SacrificeAmulet;
import com.arc.bloodarsenal.items.bauble.SelfSacrificeAmulet;
import com.arc.bloodarsenal.common.items.ModItems;
import com.arc.bloodarsenal.common.items.armor.GlassArmor;
import com.arc.bloodarsenal.common.items.bauble.EmpoweredSacrificeAmulet;
import com.arc.bloodarsenal.common.items.bauble.EmpoweredSelfSacrificeAmulet;
import com.arc.bloodarsenal.common.items.bauble.SacrificeAmulet;
import com.arc.bloodarsenal.common.items.bauble.SelfSacrificeAmulet;
import cpw.mods.fml.client.event.ConfigChangedEvent;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.Optional;
@@ -1,22 +1,15 @@
package com.arc.bloodarsenal;
package com.arc.bloodarsenal.common;
import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.AltarRecipeRegistry;
import WayofTime.alchemicalWizardry.api.bindingRegistry.BindingRegistry;
import WayofTime.alchemicalWizardry.api.items.ShapedBloodOrbRecipe;
import baubles.api.BaublesApi;
import baubles.common.Baubles;
import baubles.common.Config;
import com.arc.bloodarsenal.block.ModBlocks;
import com.arc.bloodarsenal.items.ModItems;
import cpw.mods.fml.common.Loader;
import com.arc.bloodarsenal.common.block.ModBlocks;
import com.arc.bloodarsenal.common.items.ModItems;
import cpw.mods.fml.common.Optional;
import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.CraftingManager;
import net.minecraft.item.crafting.ShapedRecipes;
import net.minecraftforge.oredict.OreDictionary;
import net.minecraftforge.oredict.ShapedOreRecipe;
import net.minecraftforge.oredict.ShapelessOreRecipe;
@@ -101,6 +94,7 @@ public class BloodArsenalRecipes
addOreDictBloodOrbRecipe(new ItemStack(ModItems.glass_leggings), "aaa", "aba", "a a", 'a', ModItems.glass_shard, 'b', apprenticeOrb);
addOreDictBloodOrbRecipe(new ItemStack(ModItems.glass_boots), "a a", "aba", 'a', ModItems.glass_shard, 'b', apprenticeOrb);
addOreDictBloodOrbRecipe(new ItemStack(ModItems.transparent_orb), "aba", "bcb", "ded", 'a', ModBlocks.blood_stained_glass, 'b', Blocks.glass, 'c', transcendentOrb, 'd', ModItems.blood_burned_string, 'e', WayofTime.alchemicalWizardry.ModItems.divinationSigil);
addOreDictBloodOrbRecipe(new ItemStack(ModItems.life_imbued_helmet), "aba", "aca", "aaa", 'a', ModItems.blood_infused_iron, 'b', magicianOrb, 'c', Items.iron_chestplate);
addOreDictRecipe(new ItemStack(ModBlocks.blood_stone), "aaa", "aaa", "aaa", 'a', blankSlate);
addOreDictRecipe(new ItemStack(ModBlocks.blood_stone, 1, 1), "aaa", "aaa", "aaa", 'a', reinforcedSlate);
@@ -112,6 +106,7 @@ public class BloodArsenalRecipes
addOreDictRecipe(new ItemStack(ModBlocks.blood_infused_glowstone), "aa", "aa", 'a', ModItems.blood_infused_glowstone_dust);
addOreDictRecipe(new ItemStack(ModBlocks.blood_lamp), "aba", "bcb", "aba", 'a', ModItems.blood_infused_iron, 'b', ModBlocks.blood_stained_glass, 'c', ModBlocks.blood_infused_glowstone);
addOreDictRecipe(new ItemStack(ModBlocks.blood_infused_diamond_block), "aaa", "aaa", "aaa", 'a', ModItems.blood_infused_diamond_bound);
addOreDictRecipe(new ItemStack(ModBlocks.blood_torch), "a", "b", 'a', ModItems.bound_igniter, 'b', ModItems.blood_infused_stick);
addOreDictRecipe(new ItemStack(ModItems.blood_infused_stick), "a", "a", 'a', ModBlocks.blood_infused_planks);
addOreDictRecipe(new ItemStack(ModItems.blood_infused_pickaxe_wood), "aaa", " b ", " b ", 'a', ModBlocks.blood_infused_planks, 'b', ModItems.blood_infused_stick);
addOreDictRecipe(new ItemStack(ModItems.blood_infused_axe_wood), "aa ", "ab ", " b ", 'a', ModBlocks.blood_infused_planks, 'b', ModItems.blood_infused_stick);
@@ -149,8 +144,8 @@ public class BloodArsenalRecipes
addOreDictBloodOrbRecipe(new ItemStack(ModItems.vampire_ring), "ab ", "bcb", " b ", 'a', ModItems.blood_infused_diamond_bound, 'b', Blocks.stone, 'c', masterOrb);
addOreDictBloodOrbRecipe(new ItemStack(ModItems.sacrifice_amulet), "aaa", "aba", "caa", 'a', ModItems.blood_burned_string, 'b', weakOrb, 'c', Items.gold_ingot);
addOreDictBloodOrbRecipe(new ItemStack(ModItems.self_sacrifice_amulet), "aaa", "aba", "caa", 'a', ModItems.blood_burned_string, 'b', weakOrb, 'c', Items.glowstone_dust);
addOreDictBloodOrbRecipe(new ItemStack(ModItems.empowered_self_sacrifice_amulet), "aba", "cdc", "ecf", 'a', ModItems.blood_infused_glowstone_dust, 'b', Items.blaze_rod, 'c', WayofTime.alchemicalWizardry.ModBlocks.runeOfSelfSacrifice, 'd', ModItems.self_sacrifice_amulet, 'e', Blocks.gold_block, 'f', ModItems.amorphic_catalyst);
addOreDictBloodOrbRecipe(new ItemStack(ModItems.empowered_sacrifice_amulet), "aba", "cdc", "ecf", 'a', ModItems.blood_infused_glowstone_dust, 'b', Items.blaze_rod, 'c', WayofTime.alchemicalWizardry.ModBlocks.runeOfSacrifice, 'd', ModItems.sacrifice_amulet, 'e', Blocks.glowstone, 'f', ModItems.amorphic_catalyst);
addOreDictBloodOrbRecipe(new ItemStack(ModItems.empowered_self_sacrifice_amulet), "aba", "cdc", "ecf", 'a', ModItems.blood_infused_glowstone_dust, 'b', Items.blaze_rod, 'c', WayofTime.alchemicalWizardry.ModBlocks.runeOfSelfSacrifice, 'd', ModItems.self_sacrifice_amulet, 'e', Blocks.glowstone, 'f', ModItems.amorphic_catalyst);
addOreDictBloodOrbRecipe(new ItemStack(ModItems.empowered_sacrifice_amulet), "aba", "cdc", "ecf", 'a', ModItems.blood_infused_glowstone_dust, 'b', Items.blaze_rod, 'c', WayofTime.alchemicalWizardry.ModBlocks.runeOfSacrifice, 'd', ModItems.sacrifice_amulet, 'e', Blocks.gold_block, 'f', ModItems.amorphic_catalyst);
}
public static void addOreDictRecipe(ItemStack output, Object... recipe)
@@ -1,9 +1,10 @@
package com.arc.bloodarsenal;
package com.arc.bloodarsenal.common;
import com.arc.bloodarsenal.entity.EntityBloodTNT;
import com.arc.bloodarsenal.entity.mob.EntityBloodHound;
import com.arc.bloodarsenal.entity.projectile.EntityBloodBall;
import com.arc.bloodarsenal.entity.projectile.EntityGatlingProjectile;
import com.arc.bloodarsenal.common.entity.EntityBloodTNT;
import com.arc.bloodarsenal.common.entity.mob.EntityBloodHound;
import com.arc.bloodarsenal.common.entity.projectile.EntityBloodBall;
import com.arc.bloodarsenal.common.entity.projectile.EntityGatlingProjectile;
import com.arc.bloodarsenal.common.tinkers.IClientCode;
import cpw.mods.fml.common.registry.EntityRegistry;
import net.minecraft.world.World;
@@ -33,11 +34,13 @@ public class CommonProxy
EntityRegistry.registerModEntity(EntityGatlingProjectile.class, "gatlingProjectile", 0, BloodArsenal.instance, 128, 5, true);
EntityRegistry.registerModEntity(EntityBloodTNT.class, "bloodTNT", 1, BloodArsenal.instance, 64, 5, true);
EntityRegistry.registerModEntity(EntityBloodBall.class, "bloodBall", 2, BloodArsenal.instance, 128, 5, true);
EntityRegistry.registerModEntity(EntityBloodHound.class, "BloodHound", 3, BloodArsenal.instance, 96, 3, true);
// EntityRegistry.registerModEntity(EntityBloodHound.class, "BloodHound", 3, BloodArsenal.instance, 96, 3, true);
}
public void initRendering()
{
//TODO Auto-generated stub
}
public void executeClientCode(IClientCode clientCode) {}
}
@@ -1,7 +1,7 @@
package com.arc.bloodarsenal.block;
package com.arc.bloodarsenal.common.block;
import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
import com.arc.bloodarsenal.BloodArsenalConfig;
import com.arc.bloodarsenal.common.BloodArsenalConfig;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
@@ -1,4 +1,4 @@
package com.arc.bloodarsenal.block;
package com.arc.bloodarsenal.common.block;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
@@ -1,6 +1,6 @@
package com.arc.bloodarsenal.block;
package com.arc.bloodarsenal.common.block;
import com.arc.bloodarsenal.items.ModItems;
import com.arc.bloodarsenal.common.items.ModItems;
import net.minecraft.block.BlockGlowstone;
import net.minecraft.block.material.Material;
import net.minecraft.item.Item;
@@ -1,4 +1,4 @@
package com.arc.bloodarsenal.block;
package com.arc.bloodarsenal.common.block;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
@@ -1,4 +1,4 @@
package com.arc.bloodarsenal.block;
package com.arc.bloodarsenal.common.block;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -1,4 +1,4 @@
package com.arc.bloodarsenal.block;
package com.arc.bloodarsenal.common.block;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
@@ -1,4 +1,4 @@
package com.arc.bloodarsenal.block;
package com.arc.bloodarsenal.common.block;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -18,19 +18,23 @@ public class BlockBloodStainedGlass extends BlockBreakable
setStepSound(soundTypeGlass);
}
@Override
@SideOnly(Side.CLIENT)
public int getRenderBlockPass()
{
return 1;
}
@Override
public boolean renderAsNormalBlock()
{
return false;
}
@Override
public int quantityDropped(Random par1Random) {return 0;}
@Override
protected boolean canSilkHarvest() {return true;}
@Override
@@ -1,4 +1,4 @@
package com.arc.bloodarsenal.block;
package com.arc.bloodarsenal.common.block;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -32,18 +32,21 @@ public class BlockBloodStainedIce extends BlockBreakable
setStepSound(soundTypeGlass);
}
@Override
@SideOnly(Side.CLIENT)
public int getRenderBlockPass()
{
return 1;
}
@Override
@SideOnly(Side.CLIENT)
public boolean shouldSideBeRendered(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5)
{
return super.shouldSideBeRendered(par1IBlockAccess, par2, par3, par4, 1 - par5);
}
@Override
public void harvestBlock(World par1World, EntityPlayer par2EntityPlayer, int par3, int par4, int par5, int par6)
{
par2EntityPlayer.addStat(StatList.mineBlockStatArray[Block.getIdFromBlock(this)], 1);
@@ -81,11 +84,13 @@ public class BlockBloodStainedIce extends BlockBreakable
}
}
@Override
public int quantityDropped(Random par1Random)
{
return 0;
}
@Override
public void updateTick(World par1World, int par2, int par3, int par4, Random par5)
{
if (par1World.getSavedLightValue(EnumSkyBlock.Block, par2, par3, par4) > 11 - getLightOpacity())
@@ -101,6 +106,7 @@ public class BlockBloodStainedIce extends BlockBreakable
}
}
@Override
public int getMobilityFlag()
{
return 0;
@@ -1,4 +1,4 @@
package com.arc.bloodarsenal.block;
package com.arc.bloodarsenal.common.block;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
@@ -1,4 +1,4 @@
package com.arc.bloodarsenal.block;
package com.arc.bloodarsenal.common.block;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -1,6 +1,6 @@
package com.arc.bloodarsenal.block;
package com.arc.bloodarsenal.common.block;
import com.arc.bloodarsenal.entity.EntityBloodTNT;
import com.arc.bloodarsenal.common.entity.EntityBloodTNT;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
@@ -30,13 +30,15 @@ public class BlockBloodTNT extends Block
setHardness(0.0F);
setStepSound(soundTypeGrass);
}
@Override
@SideOnly(Side.CLIENT)
public IIcon getIcon(int par1, int par2)
{
return par1 == 0 ? bottom : (par1 == 1 ? top : blockIcon);
}
@Override
public void onBlockAdded(World par1World, int par2, int par3, int par4)
{
super.onBlockAdded(par1World, par2, par3, par4);
@@ -48,6 +50,7 @@ public class BlockBloodTNT extends Block
}
}
@Override
public void onNeighborBlockChange(World par1World, int par2, int par3, int par4, Block par5Block)
{
if (par1World.isBlockIndirectlyGettingPowered(par2, par3, par4))
@@ -56,12 +59,14 @@ public class BlockBloodTNT extends Block
par1World.setBlockToAir(par2, par3, par4);
}
}
@Override
public int quantityDropped(Random par1Random)
{
return 1;
}
@Override
public void onBlockDestroyedByExplosion(World par1World, int par2, int par3, int par4, Explosion par5Explosion)
{
if (!par1World.isRemote)
@@ -72,6 +77,7 @@ public class BlockBloodTNT extends Block
}
}
@Override
public void onBlockDestroyedByPlayer(World par1World, int par2, int par3, int par4, int par5)
{
spawnTNT(par1World, par2, par3, par4, par5, (EntityLivingBase) null);
@@ -90,6 +96,7 @@ public class BlockBloodTNT extends Block
}
}
@Override
public boolean onBlockActivated(World par1World, int par2, int par3, int par4, EntityPlayer par5, int par6, float par7, float par8, float par9)
{
if (par5.getCurrentEquippedItem() != null && par5.getCurrentEquippedItem().getItem() == Items.flint_and_steel)
@@ -105,6 +112,7 @@ public class BlockBloodTNT extends Block
}
}
@Override
public void onEntityCollidedWithBlock(World par1World, int par2, int par3, int par4, Entity par5Entity)
{
if (par5Entity instanceof EntityArrow && !par1World.isRemote)
@@ -119,11 +127,13 @@ public class BlockBloodTNT extends Block
}
}
@Override
public boolean canDropFromExplosion(Explosion par1Explosion)
{
return false;
}
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister iconRegister)
{
@@ -1,4 +1,4 @@
package com.arc.bloodarsenal.block;
package com.arc.bloodarsenal.common.block;
import net.minecraft.block.BlockTorch;
@@ -1,6 +1,6 @@
package com.arc.bloodarsenal.block;
package com.arc.bloodarsenal.common.block;
import com.arc.bloodarsenal.items.ModItems;
import com.arc.bloodarsenal.common.items.ModItems;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
@@ -1,9 +1,9 @@
package com.arc.bloodarsenal.block;
package com.arc.bloodarsenal.common.block;
import WayofTime.alchemicalWizardry.api.rituals.Rituals;
import WayofTime.alchemicalWizardry.common.block.BlockMasterStone;
import WayofTime.alchemicalWizardry.common.items.ActivationCrystal;
import com.arc.bloodarsenal.tileentity.TileCompactedMRS;
import com.arc.bloodarsenal.common.tileentity.TileCompactedMRS;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister;
@@ -15,6 +15,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.Explosion;
import net.minecraft.world.World;
@@ -178,6 +179,30 @@ public class BlockCompactedMRS extends BlockMasterStone
}
}
@Override
public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z, EntityPlayer player)
{
Item item = getItem(world, x, y, z);
if (item == null)
{
return null;
}
TileEntity tile = world.getTileEntity(x, y, z);
if (tile instanceof TileCompactedMRS)
{
ItemStack drop = new ItemStack(this);
NBTTagCompound tag = new NBTTagCompound();
((TileCompactedMRS) tile).writeNBTOnHarvest(tag);
drop.setTagCompound(tag);
return drop;
}
return null;
}
@Override
public TileEntity createNewTileEntity(World world, int meta)
{
@@ -1,4 +1,4 @@
package com.arc.bloodarsenal.block;
package com.arc.bloodarsenal.common.block;
import WayofTime.alchemicalWizardry.api.items.interfaces.IBloodOrb;
import WayofTime.alchemicalWizardry.api.rituals.RitualComponent;
@@ -11,9 +11,9 @@ import WayofTime.alchemicalWizardry.common.bloodAltarUpgrade.AltarUpgradeCompone
import WayofTime.alchemicalWizardry.common.bloodAltarUpgrade.UpgradedAltars;
import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar;
import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone;
import com.arc.bloodarsenal.tileentity.TileCompactedMRS;
import com.arc.bloodarsenal.tileentity.TileCompacter;
import com.arc.bloodarsenal.tileentity.TilePortableAltar;
import com.arc.bloodarsenal.common.tileentity.TileCompactedMRS;
import com.arc.bloodarsenal.common.tileentity.TileCompacter;
import com.arc.bloodarsenal.common.tileentity.TilePortableAltar;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
@@ -1,4 +1,4 @@
package com.arc.bloodarsenal.block;
package com.arc.bloodarsenal.common.block;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
@@ -1,12 +1,15 @@
package com.arc.bloodarsenal.block;
package com.arc.bloodarsenal.common.block;
import WayofTime.alchemicalWizardry.ModItems;
import WayofTime.alchemicalWizardry.api.items.interfaces.IBloodOrb;
import WayofTime.alchemicalWizardry.common.items.sigil.SigilOfHolding;
import com.arc.bloodarsenal.tileentity.TileLPMaterializer;
import com.arc.bloodarsenal.common.tileentity.TileLPMaterializer;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Items;
@@ -14,6 +17,8 @@ import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.fluids.FluidContainerRegistry;
@@ -21,6 +26,11 @@ import java.util.Random;
public class BlockLPMaterializer extends BlockContainer
{
@SideOnly(Side.CLIENT)
private IIcon output;
@SideOnly(Side.CLIENT)
private IIcon side;
public BlockLPMaterializer()
{
super(Material.iron);
@@ -28,6 +38,42 @@ public class BlockLPMaterializer extends BlockContainer
setResistance(14.0F);
}
@Override
@SideOnly(Side.CLIENT)
public IIcon getIcon(int par1, int par2)
{
return par1 == 0 || par1 == 1 ? output : side;
}
@Override
@SideOnly(Side.CLIENT)
public int getRenderBlockPass()
{
return 1;
}
@Override
@SideOnly(Side.CLIENT)
public boolean shouldSideBeRendered(IBlockAccess blockSide, int x, int y, int z, int side)
{
return true;
}
@Override
public boolean isOpaqueCube()
{
return false;
}
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister iconRegister)
{
blockIcon = iconRegister.registerIcon("BloodArsenal:lp_materializer_output");
output = iconRegister.registerIcon("BloodArsenal:lp_materializer_output");
side = iconRegister.registerIcon("BloodArsenal:lp_materializer_side");
}
@Override
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int idk, float what, float these, float are)
{
@@ -1,8 +1,8 @@
package com.arc.bloodarsenal.block;
package com.arc.bloodarsenal.common.block;
import WayofTime.alchemicalWizardry.ModItems;
import WayofTime.alchemicalWizardry.common.items.sigil.SigilOfHolding;
import com.arc.bloodarsenal.tileentity.TileLifeInfuser;
import com.arc.bloodarsenal.common.tileentity.TileLifeInfuser;
import net.minecraft.block.Block;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
@@ -78,13 +78,16 @@ public class BlockLifeInfuser extends BlockContainer
}
else if (playerItem.getItem().equals(ModItems.bucketLife))
{
if (!player.capabilities.isCreativeMode)
if (tileEntity.getFluid().amount <= tileEntity.capacity - FluidContainerRegistry.BUCKET_VOLUME)
{
--playerItem.stackSize;
player.inventory.addItemStackToInventory(bucket);
}
if (!player.capabilities.isCreativeMode)
{
--playerItem.stackSize;
player.inventory.addItemStackToInventory(bucket);
}
tileEntity.fillMainTank(FluidContainerRegistry.BUCKET_VOLUME);
tileEntity.fillMainTank(FluidContainerRegistry.BUCKET_VOLUME);
}
}
else if (tileEntity.getStackInSlot(0) == null)
{
@@ -148,22 +151,6 @@ public class BlockLifeInfuser extends BlockContainer
}
}
@Override
public void randomDisplayTick(World world, int x, int y, int z, Random rand)
{
TileLifeInfuser tileEntity = (TileLifeInfuser) world.getTileEntity(x, y, z);
if (!tileEntity.isActive())
{
return;
}
if (rand.nextInt(3) != 0)
{
return;
}
}
@Override
public TileEntity createNewTileEntity(World world, int meta)
{
@@ -187,9 +174,4 @@ public class BlockLifeInfuser extends BlockContainer
{
return false;
}
@Override
public void registerBlockIcons(IIconRegister par1IconRegister) {
// NO-OP
}
}
@@ -1,10 +1,10 @@
package com.arc.bloodarsenal.block;
package com.arc.bloodarsenal.common.block;
import WayofTime.alchemicalWizardry.ModItems;
import WayofTime.alchemicalWizardry.api.items.IAltarManipulator;
import WayofTime.alchemicalWizardry.common.items.EnergyBattery;
import WayofTime.alchemicalWizardry.common.items.sigil.SigilOfHolding;
import com.arc.bloodarsenal.tileentity.TilePortableAltar;
import com.arc.bloodarsenal.common.tileentity.TilePortableAltar;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
@@ -15,10 +15,12 @@ import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.IIcon;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
import java.util.ArrayList;
@@ -310,6 +312,30 @@ public class BlockPortableAltar extends BlockContainer
return true;
}
@Override
public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z, EntityPlayer player)
{
Item item = getItem(world, x, y, z);
if (item == null)
{
return null;
}
TileEntity tile = world.getTileEntity(x, y, z);
if (tile instanceof TilePortableAltar)
{
ItemStack drop = new ItemStack(this);
NBTTagCompound tag = new NBTTagCompound();
((TilePortableAltar) tile).writeNBTOnHarvest(tag);
drop.setTagCompound(tag);
return drop;
}
return null;
}
@Override
public void randomDisplayTick(World world, int x, int y, int z, Random rand)
{
@@ -1,11 +1,11 @@
package com.arc.bloodarsenal.block;
package com.arc.bloodarsenal.common.block;
import com.arc.bloodarsenal.BloodArsenal;
import com.arc.bloodarsenal.BloodArsenalConfig;
import com.arc.bloodarsenal.items.block.BloodStoneBlock;
import com.arc.bloodarsenal.items.block.CompactedMRSBlock;
import com.arc.bloodarsenal.items.block.PortableAltarBlock;
import com.arc.bloodarsenal.tileentity.*;
import com.arc.bloodarsenal.common.BloodArsenal;
import com.arc.bloodarsenal.common.BloodArsenalConfig;
import com.arc.bloodarsenal.common.items.block.BloodStoneBlock;
import com.arc.bloodarsenal.common.items.block.CompactedMRSBlock;
import com.arc.bloodarsenal.common.items.block.PortableAltarBlock;
import com.arc.bloodarsenal.common.tileentity.*;
import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraft.block.Block;
import net.minecraft.item.ItemBlock;
@@ -34,7 +34,7 @@ public class ModBlocks
public static Block compacted_mrs;
public static Block block_burned_string;
private static ArrayList<String> blocksNotToBeRegistered = new ArrayList();
public static ArrayList<String> blocksNotToBeRegistered = new ArrayList();
public static void init()
{
@@ -1,6 +1,6 @@
package com.arc.bloodarsenal.block.fluid;
package com.arc.bloodarsenal.common.block.fluid;
import com.arc.bloodarsenal.BloodArsenal;
import com.arc.bloodarsenal.common.BloodArsenal;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.material.Material;
@@ -1,4 +1,4 @@
package com.arc.bloodarsenal.entity;
package com.arc.bloodarsenal.common.entity;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -0,0 +1,11 @@
package com.arc.bloodarsenal.common.entity;
public class ModEntities
{
public static void init()
{
int id = 0;
}
}
@@ -1,6 +1,6 @@
package com.arc.bloodarsenal.entity;
package com.arc.bloodarsenal.common.entity;
import com.arc.bloodarsenal.items.ModItems;
import com.arc.bloodarsenal.common.items.ModItems;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import net.minecraft.entity.monster.EntityZombie;
import net.minecraft.entity.passive.EntityVillager;
@@ -1,4 +1,4 @@
package com.arc.bloodarsenal.entity.ai;
package com.arc.bloodarsenal.common.entity.ai;
import net.minecraft.entity.EntityCreature;
import net.minecraft.entity.EntityLivingBase;
@@ -1,4 +1,4 @@
package com.arc.bloodarsenal.entity.ai;
package com.arc.bloodarsenal.common.entity.ai;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.ai.EntityAIBase;
@@ -1,4 +1,4 @@
package com.arc.bloodarsenal.entity.ai;
package com.arc.bloodarsenal.common.entity.ai;
import net.minecraft.entity.EntityCreature;
import net.minecraft.entity.ai.EntityAITarget;
@@ -1,4 +1,4 @@
package com.arc.bloodarsenal.entity.ai;
package com.arc.bloodarsenal.common.entity.ai;
import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.EntityLivingBase;
@@ -1,4 +1,4 @@
package com.arc.bloodarsenal.entity.ai;
package com.arc.bloodarsenal.common.entity.ai;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.ai.EntityAITarget;
@@ -1,4 +1,4 @@
package com.arc.bloodarsenal.entity.ai;
package com.arc.bloodarsenal.common.entity.ai;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.ai.EntityAITarget;
@@ -1,4 +1,4 @@
package com.arc.bloodarsenal.entity.mob;
package com.arc.bloodarsenal.common.entity.mob;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -11,7 +11,6 @@ import net.minecraft.entity.SharedMonsterAttributes;
import net.minecraft.entity.ai.*;
import net.minecraft.entity.monster.EntityCreeper;
import net.minecraft.entity.monster.EntityGhast;
import net.minecraft.entity.passive.EntityAnimal;
import net.minecraft.entity.passive.EntityHorse;
import net.minecraft.entity.passive.EntityTameable;
import net.minecraft.entity.passive.EntityWolf;
@@ -22,7 +21,6 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemFood;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.pathfinding.PathEntity;
import net.minecraft.util.DamageSource;
import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
@@ -1,8 +1,7 @@
package com.arc.bloodarsenal.entity.projectile;
package com.arc.bloodarsenal.common.entity.projectile;
import WayofTime.alchemicalWizardry.api.soulNetwork.LifeEssenceNetwork;
import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
import WayofTime.alchemicalWizardry.common.items.EnergyBattery;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.projectile.EntityThrowable;
@@ -1,4 +1,4 @@
package com.arc.bloodarsenal.entity.projectile;
package com.arc.bloodarsenal.common.entity.projectile;
import cpw.mods.fml.common.registry.IThrowableEntity;
import cpw.mods.fml.relauncher.Side;
@@ -1,6 +1,6 @@
package com.arc.bloodarsenal.gui;
package com.arc.bloodarsenal.common.gui;
import com.arc.bloodarsenal.BloodArsenal;
import com.arc.bloodarsenal.common.BloodArsenal;
import cpw.mods.fml.client.config.*;
import net.minecraft.client.gui.GuiScreen;
import net.minecraftforge.common.config.ConfigCategory;
@@ -8,9 +8,8 @@ import net.minecraftforge.common.config.ConfigElement;
import java.util.ArrayList;
import java.util.List;
import java.util.regex.Pattern;
import static com.arc.bloodarsenal.BloodArsenalConfig.*;
import static com.arc.bloodarsenal.common.BloodArsenalConfig.*;
public class ConfigGui extends GuiConfig
{
@@ -1,4 +1,4 @@
package com.arc.bloodarsenal.gui;
package com.arc.bloodarsenal.common.gui;
import cpw.mods.fml.client.IModGuiFactory;
import net.minecraft.client.Minecraft;
@@ -1,8 +1,8 @@
package com.arc.bloodarsenal.gui;
package com.arc.bloodarsenal.common.gui;
import com.arc.bloodarsenal.items.sigil.holding.ContainerAugmentedHolding;
import com.arc.bloodarsenal.items.sigil.holding.GuiAugmentedHolding;
import com.arc.bloodarsenal.items.sigil.holding.InventoryAugmentedHolding;
import com.arc.bloodarsenal.common.items.sigil.holding.ContainerAugmentedHolding;
import com.arc.bloodarsenal.common.items.sigil.holding.GuiAugmentedHolding;
import com.arc.bloodarsenal.common.items.sigil.holding.InventoryAugmentedHolding;
import cpw.mods.fml.common.network.IGuiHandler;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World;
@@ -1,4 +1,4 @@
package com.arc.bloodarsenal.items;
package com.arc.bloodarsenal.common.items;
import cpw.mods.fml.common.eventhandler.Event;
import cpw.mods.fml.common.registry.GameRegistry;
@@ -1,10 +1,7 @@
package com.arc.bloodarsenal.items;
package com.arc.bloodarsenal.common.items;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import com.arc.bloodarsenal.BloodArsenal;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@@ -1,7 +1,7 @@
package com.arc.bloodarsenal.items;
package com.arc.bloodarsenal.common.items;
import com.arc.bloodarsenal.BloodArsenal;
import com.arc.bloodarsenal.entity.projectile.EntityBloodBall;
import com.arc.bloodarsenal.common.BloodArsenal;
import com.arc.bloodarsenal.common.entity.projectile.EntityBloodBall;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@@ -1,6 +1,6 @@
package com.arc.bloodarsenal.items;
package com.arc.bloodarsenal.common.items;
import com.arc.bloodarsenal.BloodArsenal;
import com.arc.bloodarsenal.common.BloodArsenal;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemFood;
import net.minecraft.item.ItemStack;
@@ -1,9 +1,9 @@
package com.arc.bloodarsenal.items;
package com.arc.bloodarsenal.common.items;
import WayofTime.alchemicalWizardry.api.soulNetwork.LifeEssenceNetwork;
import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
import com.arc.bloodarsenal.BloodArsenal;
import com.arc.bloodarsenal.common.BloodArsenal;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister;
@@ -1,6 +1,6 @@
package com.arc.bloodarsenal.items;
package com.arc.bloodarsenal.common.items;
import com.arc.bloodarsenal.BloodArsenal;
import com.arc.bloodarsenal.common.BloodArsenal;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemFood;
import net.minecraft.item.ItemStack;
@@ -1,6 +1,6 @@
package com.arc.bloodarsenal.items;
package com.arc.bloodarsenal.common.items;
import com.arc.bloodarsenal.BloodArsenal;
import com.arc.bloodarsenal.common.BloodArsenal;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemFood;
import net.minecraft.item.ItemStack;
@@ -1,10 +1,8 @@
package com.arc.bloodarsenal.items;
package com.arc.bloodarsenal.common.items;
import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import com.arc.bloodarsenal.BloodArsenal;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import com.arc.bloodarsenal.common.BloodArsenal;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
@@ -1,8 +1,8 @@
package com.arc.bloodarsenal.items;
package com.arc.bloodarsenal.common.items;
import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import com.arc.bloodarsenal.BloodArsenal;
import com.arc.bloodarsenal.common.BloodArsenal;
import cpw.mods.fml.relauncher.ReflectionHelper;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
@@ -1,16 +1,17 @@
package com.arc.bloodarsenal.items;
package com.arc.bloodarsenal.common.items;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import com.arc.bloodarsenal.BloodArsenal;
import com.arc.bloodarsenal.BloodArsenalConfig;
import com.arc.bloodarsenal.block.ModBlocks;
import com.arc.bloodarsenal.items.armor.GlassArmor;
import com.arc.bloodarsenal.items.armor.VampireCostume;
import com.arc.bloodarsenal.items.bauble.*;
import com.arc.bloodarsenal.items.orb.TransparentOrb;
import com.arc.bloodarsenal.items.sigil.*;
import com.arc.bloodarsenal.items.sigil.holding.SigilAugmentedHolding;
import com.arc.bloodarsenal.items.tool.*;
import com.arc.bloodarsenal.common.BloodArsenal;
import com.arc.bloodarsenal.common.BloodArsenalConfig;
import com.arc.bloodarsenal.common.block.ModBlocks;
import com.arc.bloodarsenal.common.items.armor.GlassArmor;
import com.arc.bloodarsenal.common.items.armor.LifeImbuedArmor;
import com.arc.bloodarsenal.common.items.armor.VampireCostume;
import com.arc.bloodarsenal.common.items.bauble.*;
import com.arc.bloodarsenal.common.items.orb.TransparentOrb;
import com.arc.bloodarsenal.common.items.sigil.*;
import com.arc.bloodarsenal.common.items.sigil.holding.SigilAugmentedHolding;
import com.arc.bloodarsenal.common.items.tool.*;
import cpw.mods.fml.common.Optional;
import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraft.item.Item;
@@ -79,8 +80,13 @@ public class ModItems
public static Item glass_leggings;
public static Item glass_boots;
public static Item transparent_orb;
public static Item life_imbued_helmet;
public static Item life_imbued_chestplate;
public static Item life_imbued_leggings;
public static Item life_imbued_boots;
public static Item burned_tome;
private static ArrayList<String> itemsNotToBeRegistered = new ArrayList();
public static ArrayList<String> itemsNotToBeRegistered = new ArrayList();
public static void init()
{
@@ -138,17 +144,21 @@ public class ModItems
glass_leggings = registerItem(new GlassArmor(2), "glass_leggings");
glass_boots = registerItem(new GlassArmor(3), "glass_boots");
transparent_orb = registerItem(new TransparentOrb(30000000), "transparent_orb");
vampire_ring = new VampireRing();
self_sacrifice_amulet = new SelfSacrificeAmulet();
sacrifice_amulet = new SacrificeAmulet();
empowered_sacrifice_amulet = new EmpoweredSacrificeAmulet();
empowered_self_sacrifice_amulet = new EmpoweredSelfSacrificeAmulet();
life_imbued_helmet = registerItem(new LifeImbuedArmor(0), "life_imbued_helmet");
life_imbued_chestplate = registerItem(new LifeImbuedArmor(1), "life_imbued_chestplate");
life_imbued_leggings = registerItem(new LifeImbuedArmor(2), "life_imbued_leggings");
life_imbued_boots = registerItem(new LifeImbuedArmor(3), "life_imbued_boots");
}
@Optional.Method(modid = "Baubles")
public static void registerBaubles()
{
vampire_ring = new VampireRing();
self_sacrifice_amulet = new SelfSacrificeAmulet();
sacrifice_amulet = new SacrificeAmulet();
empowered_sacrifice_amulet = new EmpoweredSacrificeAmulet();
empowered_self_sacrifice_amulet = new EmpoweredSelfSacrificeAmulet();
GameRegistry.registerItem(vampire_ring, "vampire_ring");
GameRegistry.registerItem(self_sacrifice_amulet, "self_sacrifice_amulet");
GameRegistry.registerItem(sacrifice_amulet, "sacrifice_amulet");
@@ -1,6 +1,6 @@
package com.arc.bloodarsenal.items;
package com.arc.bloodarsenal.common.items;
import com.arc.bloodarsenal.BloodArsenal;
import com.arc.bloodarsenal.common.BloodArsenal;
import com.google.common.collect.HashBiMap;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -1,7 +1,7 @@
package com.arc.bloodarsenal.items.armor;
package com.arc.bloodarsenal.common.items.armor;
import com.arc.bloodarsenal.BloodArsenal;
import com.arc.bloodarsenal.items.ModItems;
import com.arc.bloodarsenal.common.BloodArsenal;
import com.arc.bloodarsenal.common.items.ModItems;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemArmor;
@@ -28,7 +28,7 @@ public class GlassArmor extends ItemArmor
@Override
public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type)
{
if (this == ModItems.glass_helmet || this == ModItems.glass_chestplate || this == ModItems.glass_boots)
if (this != ModItems.glass_leggings)
{
return "BloodArsenal:models/armor/glass_layer_1.png";
}
@@ -0,0 +1,277 @@
package com.arc.bloodarsenal.common.items.armor;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import com.arc.bloodarsenal.common.BloodArsenal;
import com.arc.bloodarsenal.common.items.ModItems;
import com.arc.bloodarsenal.common.items.tool.IFillable;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.enchantment.Enchantment;
import net.minecraft.enchantment.EnchantmentHelper;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumRarity;
import net.minecraft.item.Item;
import net.minecraft.item.ItemArmor;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.DamageSource;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.MathHelper;
import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
import net.minecraftforge.common.ISpecialArmor;
import java.util.List;
import java.util.Random;
public class LifeImbuedArmor extends ItemArmor implements ISpecialArmor, IFillable
{
private int maxLP = 100000;
private String LP_STORED = "LPStored";
public double absorbRatio = 0.5;
public LifeImbuedArmor(int armorType)
{
super(BloodArsenal.lifeImbuedArmor, 0, armorType);
setCreativeTab(BloodArsenal.BA_TAB);
}
/** IFillable */
@Override
public int getMaxLP()
{
return maxLP;
}
@Override
public void incrementLPStored(ItemStack itemStack, int incrementAmount)
{
setCurrentLPStored(itemStack, getLPStored(itemStack) + incrementAmount);
}
@Override
public int getLPStored(ItemStack container)
{
if (container.stackTagCompound == null)
{
setCurrentLPStored(container, 0);
}
return container.stackTagCompound.getInteger(LP_STORED);
}
@Override
public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4)
{
par3List.add(StatCollector.translateToLocal("tooltip.armor.lifeImbuedArmor"));
par3List.add(StatCollector.translateToLocal("tooltip.fillable.currentAmount") + " " + EnumChatFormatting.RED + par1ItemStack.getTagCompound().getInteger(LP_STORED));
}
@Override
public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type)
{
if (this != ModItems.life_imbued_leggings)
{
return "BloodArsenal:models/armor/life_imbued_layer_1.png";
}
else
{
return "BloodArsenal:models/armor/life_imbued_layer_2.png";
}
}
@Override
public boolean getIsRepairable(ItemStack itemToRepair, ItemStack stack)
{
return false;
}
@Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
return super.onItemRightClick(par1ItemStack, par2World, par3EntityPlayer);
}
@Override
public int getMaxDamage(ItemStack stack)
{
return maxLP;
}
@Override
public EnumRarity getRarity(ItemStack stack)
{
return EnumRarity.rare;
}
@Override
public void setDamage(ItemStack stack, int damage)
{
super.setDamage(stack, 0);
}
@Override
public boolean isDamaged(ItemStack stack)
{
return true;
}
@Override
public int getDisplayDamage(ItemStack stack)
{
if (stack.stackTagCompound == null)
{
setCurrentLPStored(stack, 0);
}
return maxLP - stack.stackTagCompound.getInteger(LP_STORED);
}
@Override
public boolean showDurabilityBar(ItemStack stack)
{
return stack.stackTagCompound == null || !stack.stackTagCompound.getBoolean("CreativeTab");
}
@Override
public void getSubItems(Item item, CreativeTabs tab, List list)
{
list.add(setCurrentLPStored(new ItemStack(item, 1, 0), 0));
list.add(setCurrentLPStored(new ItemStack(item, 1, 0), maxLP));
}
private ItemStack setCurrentLPStored(ItemStack itemStack, int amount)
{
if (itemStack.stackTagCompound == null)
{
itemStack.setTagCompound(new NBTTagCompound());
}
itemStack.getTagCompound().setInteger(LP_STORED, amount);
return itemStack;
}
protected int getBaseAbsorption()
{
return 18;
}
protected int getAbsorptionRatio()
{
switch (armorType)
{
case 0:
return 15;
case 1:
return 40;
case 2:
return 30;
case 3:
return 15;
}
return 0;
}
@Override
public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot)
{
if (getLPStored(armor) >= getLPPerDamage(armor))
{
return Math.min(getBaseAbsorption(), 20) * getAbsorptionRatio() / 100;
}
return 0;
}
@Override
public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage, int slot)
{
if (source.isUnblockable())
{
int absorbMax = getLPPerDamage(armor) > 0 ? 25 * getLPStored(armor) / getLPPerDamage(armor) : 0;
return new ArmorProperties(0, absorbRatio * getArmorMaterial().getDamageReductionAmount(armorType) * 0.025, absorbMax);
}
int absorbMax = getLPPerDamage(armor) > 0 ? 25 * getLPStored(armor) / getLPPerDamage(armor) : 0;
return new ArmorProperties(0, absorbRatio * getArmorMaterial().getDamageReductionAmount(armorType) * 0.05, absorbMax);
}
@Override
public void damageArmor(EntityLivingBase entity, ItemStack armor, DamageSource source, int damage, int slot)
{
subtractLP(armor, damage * getLPPerDamage(armor), false);
}
protected int getLPPerDamage(ItemStack stack)
{
int unbreakingLevel = MathHelper.clamp_int(EnchantmentHelper.getEnchantmentLevel(Enchantment.unbreaking.effectId, stack), 0, 4);
return 100 * (5 - unbreakingLevel) / 5;
}
public int subtractLP(ItemStack container, int maxExtract, boolean simulate)
{
if (container.stackTagCompound == null)
{
setCurrentLPStored(container, 0);
}
int stored = container.stackTagCompound.getInteger(LP_STORED);
int extract = Math.min(maxExtract, stored);
if (!simulate)
{
stored -= extract;
container.stackTagCompound.setInteger(LP_STORED, stored);
}
return extract;
}
@Override
public void onArmorTick(World world, EntityPlayer player, ItemStack armor)
{
if (hasArmorSetItem(player, 0) && hasArmorSetItem(player, 1) && hasArmorSetItem(player, 2) && hasArmorSetItem(player, 3))
{
if (player.getHealth() < player.getMaxHealth() && !player.isPotionActive(AlchemicalWizardry.customPotionInhibit))
{
if (world.getWorldTime() % 50 == 0)
{
Random random = new Random();
if (random.nextInt(9) > 7)
{
LifeImbuedArmor thisArmor = (LifeImbuedArmor) armor.getItem();
if (thisArmor.getLPStored(armor) >= 2000)
{
float healHealth = player.getMaxHealth() - player.getHealth();
player.setHealth(player.getHealth() + healHealth);
player.onUpdate();
thisArmor.subtractLP(armor, ((int) healHealth) * 200, false);
}
}
}
}
}
}
public boolean hasArmorSetItem(EntityPlayer player, int i)
{
ItemStack stack = player.inventory.armorInventory[3 - i];
if (stack == null)
{
return false;
}
switch (i)
{
case 0: return stack.getItem() == ModItems.life_imbued_helmet;
case 1: return stack.getItem() == ModItems.life_imbued_chestplate;
case 2: return stack.getItem() == ModItems.life_imbued_leggings;
case 3: return stack.getItem() == ModItems.life_imbued_boots;
}
return false;
}
}
@@ -1,8 +1,8 @@
package com.arc.bloodarsenal.items.armor;
package com.arc.bloodarsenal.common.items.armor;
import com.arc.bloodarsenal.BloodArsenal;
import com.arc.bloodarsenal.items.ModItems;
import com.arc.bloodarsenal.renderer.model.ModelVampireCostume;
import com.arc.bloodarsenal.common.BloodArsenal;
import com.arc.bloodarsenal.common.items.ModItems;
import com.arc.bloodarsenal.client.renderer.model.ModelVampireCostume;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.model.ModelBiped;
@@ -19,8 +19,6 @@ import net.minecraft.potion.PotionEffect;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import java.util.Calendar;
public class VampireCostume extends ItemArmor
{
private static IIcon chestIcon;
@@ -1,6 +1,5 @@
package com.arc.bloodarsenal.items.bauble;
package com.arc.bloodarsenal.common.items.bauble;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
@@ -10,7 +9,6 @@ import baubles.api.BaubleType;
import baubles.api.IBauble;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
@@ -1,4 +1,4 @@
package com.arc.bloodarsenal.items.bauble;
package com.arc.bloodarsenal.common.items.bauble;
import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
@@ -1,22 +1,16 @@
package com.arc.bloodarsenal.items.bauble;
package com.arc.bloodarsenal.common.items.bauble;
import baubles.api.IBauble;
import baubles.common.container.InventoryBaubles;
import baubles.common.lib.PlayerHandler;
import com.arc.bloodarsenal.BloodArsenal;
import com.arc.bloodarsenal.common.BloodArsenal;
import cpw.mods.fml.common.Optional;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
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.util.IIcon;
import net.minecraft.world.World;
import java.util.List;
@Optional.Interface(iface = "baubles.api.IBauble", modid = "Baubles")
public abstract class ItemBauble extends Item implements IBauble
{
@@ -1,4 +1,4 @@
package com.arc.bloodarsenal.items.bauble;
package com.arc.bloodarsenal.common.items.bauble;
import WayofTime.alchemicalWizardry.api.items.IAltarManipulator;
import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar;
@@ -12,7 +12,6 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.IIcon;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
@@ -1,4 +1,4 @@
package com.arc.bloodarsenal.items.bauble;
package com.arc.bloodarsenal.common.items.bauble;
import WayofTime.alchemicalWizardry.api.items.IAltarManipulator;
import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar;
@@ -12,7 +12,6 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.IIcon;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
@@ -1,9 +1,9 @@
package com.arc.bloodarsenal.items.bauble;
package com.arc.bloodarsenal.common.items.bauble;
import baubles.api.BaubleType;
import baubles.api.IBauble;
import com.arc.bloodarsenal.BloodArsenal;
import com.arc.bloodarsenal.BloodArsenalConfig;
import com.arc.bloodarsenal.common.BloodArsenal;
import com.arc.bloodarsenal.common.BloodArsenalConfig;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister;
@@ -11,7 +11,6 @@ import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.potion.PotionEffect;
import net.minecraft.util.IIcon;
public class VampireRing extends ItemBauble implements IBauble
{
@@ -1,4 +1,4 @@
package com.arc.bloodarsenal.items.block;
package com.arc.bloodarsenal.common.items.block;
import net.minecraft.block.Block;
import net.minecraft.item.ItemBlock;
@@ -1,15 +1,11 @@
package com.arc.bloodarsenal.items.block;
package com.arc.bloodarsenal.common.items.block;
import WayofTime.alchemicalWizardry.api.rituals.Rituals;
import com.arc.bloodarsenal.block.BlockCompactedMRS;
import com.arc.bloodarsenal.block.ModBlocks;
import com.arc.bloodarsenal.tileentity.TileCompactedMRS;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector;
@@ -1,6 +1,5 @@
package com.arc.bloodarsenal.items.block;
package com.arc.bloodarsenal.common.items.block;
import WayofTime.alchemicalWizardry.api.rituals.Rituals;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
@@ -1,5 +1,6 @@
package com.arc.bloodarsenal.items.orb;
package com.arc.bloodarsenal.common.items.orb;
import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
import WayofTime.alchemicalWizardry.common.items.EnergyBattery;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -45,7 +46,7 @@ public class TransparentOrb extends EnergyBattery
int maxEssence = this.getMaxEssence();
int section = maxEssence / 23;
int currentEssence = this.getCurrentEssence(itemStack);
int currentEssence = SoulNetworkHandler.getCurrentEssence(SoulNetworkHandler.getOwnerName(itemStack));
if (currentEssence != 0)
{
@@ -1,11 +1,10 @@
package com.arc.bloodarsenal.items.sigil;
package com.arc.bloodarsenal.common.items.sigil;
import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade;
import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import com.arc.bloodarsenal.BloodArsenal;
import com.arc.bloodarsenal.BloodArsenalConfig;
import com.arc.bloodarsenal.common.BloodArsenalConfig;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister;
@@ -1,9 +1,10 @@
package com.arc.bloodarsenal.items.sigil;
package com.arc.bloodarsenal.common.items.sigil;
import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil;
import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import com.arc.bloodarsenal.BloodArsenalConfig;
import com.arc.bloodarsenal.common.BloodArsenalConfig;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
@@ -84,7 +85,7 @@ public class SigilEnder extends EnergyItems implements IBindable, ISigil
Vec3 vec3 = Vec3.createVectorHelper(ex, wy, zee);
double distance = playerPrevPos.distanceTo(vec3);
if (EnergyItems.getCurrentEssence(itemStack.getTagCompound().getString("ownerName")) >= distance * BloodArsenalConfig.enderSigilTeleportMultiplier || player.capabilities.isCreativeMode)
if (SoulNetworkHandler.getCurrentEssence(itemStack.getTagCompound().getString("ownerName")) >= distance * BloodArsenalConfig.enderSigilTeleportMultiplier || player.capabilities.isCreativeMode)
{
for (int k = 0; k < 8; ++k)
{
@@ -1,9 +1,10 @@
package com.arc.bloodarsenal.items.sigil;
package com.arc.bloodarsenal.common.items.sigil;
import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil;
import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import com.arc.bloodarsenal.BloodArsenalConfig;
import com.arc.bloodarsenal.common.BloodArsenalConfig;
import net.minecraft.entity.effect.EntityLightningBolt;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
@@ -29,7 +30,7 @@ public class SigilLightning extends EnergyItems implements IBindable, ISigil
{
int mode = par1ItemStack.getItemDamage();
par3List.add(StatCollector.translateToLocal("tooltip.sigil.lightning"));
par3List.add(StatCollector.translateToLocal("tooltip.sigil.lightning2") + (mode + 1));
par3List.add(StatCollector.translateToLocal("tooltip.sigil.lightning2") + " " + (mode + 1));
if (!(par1ItemStack.stackTagCompound == null))
{
@@ -57,7 +58,7 @@ public class SigilLightning extends EnergyItems implements IBindable, ISigil
if (world.isRemote)
{
int mode = itemStack.getItemDamage();
IChatComponent chatComponent = new ChatComponentText(StatCollector.translateToLocal("tooltip.sigil.lightning2") + (mode + 1));
IChatComponent chatComponent = new ChatComponentText(StatCollector.translateToLocal("tooltip.sigil.lightning2") + " " + (mode + 1));
player.addChatComponentMessage(chatComponent);
}
@@ -121,7 +122,7 @@ public class SigilLightning extends EnergyItems implements IBindable, ISigil
break;
}
if (EnergyItems.getCurrentEssence(itemStack.getTagCompound().getString("ownerName")) >= cost || player.capabilities.isCreativeMode)
if (SoulNetworkHandler.getCurrentEssence(itemStack.getTagCompound().getString("ownerName")) >= cost || player.capabilities.isCreativeMode)
{
switch (mode)
{
@@ -1,10 +1,10 @@
package com.arc.bloodarsenal.items.sigil;
package com.arc.bloodarsenal.common.items.sigil;
import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade;
import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import com.arc.bloodarsenal.BloodArsenalConfig;
import com.arc.bloodarsenal.common.BloodArsenalConfig;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister;
@@ -1,8 +1,8 @@
package com.arc.bloodarsenal.items.sigil;
package com.arc.bloodarsenal.common.items.sigil;
import com.arc.bloodarsenal.items.sigil.holding.AHPacketHandler;
import com.arc.bloodarsenal.items.sigil.holding.AHPacketProcessor;
import com.arc.bloodarsenal.items.sigil.holding.SigilAugmentedHolding;
import com.arc.bloodarsenal.common.items.sigil.holding.AHPacketHandler;
import com.arc.bloodarsenal.common.items.sigil.holding.AHPacketProcessor;
import com.arc.bloodarsenal.common.items.sigil.holding.SigilAugmentedHolding;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -1,4 +1,4 @@
package com.arc.bloodarsenal.items.sigil.holding;
package com.arc.bloodarsenal.common.items.sigil.holding;
import cpw.mods.fml.common.network.NetworkRegistry;
import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper;
@@ -1,4 +1,4 @@
package com.arc.bloodarsenal.items.sigil.holding;
package com.arc.bloodarsenal.common.items.sigil.holding;
import cpw.mods.fml.common.network.simpleimpl.IMessage;
import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
@@ -1,4 +1,4 @@
package com.arc.bloodarsenal.items.sigil.holding;
package com.arc.bloodarsenal.common.items.sigil.holding;
import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil;
import cpw.mods.fml.common.FMLCommonHandler;
@@ -1,4 +1,4 @@
package com.arc.bloodarsenal.items.sigil.holding;
package com.arc.bloodarsenal.common.items.sigil.holding;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -1,4 +1,4 @@
package com.arc.bloodarsenal.items.sigil.holding;
package com.arc.bloodarsenal.common.items.sigil.holding;
import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil;
import net.minecraft.entity.player.EntityPlayer;
@@ -1,13 +1,12 @@
package com.arc.bloodarsenal.items.sigil.holding;
package com.arc.bloodarsenal.common.items.sigil.holding;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import com.arc.bloodarsenal.BloodArsenal;
import com.arc.bloodarsenal.common.BloodArsenal;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.util.ChatComponentText;
import net.minecraft.util.IIcon;
import net.minecraft.util.MathHelper;
import net.minecraft.util.StatCollector;
@@ -1,8 +1,8 @@
package com.arc.bloodarsenal.items.tool;
package com.arc.bloodarsenal.common.items.tool;
import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import com.arc.bloodarsenal.BloodArsenal;
import com.arc.bloodarsenal.common.BloodArsenal;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister;
@@ -1,8 +1,8 @@
package com.arc.bloodarsenal.items.tool;
package com.arc.bloodarsenal.common.items.tool;
import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import com.arc.bloodarsenal.BloodArsenal;
import com.arc.bloodarsenal.common.BloodArsenal;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister;
@@ -32,7 +32,7 @@ public class BoundIgniter extends Item implements IBindable
setUnlocalizedName("bound_igniter");
setMaxStackSize(1);
setCreativeTab(BloodArsenal.BA_TAB);
setEnergyUsed(50);
setEnergyUsed(100);
}
public void setEnergyUsed(int i)
@@ -1,9 +1,9 @@
package com.arc.bloodarsenal.items.tool;
package com.arc.bloodarsenal.common.items.tool;
import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import com.arc.bloodarsenal.BloodArsenal;
import com.arc.bloodarsenal.entity.mob.EntityBloodHound;
import com.arc.bloodarsenal.common.BloodArsenal;
import com.arc.bloodarsenal.common.entity.mob.EntityBloodHound;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
@@ -1,9 +1,9 @@
package com.arc.bloodarsenal.items.tool;
package com.arc.bloodarsenal.common.items.tool;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import com.google.common.collect.Sets;
import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
import com.arc.bloodarsenal.BloodArsenal;
import com.arc.bloodarsenal.common.BloodArsenal;
import cpw.mods.fml.common.eventhandler.Event;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -1,9 +1,9 @@
package com.arc.bloodarsenal.items.tool;
package com.arc.bloodarsenal.common.items.tool;
import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import com.arc.bloodarsenal.BloodArsenal;
import com.arc.bloodarsenal.entity.projectile.EntityGatlingProjectile;
import com.arc.bloodarsenal.common.BloodArsenal;
import com.arc.bloodarsenal.common.entity.projectile.EntityGatlingProjectile;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister;
@@ -1,18 +1,15 @@
package com.arc.bloodarsenal.items.tool;
package com.arc.bloodarsenal.common.items.tool;
import WayofTime.alchemicalWizardry.api.tile.IBloodAltar;
import WayofTime.alchemicalWizardry.common.IDemon;
import WayofTime.alchemicalWizardry.common.demonVillage.demonHoard.demon.IHoardDemon;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
import com.arc.bloodarsenal.BloodArsenal;
import com.arc.bloodarsenal.BloodArsenalConfig;
import com.arc.bloodarsenal.common.BloodArsenal;
import com.arc.bloodarsenal.common.BloodArsenalConfig;
import com.google.common.collect.Multimap;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.SharedMonsterAttributes;
import net.minecraft.entity.ai.attributes.AttributeModifier;
@@ -1,12 +1,12 @@
package com.arc.bloodarsenal.items.tool;
package com.arc.bloodarsenal.common.items.tool;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.api.event.SacrificeKnifeUsedEvent;
import WayofTime.alchemicalWizardry.api.sacrifice.PlayerSacrificeHandler;
import WayofTime.alchemicalWizardry.api.tile.IBloodAltar;
import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
import com.arc.bloodarsenal.BloodArsenal;
import com.arc.bloodarsenal.BloodArsenalConfig;
import com.arc.bloodarsenal.common.BloodArsenal;
import com.arc.bloodarsenal.common.BloodArsenalConfig;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister;
@@ -0,0 +1,12 @@
package com.arc.bloodarsenal.common.items.tool;
import net.minecraft.item.ItemStack;
public interface IFillable
{
int getMaxLP();
int getLPStored(ItemStack container);
void incrementLPStored(ItemStack itemStack, int incrementAmount);
}
@@ -1,7 +1,7 @@
package com.arc.bloodarsenal.items.tool;
package com.arc.bloodarsenal.common.items.tool;
import com.arc.bloodarsenal.BloodArsenal;
import com.arc.bloodarsenal.items.ModItems;
import com.arc.bloodarsenal.common.BloodArsenal;
import com.arc.bloodarsenal.common.items.ModItems;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister;
Loaded 100 of 159 files, more files were not shown because too many files have changed in this diff. Show more