mirror of
https://github.com/GTNewHorizons/BloodArsenal.git
synced 2026-11-18 19:39:14 +00:00
[ci skip] spotlessApply with the new settings
This commit is contained in:
1 parent
5a9311ca6e
commit
555f44ae6d
136 files changed
+1979
-1530
No files matched your search
@@ -1,5 +1,11 @@
|
||||
package com.arc.bloodarsenal.client;
|
||||
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemBlock;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.client.MinecraftForgeClient;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
|
||||
import com.arc.bloodarsenal.client.renderer.block.*;
|
||||
import com.arc.bloodarsenal.client.renderer.block.TilePortableAltarRenderer;
|
||||
import com.arc.bloodarsenal.client.renderer.block.item.TilePortableAltarItemRenderer;
|
||||
@@ -12,16 +18,13 @@ import com.arc.bloodarsenal.common.items.sigil.SigilUtils;
|
||||
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;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemBlock;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.client.MinecraftForgeClient;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
|
||||
public class ClientProxy extends CommonProxy {
|
||||
|
||||
@Override
|
||||
public void init() {
|
||||
registerRenders();
|
||||
@@ -35,11 +38,11 @@ public class ClientProxy extends CommonProxy {
|
||||
MinecraftForgeClient.registerItemRenderer(ModItems.bound_bow, new RenderBow());
|
||||
|
||||
RenderingRegistry.registerEntityRenderingHandler(EntityBloodTNT.class, new RenderBloodTNTPrimed());
|
||||
// RenderingRegistry.registerEntityRenderingHandler(EntityBloodHound.class, new
|
||||
// RenderingRegistry.registerEntityRenderingHandler(EntityBloodHound.class, new
|
||||
// RenderEntityBloodHound(new ModelWolf(), new ModelWolf(), 0.5F));
|
||||
|
||||
MinecraftForgeClient.registerItemRenderer(
|
||||
Item.getItemFromBlock(ModBlocks.life_infuser), new RenderTileLifeInfuser());
|
||||
MinecraftForgeClient
|
||||
.registerItemRenderer(Item.getItemFromBlock(ModBlocks.life_infuser), new RenderTileLifeInfuser());
|
||||
|
||||
ClientRegistry.bindTileEntitySpecialRenderer(TilePortableAltar.class, new TilePortableAltarRenderer());
|
||||
ClientRegistry.bindTileEntitySpecialRenderer(TileLifeInfuser.class, new TileLifeInfuserRenderer());
|
||||
@@ -58,7 +61,8 @@ public class ClientProxy extends CommonProxy {
|
||||
@Override
|
||||
public void initRendering() {
|
||||
MinecraftForgeClient.registerItemRenderer(
|
||||
ItemBlock.getItemFromBlock(ModBlocks.portable_altar), new TilePortableAltarItemRenderer());
|
||||
ItemBlock.getItemFromBlock(ModBlocks.portable_altar),
|
||||
new TilePortableAltarItemRenderer());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
+11
-17
@@ -1,18 +1,22 @@
|
||||
package com.arc.bloodarsenal.client.renderer.block;
|
||||
|
||||
import com.arc.bloodarsenal.common.block.ModBlocks;
|
||||
import com.arc.bloodarsenal.common.entity.EntityBloodTNT;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.minecraft.client.renderer.RenderBlocks;
|
||||
import net.minecraft.client.renderer.entity.Render;
|
||||
import net.minecraft.client.renderer.texture.TextureMap;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import com.arc.bloodarsenal.common.block.ModBlocks;
|
||||
import com.arc.bloodarsenal.common.entity.EntityBloodTNT;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public class RenderBloodTNTPrimed extends Render {
|
||||
|
||||
private RenderBlocks blockRenderer = new RenderBlocks();
|
||||
|
||||
public RenderBloodTNTPrimed() {
|
||||
@@ -25,13 +29,8 @@ public class RenderBloodTNTPrimed extends Render {
|
||||
* (Render<T extends Entity) and this method has signature public void func_76986_a(T entity, double d, double d1,
|
||||
* double d2, float f, float f1). But JAD is pre 1.5 so doesn't do that.
|
||||
*/
|
||||
public void doRender(
|
||||
EntityBloodTNT p_76986_1_,
|
||||
double p_76986_2_,
|
||||
double p_76986_4_,
|
||||
double p_76986_6_,
|
||||
float p_76986_8_,
|
||||
float p_76986_9_) {
|
||||
public void doRender(EntityBloodTNT p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_,
|
||||
float p_76986_8_, float p_76986_9_) {
|
||||
GL11.glPushMatrix();
|
||||
GL11.glTranslatef((float) p_76986_2_, (float) p_76986_4_, (float) p_76986_6_);
|
||||
float f2;
|
||||
@@ -93,12 +92,7 @@ public class RenderBloodTNTPrimed extends Render {
|
||||
* (Render<T extends Entity) and this method has signature public void func_76986_a(T entity, double d, double d1,
|
||||
* double d2, float f, float f1). But JAD is pre 1.5 so doesn't do that.
|
||||
*/
|
||||
public void doRender(
|
||||
Entity p_76986_1_,
|
||||
double p_76986_2_,
|
||||
double p_76986_4_,
|
||||
double p_76986_6_,
|
||||
float p_76986_8_,
|
||||
public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_,
|
||||
float p_76986_9_) {
|
||||
this.doRender((EntityBloodTNT) p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
|
||||
}
|
||||
|
||||
@@ -1,16 +1,20 @@
|
||||
package com.arc.bloodarsenal.client.renderer.block;
|
||||
|
||||
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;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraftforge.client.IItemRenderer;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
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;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public class RenderTileLifeInfuser implements IItemRenderer {
|
||||
|
||||
private ModelLifeInfuser modelLifeInfuser = new ModelLifeInfuser();
|
||||
|
||||
@Override
|
||||
|
||||
+7
-3
@@ -1,8 +1,5 @@
|
||||
package com.arc.bloodarsenal.client.renderer.block;
|
||||
|
||||
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;
|
||||
import net.minecraft.client.renderer.entity.RenderManager;
|
||||
@@ -12,15 +9,22 @@ import net.minecraft.item.ItemBlock;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import org.lwjgl.opengl.GL12;
|
||||
|
||||
import com.arc.bloodarsenal.client.renderer.model.ModelLifeInfuser;
|
||||
import com.arc.bloodarsenal.common.tileentity.TileLifeInfuser;
|
||||
import cpw.mods.fml.client.FMLClientHandler;
|
||||
|
||||
public class TileLifeInfuserRenderer extends TileEntitySpecialRenderer {
|
||||
|
||||
private ModelLifeInfuser modelLifeInfuser = new ModelLifeInfuser();
|
||||
RenderItem customRenderItem;
|
||||
|
||||
public TileLifeInfuserRenderer() {
|
||||
customRenderItem = new RenderItem() {
|
||||
|
||||
@Override
|
||||
public boolean shouldBob() {
|
||||
return false;
|
||||
|
||||
+8
-4
@@ -1,7 +1,5 @@
|
||||
package com.arc.bloodarsenal.client.renderer.block;
|
||||
|
||||
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;
|
||||
@@ -10,14 +8,20 @@ import net.minecraft.item.ItemBlock;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import com.arc.bloodarsenal.client.renderer.model.ModelPortableBloodAltar;
|
||||
import com.arc.bloodarsenal.common.tileentity.TilePortableAltar;
|
||||
|
||||
public class TilePortableAltarRenderer extends TileEntitySpecialRenderer {
|
||||
|
||||
private ModelPortableBloodAltar modelBloodAltar = new ModelPortableBloodAltar();
|
||||
private final RenderItem customRenderItem;
|
||||
|
||||
public TilePortableAltarRenderer() {
|
||||
customRenderItem = new RenderItem() {
|
||||
|
||||
@Override
|
||||
public boolean shouldBob() {
|
||||
return false;
|
||||
@@ -104,8 +108,8 @@ public class TilePortableAltarRenderer extends TileEntitySpecialRenderer {
|
||||
return scaleFactor;
|
||||
}
|
||||
|
||||
private void translateGhostItemByOrientation(
|
||||
ItemStack ghostItemStack, double x, double y, double z, ForgeDirection forgeDirection) {
|
||||
private void translateGhostItemByOrientation(ItemStack ghostItemStack, double x, double y, double z,
|
||||
ForgeDirection forgeDirection) {
|
||||
if (ghostItemStack != null) {
|
||||
if (ghostItemStack.getItem() instanceof ItemBlock) {
|
||||
switch (forgeDirection) {
|
||||
|
||||
+5
-2
@@ -1,14 +1,17 @@
|
||||
package com.arc.bloodarsenal.client.renderer.block.item;
|
||||
|
||||
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;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraftforge.client.IItemRenderer;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import com.arc.bloodarsenal.client.renderer.model.ModelPortableBloodAltar;
|
||||
import cpw.mods.fml.client.FMLClientHandler;
|
||||
|
||||
public class TilePortableAltarItemRenderer implements IItemRenderer {
|
||||
|
||||
private ModelPortableBloodAltar modelBloodAltar;
|
||||
|
||||
public TilePortableAltarItemRenderer() {
|
||||
|
||||
+11
-7
@@ -1,22 +1,26 @@
|
||||
package com.arc.bloodarsenal.client.renderer.entity;
|
||||
|
||||
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.util.ResourceLocation;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import com.arc.bloodarsenal.common.entity.mob.EntityBloodHound;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public class RenderEntityBloodHound extends RenderLiving {
|
||||
|
||||
private static final ResourceLocation wolfTextures = new ResourceLocation("textures/entity/wolf/wolf.png");
|
||||
private static final ResourceLocation tamedWolfTextures =
|
||||
new ResourceLocation("textures/entity/wolf/wolf_tame.png");
|
||||
private static final ResourceLocation anrgyWolfTextures =
|
||||
new ResourceLocation("textures/entity/wolf/wolf_angry.png");
|
||||
private static final ResourceLocation tamedWolfTextures = new ResourceLocation(
|
||||
"textures/entity/wolf/wolf_tame.png");
|
||||
private static final ResourceLocation anrgyWolfTextures = new ResourceLocation(
|
||||
"textures/entity/wolf/wolf_angry.png");
|
||||
|
||||
public RenderEntityBloodHound(ModelBase p_i1269_1_, ModelBase p_i1269_2_, float p_i1269_3_) {
|
||||
super(p_i1269_1_, p_i1269_3_);
|
||||
|
||||
@@ -1,17 +1,20 @@
|
||||
package com.arc.bloodarsenal.client.renderer.item;
|
||||
|
||||
import cpw.mods.fml.relauncher.ReflectionHelper;
|
||||
import net.minecraft.client.renderer.ItemRenderer;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraftforge.client.IItemRenderer;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import cpw.mods.fml.relauncher.ReflectionHelper;
|
||||
|
||||
public class RenderBow implements IItemRenderer {
|
||||
public static final String[] ITEM_IN_USE = new String[] {"itemInUse", "field_71074_e", "f"};
|
||||
public static final String[] ITEM_IN_USE_COUNT = new String[] {"itemInUseCount", "field_71072_f", "g"};
|
||||
|
||||
public static final String[] ITEM_IN_USE = new String[] { "itemInUse", "field_71074_e", "f" };
|
||||
public static final String[] ITEM_IN_USE_COUNT = new String[] { "itemInUseCount", "field_71072_f", "g" };
|
||||
|
||||
@Override
|
||||
public boolean handleRenderType(ItemStack item, ItemRenderType type) {
|
||||
@@ -76,8 +79,8 @@ public class RenderBow implements IItemRenderer {
|
||||
GL11.glEnable(GL11.GL_BLEND);
|
||||
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
GL11.glColor4f(1F, 1F, 1F, 1F);
|
||||
ItemRenderer.renderItemIn2D(
|
||||
Tessellator.instance, f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), scale);
|
||||
ItemRenderer
|
||||
.renderItemIn2D(Tessellator.instance, f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), scale);
|
||||
|
||||
GL11.glDisable(GL11.GL_BLEND);
|
||||
GL11.glPopMatrix();
|
||||
|
||||
@@ -1,20 +1,22 @@
|
||||
package com.arc.bloodarsenal.client.renderer.model;
|
||||
|
||||
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.util.ResourceLocation;
|
||||
import net.minecraftforge.client.model.IModelCustom;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import com.arc.bloodarsenal.common.tileentity.TileLifeInfuser;
|
||||
import cpw.mods.fml.client.FMLClientHandler;
|
||||
|
||||
/**
|
||||
* LifeInfuser - Arcaratus
|
||||
* Created using Tabula 4.0.2
|
||||
* LifeInfuser - Arcaratus Created using Tabula 4.0.2
|
||||
*/
|
||||
public class ModelLifeInfuser extends ModelBase {
|
||||
private static final ResourceLocation texture =
|
||||
new ResourceLocation("bloodarsenal:textures/models/LifeInfuser.png");
|
||||
|
||||
private static final ResourceLocation texture = new ResourceLocation(
|
||||
"bloodarsenal:textures/models/LifeInfuser.png");
|
||||
private IModelCustom modelLifeInfuser;
|
||||
|
||||
public ModelRenderer Base;
|
||||
|
||||
+11
-7
@@ -1,8 +1,5 @@
|
||||
package com.arc.bloodarsenal.client.renderer.model;
|
||||
|
||||
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
|
||||
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;
|
||||
import net.minecraft.client.renderer.texture.TextureMap;
|
||||
@@ -10,17 +7,24 @@ import net.minecraft.util.IIcon;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraftforge.client.model.AdvancedModelLoader;
|
||||
import net.minecraftforge.client.model.IModelCustom;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
|
||||
|
||||
import com.arc.bloodarsenal.common.tileentity.TilePortableAltar;
|
||||
import cpw.mods.fml.client.FMLClientHandler;
|
||||
|
||||
public class ModelPortableBloodAltar extends ModelBase {
|
||||
private static final ResourceLocation altar_texture =
|
||||
new ResourceLocation("bloodarsenal:textures/models/altar.png");
|
||||
|
||||
private static final ResourceLocation altar_texture = new ResourceLocation(
|
||||
"bloodarsenal:textures/models/altar.png");
|
||||
|
||||
private IModelCustom modelBloodAltar;
|
||||
|
||||
public ModelPortableBloodAltar() {
|
||||
modelBloodAltar =
|
||||
AdvancedModelLoader.loadModel(new ResourceLocation("alchemicalwizardry:models/bloodaltar-fixeUV.obj"));
|
||||
modelBloodAltar = AdvancedModelLoader
|
||||
.loadModel(new ResourceLocation("alchemicalwizardry:models/bloodaltar-fixeUV.obj"));
|
||||
}
|
||||
|
||||
public void renderBloodAltar() {
|
||||
|
||||
@@ -5,6 +5,7 @@ import net.minecraft.client.model.ModelRenderer;
|
||||
import net.minecraft.entity.Entity;
|
||||
|
||||
public class ModelVampireCostume extends ModelBiped {
|
||||
|
||||
ModelRenderer Cape;
|
||||
ModelRenderer CowlL1;
|
||||
ModelRenderer CowlR1;
|
||||
@@ -64,21 +65,13 @@ public class ModelVampireCostume extends ModelBiped {
|
||||
CowlB.mirror = true;
|
||||
setRotation(CowlB, -0.5235988F, 0F, 0F);
|
||||
|
||||
/* CowlL2 = new ModelRenderer(this, 16, 4);
|
||||
CowlL2.mirror = true;
|
||||
CowlL2.addBox(0F, 0F, 0F, 0, 4, 3);
|
||||
CowlL2.setRotationPoint(4F, -3F, 6F);//4F, -3F, 6F
|
||||
CowlL2.setTextureSize(64, 32);
|
||||
CowlL2.mirror = true;
|
||||
setRotation(CowlL2, 0F, 2.356194F, 0.35F);
|
||||
|
||||
CowlR2 = new ModelRenderer(this, 16, 4);
|
||||
CowlR2.addBox(0F, 0F, 0F, 0, 4, 3);
|
||||
CowlR2.setRotationPoint(-6F, -3F, 4F);//-6F, -3F, 4F
|
||||
CowlR2.setTextureSize(64, 32);
|
||||
CowlR2.mirror = true;
|
||||
setRotation(CowlR2, 0F, 0.7853982F, -0.3490659F);
|
||||
*/
|
||||
/*
|
||||
* CowlL2 = new ModelRenderer(this, 16, 4); CowlL2.mirror = true; CowlL2.addBox(0F, 0F, 0F, 0, 4, 3);
|
||||
* CowlL2.setRotationPoint(4F, -3F, 6F);//4F, -3F, 6F CowlL2.setTextureSize(64, 32); CowlL2.mirror = true;
|
||||
* setRotation(CowlL2, 0F, 2.356194F, 0.35F); CowlR2 = new ModelRenderer(this, 16, 4); CowlR2.addBox(0F, 0F, 0F,
|
||||
* 0, 4, 3); CowlR2.setRotationPoint(-6F, -3F, 4F);//-6F, -3F, 4F CowlR2.setTextureSize(64, 32); CowlR2.mirror =
|
||||
* true; setRotation(CowlR2, 0F, 0.7853982F, -0.3490659F);
|
||||
*/
|
||||
GreaveR = new ModelRenderer(this, 0, 25);
|
||||
GreaveR.addBox(0F, 0F, 0F, 4, 6, 1);
|
||||
GreaveR.setRotationPoint(-2F, 3F, -3F); // -4F, 14F, -3F
|
||||
@@ -216,14 +209,10 @@ public class ModelVampireCostume extends ModelBiped {
|
||||
|
||||
this.bipedHead.cubeList.clear();
|
||||
this.bipedHeadwear.cubeList.clear();
|
||||
/* if (addChest)
|
||||
{
|
||||
this.bipedHead.addChild(this.CowlL1);
|
||||
this.bipedHead.addChild(this.CowlL2);
|
||||
this.bipedHead.addChild(this.CowlR1);
|
||||
this.bipedHead.addChild(this.CowlR2);
|
||||
}
|
||||
*/
|
||||
/*
|
||||
* if (addChest) { this.bipedHead.addChild(this.CowlL1); this.bipedHead.addChild(this.CowlL2);
|
||||
* this.bipedHead.addChild(this.CowlR1); this.bipedHead.addChild(this.CowlR2); }
|
||||
*/
|
||||
this.bipedBody.cubeList.clear();
|
||||
this.bipedRightArm.cubeList.clear();
|
||||
this.bipedLeftArm.cubeList.clear();
|
||||
@@ -240,9 +229,9 @@ public class ModelVampireCostume extends ModelBiped {
|
||||
|
||||
this.bipedBody.addChild(this.CowlB);
|
||||
this.bipedBody.addChild(this.CowlL1);
|
||||
// this.bipedBody.addChild(this.CowlL2);
|
||||
// this.bipedBody.addChild(this.CowlL2);
|
||||
this.bipedBody.addChild(this.CowlR1);
|
||||
// this.bipedBody.addChild(this.CowlR2);
|
||||
// this.bipedBody.addChild(this.CowlR2);
|
||||
}
|
||||
|
||||
this.bipedLeftLeg.cubeList.clear();
|
||||
|
||||
@@ -1,5 +1,21 @@
|
||||
package com.arc.bloodarsenal.common;
|
||||
|
||||
import java.io.File;
|
||||
import java.lang.reflect.Field;
|
||||
import java.lang.reflect.Modifier;
|
||||
import java.util.Calendar;
|
||||
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemArmor;
|
||||
import net.minecraft.potion.Potion;
|
||||
import net.minecraft.util.DamageSource;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.common.util.EnumHelper;
|
||||
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
|
||||
import com.arc.bloodarsenal.common.block.ModBlocks;
|
||||
import com.arc.bloodarsenal.common.entity.ModLivingDropsEvent;
|
||||
import com.arc.bloodarsenal.common.gui.GuiHandler;
|
||||
@@ -10,34 +26,22 @@ import com.arc.bloodarsenal.common.potion.PotionBloodArsenal;
|
||||
import com.arc.bloodarsenal.common.rituals.RitualRegistry;
|
||||
import com.arc.bloodarsenal.common.thaumcraft.BloodArsenalThaumcraft;
|
||||
import com.arc.bloodarsenal.common.tinkers.BloodArsenalTinkers;
|
||||
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
import cpw.mods.fml.common.Loader;
|
||||
import cpw.mods.fml.common.Mod;
|
||||
import cpw.mods.fml.common.SidedProxy;
|
||||
import cpw.mods.fml.common.event.*;
|
||||
import cpw.mods.fml.common.network.NetworkRegistry;
|
||||
import java.io.File;
|
||||
import java.lang.reflect.Field;
|
||||
import java.lang.reflect.Modifier;
|
||||
import java.util.Calendar;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemArmor;
|
||||
import net.minecraft.potion.Potion;
|
||||
import net.minecraft.util.DamageSource;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.common.util.EnumHelper;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
|
||||
@Mod(
|
||||
modid = BloodArsenal.MODID,
|
||||
version = BloodArsenal.VERSION,
|
||||
name = "GRADLETOKEN_MODNAME",
|
||||
dependencies =
|
||||
"required-after:AWWayofTime;after:NotEnoughItems;after:Baubles;after:guideapi;after:TConstruct;after:Waila;after:ForbiddenMagic",
|
||||
dependencies = "required-after:AWWayofTime;after:NotEnoughItems;after:Baubles;after:guideapi;after:TConstruct;after:Waila;after:ForbiddenMagic",
|
||||
guiFactory = "com.arc.bloodarsenal.common.gui.ConfigGuiFactory")
|
||||
public class BloodArsenal {
|
||||
|
||||
public static final String MODID = "GRADLETOKEN_MODID";
|
||||
public static final String VERSION = "GRADLETOKEN_VERSION";
|
||||
|
||||
@@ -57,20 +61,21 @@ public class BloodArsenal {
|
||||
public static Item.ToolMaterial infusedWood = EnumHelper.addToolMaterial("InfusedWood", 1, 0, 5.0F, 1.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 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, 13, 9, 4}, 0);
|
||||
public static ItemArmor.ArmorMaterial glassArmor =
|
||||
EnumHelper.addArmorMaterial("GlassArmor", 0, new int[] {1, 4, 3, 1}, 4);
|
||||
public static ItemArmor.ArmorMaterial elementalLifeImbuedArmor =
|
||||
EnumHelper.addArmorMaterial("ElementalImbuedArmor", 0, new int[] {6, 16, 12, 6}, 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, 13, 9, 4 }, 0);
|
||||
public static ItemArmor.ArmorMaterial glassArmor = EnumHelper
|
||||
.addArmorMaterial("GlassArmor", 0, new int[] { 1, 4, 3, 1 }, 4);
|
||||
public static ItemArmor.ArmorMaterial elementalLifeImbuedArmor = EnumHelper
|
||||
.addArmorMaterial("ElementalImbuedArmor", 0, new int[] { 6, 16, 12, 6 }, 0);
|
||||
|
||||
public static Logger logger = LogManager.getLogger(MODID);
|
||||
public static CreativeTabs BA_TAB = new CreativeTabs("BA_TAB") {
|
||||
|
||||
@Override
|
||||
public Item getTabIconItem() {
|
||||
return ModItems.bound_bow;
|
||||
@@ -142,17 +147,13 @@ public class BloodArsenal {
|
||||
|
||||
FMLInterModComms.sendMessage("Waila", "register", "com.arc.bloodarsenal.common.misc.WAILAPlugin.registerAddon");
|
||||
|
||||
vampiricAura = new PotionBloodArsenal(BloodArsenalConfig.vampiricAuraID, false, 0)
|
||||
.setIconIndex(0, 0)
|
||||
vampiricAura = new PotionBloodArsenal(BloodArsenalConfig.vampiricAuraID, false, 0).setIconIndex(0, 0)
|
||||
.setPotionName("Vampiric Aura");
|
||||
bleeding = new PotionBloodArsenal(BloodArsenalConfig.bleedingID, true, 0)
|
||||
.setIconIndex(1, 0)
|
||||
bleeding = new PotionBloodArsenal(BloodArsenalConfig.bleedingID, true, 0).setIconIndex(1, 0)
|
||||
.setPotionName("Bleeding");
|
||||
swimming = new PotionBloodArsenal(BloodArsenalConfig.swimmingID, false, 0)
|
||||
.setIconIndex(2, 0)
|
||||
swimming = new PotionBloodArsenal(BloodArsenalConfig.swimmingID, false, 0).setIconIndex(2, 0)
|
||||
.setPotionName("Swimming");
|
||||
soulBurn = new PotionBloodArsenal(BloodArsenalConfig.soulBurnID, true, 0)
|
||||
.setIconIndex(3, 0)
|
||||
soulBurn = new PotionBloodArsenal(BloodArsenalConfig.soulBurnID, true, 0).setIconIndex(3, 0)
|
||||
.setPotionName("Soul Burn");
|
||||
}
|
||||
|
||||
|
||||
@@ -1,9 +1,11 @@
|
||||
package com.arc.bloodarsenal.common;
|
||||
|
||||
import java.io.File;
|
||||
|
||||
import net.minecraftforge.common.config.Configuration;
|
||||
|
||||
public class BloodArsenalConfig {
|
||||
|
||||
public static Configuration config;
|
||||
|
||||
// Config Categories
|
||||
@@ -64,8 +66,8 @@ public class BloodArsenalConfig {
|
||||
try {
|
||||
syncConfig();
|
||||
} catch (Exception e) {
|
||||
BloodArsenal.logger.error(
|
||||
"There has been an error loading the configurations, go report this on the forum.");
|
||||
BloodArsenal.logger
|
||||
.error("There has been an error loading the configurations, go report this on the forum.");
|
||||
} finally {
|
||||
config.save();
|
||||
}
|
||||
@@ -84,29 +86,29 @@ public class BloodArsenalConfig {
|
||||
swimmingID = config.get(potionId, "Swimming", 122).getInt(swimmingID);
|
||||
soulBurnID = config.get(potionId, "Soul Burn", 123).getInt(soulBurnID);
|
||||
|
||||
ritualDisabledWither =
|
||||
config.get(ritualBlacklist, "Ritual of Withering", false).getBoolean(ritualDisabledWither);
|
||||
ritualDisabledWither = config.get(ritualBlacklist, "Ritual of Withering", false)
|
||||
.getBoolean(ritualDisabledWither);
|
||||
ritualDisabledMidas = config.get(ritualBlacklist, "Midas Touch", false).getBoolean(ritualDisabledMidas);
|
||||
ritualDisabledEnchantment =
|
||||
config.get(ritualBlacklist, "The Enchantress's Spell", false).getBoolean(ritualDisabledEnchantment);
|
||||
ritualDisabledMobOppression =
|
||||
config.get(ritualBlacklist, "Ritual of Mob Oppression", false).getBoolean(ritualDisabledMobOppression);
|
||||
ritualDisabledFisherman =
|
||||
config.get(ritualBlacklist, "Fisherman's Hymn", false).getBoolean(ritualDisabledFisherman);
|
||||
ritualDisabledEnchantment = config.get(ritualBlacklist, "The Enchantress's Spell", false)
|
||||
.getBoolean(ritualDisabledEnchantment);
|
||||
ritualDisabledMobOppression = config.get(ritualBlacklist, "Ritual of Mob Oppression", false)
|
||||
.getBoolean(ritualDisabledMobOppression);
|
||||
ritualDisabledFisherman = config.get(ritualBlacklist, "Fisherman's Hymn", false)
|
||||
.getBoolean(ritualDisabledFisherman);
|
||||
|
||||
blocksToBeDisabled = config.getStringList(
|
||||
"Disable blocks here",
|
||||
blockSettings,
|
||||
new String[] {""},
|
||||
new String[] { "" },
|
||||
"Type in the unlocalized name of the block you want disabled here (separate them using ENTER)");
|
||||
itemsToBeDisabled = config.getStringList(
|
||||
"Disable items here",
|
||||
itemSettings,
|
||||
new String[] {""},
|
||||
new String[] { "" },
|
||||
"Type in the unlocalized name of the item you want disabled (separate them using ENTER)");
|
||||
|
||||
baublesIntegration =
|
||||
config.get(modSettings, "Enable Baubles integration?", true).getBoolean(baublesIntegration);
|
||||
baublesIntegration = config.get(modSettings, "Enable Baubles integration?", true)
|
||||
.getBoolean(baublesIntegration);
|
||||
forgeMultipartIntegration = config.get(modSettings, "Enable Forge Multipart Integration?", true)
|
||||
.getBoolean(forgeMultipartIntegration);
|
||||
guideAPIIntegration = config.get(modSettings, "Enable the Blood Burned Tome from Guide-API?", true)
|
||||
@@ -117,11 +119,11 @@ public class BloodArsenalConfig {
|
||||
.getBoolean(tinkersIntegration);
|
||||
researchTag = config.get(modSettings, "Add [BA] to all of Blood Arsenal's research?", true)
|
||||
.getBoolean(researchTag);
|
||||
bloodInfusedWoodID = config.get(
|
||||
modSettings, "[Tinker's Construct] Material ID for Blood Infused Wood; Default: 250", 250)
|
||||
bloodInfusedWoodID = config
|
||||
.get(modSettings, "[Tinker's Construct] Material ID for Blood Infused Wood; Default: 250", 250)
|
||||
.getInt(bloodInfusedWoodID);
|
||||
bloodInfusedIronID = config.get(
|
||||
modSettings, "[Tinker's Construct] Material ID for Blood Infused Iron; Default: 251", 251)
|
||||
bloodInfusedIronID = config
|
||||
.get(modSettings, "[Tinker's Construct] Material ID for Blood Infused Iron; Default: 251", 251)
|
||||
.getInt(bloodInfusedIronID);
|
||||
|
||||
sigilSwimmingCost = config.get(lpSettings, "Sigil of Swimming cost; Default: 250", 250)
|
||||
@@ -130,25 +132,24 @@ public class BloodArsenalConfig {
|
||||
.getInt(sigilDivinityCost);
|
||||
enderSigilOpenCost = config.get(lpSettings, "Ender Sigil cost (to open the Ender Chest); Default: 400", 400)
|
||||
.getInt(enderSigilOpenCost);
|
||||
enderSigilTeleportMultiplier = config.get(
|
||||
lpSettings, "Ender Sigil cost (to teleport (multiplier)); Default: 500", 500)
|
||||
enderSigilTeleportMultiplier = config
|
||||
.get(lpSettings, "Ender Sigil cost (to teleport (multiplier)); Default: 500", 500)
|
||||
.getInt(enderSigilTeleportMultiplier);
|
||||
lightningSigilMultiplier = config.get(lpSettings, "Lightning Sigil cost (multiplier); Default: 1500", 1500)
|
||||
.getInt(lightningSigilMultiplier);
|
||||
lpMaterializerCost = config.get(
|
||||
lpSettings, "Converts this number to 100LE (from this (SN) to 100 (LE)); Default: 150", 150)
|
||||
lpMaterializerCost = config
|
||||
.get(lpSettings, "Converts this number to 100LE (from this (SN) to 100 (LE)); Default: 150", 150)
|
||||
.getInt(lpMaterializerCost);
|
||||
|
||||
isRedGood = config.get(
|
||||
misc,
|
||||
"Is RED > PURPLE?",
|
||||
false,
|
||||
"Purple is always better than Red. But I won't tell you how to live your life. Even if it is incorrect.")
|
||||
misc,
|
||||
"Is RED > PURPLE?",
|
||||
false,
|
||||
"Purple is always better than Red. But I won't tell you how to live your life. Even if it is incorrect.")
|
||||
.getBoolean(isRedGood);
|
||||
cakeIsLie = config.get(misc, "The cake is a lie", false, "The cake is a lie")
|
||||
.getBoolean(cakeIsLie);
|
||||
isGlassDangerous = config.get(
|
||||
misc, "Is glass dangerous?", true, "Breaking glass is dangerous unless you're a wimp")
|
||||
cakeIsLie = config.get(misc, "The cake is a lie", false, "The cake is a lie").getBoolean(cakeIsLie);
|
||||
isGlassDangerous = config
|
||||
.get(misc, "Is glass dangerous?", true, "Breaking glass is dangerous unless you're a wimp")
|
||||
.getBoolean(isGlassDangerous);
|
||||
|
||||
config.save();
|
||||
|
||||
@@ -1,12 +1,7 @@
|
||||
package com.arc.bloodarsenal.common;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
|
||||
import com.arc.bloodarsenal.common.items.ModItems;
|
||||
import com.arc.bloodarsenal.common.items.armor.GlassArmor;
|
||||
import cpw.mods.fml.client.event.ConfigChangedEvent;
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import java.util.Random;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockGlass;
|
||||
import net.minecraft.block.material.Material;
|
||||
@@ -24,7 +19,17 @@ import net.minecraftforge.event.entity.living.LivingEvent;
|
||||
import net.minecraftforge.event.entity.player.PlayerEvent;
|
||||
import net.minecraftforge.event.world.BlockEvent;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
|
||||
|
||||
import com.arc.bloodarsenal.common.items.ModItems;
|
||||
import com.arc.bloodarsenal.common.items.armor.GlassArmor;
|
||||
|
||||
import cpw.mods.fml.client.event.ConfigChangedEvent;
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
|
||||
public class BloodArsenalEventHooks {
|
||||
|
||||
private Random rand = new Random();
|
||||
|
||||
@SubscribeEvent
|
||||
@@ -61,8 +66,8 @@ public class BloodArsenalEventHooks {
|
||||
|
||||
if (armorStack != null && armorStack.getItem() instanceof GlassArmor) {
|
||||
if (entityAttacking instanceof EntityLivingBase) {
|
||||
((EntityLivingBase) entityAttacking)
|
||||
.addPotionEffect(new PotionEffect(
|
||||
((EntityLivingBase) entityAttacking).addPotionEffect(
|
||||
new PotionEffect(
|
||||
BloodArsenalConfig.bleedingID,
|
||||
rand.nextInt(3) * 20,
|
||||
rand.nextInt(1)));
|
||||
@@ -83,12 +88,8 @@ public class BloodArsenalEventHooks {
|
||||
if (entityLiving instanceof FakePlayer) return;
|
||||
|
||||
if (entityLiving.isPotionActive(BloodArsenal.bleeding)) {
|
||||
int amplifier = entityLiving
|
||||
.getActivePotionEffect(BloodArsenal.bleeding)
|
||||
.getAmplifier();
|
||||
int duration = entityLiving
|
||||
.getActivePotionEffect(BloodArsenal.bleeding)
|
||||
.getDuration();
|
||||
int amplifier = entityLiving.getActivePotionEffect(BloodArsenal.bleeding).getAmplifier();
|
||||
int duration = entityLiving.getActivePotionEffect(BloodArsenal.bleeding).getDuration();
|
||||
int damage = (rand.nextInt(2) * (amplifier + 1) + rand.nextInt(2));
|
||||
|
||||
entityLiving.addPotionEffect(new PotionEffect(Potion.blindness.id, duration, 1));
|
||||
@@ -100,16 +101,16 @@ public class BloodArsenalEventHooks {
|
||||
}
|
||||
|
||||
if (entityLiving.isPotionActive(BloodArsenal.soulBurn)) {
|
||||
int amplifier = entityLiving
|
||||
.getActivePotionEffect(BloodArsenal.soulBurn)
|
||||
.getAmplifier();
|
||||
int amplifier = entityLiving.getActivePotionEffect(BloodArsenal.soulBurn).getAmplifier();
|
||||
entityLiving.setFire(2);
|
||||
|
||||
if (entityLiving instanceof EntityPlayer && entityLiving.getHealth() > 0.0) {
|
||||
if (entityLiving.worldObj.getWorldTime() % (10 / (amplifier + 1)) == 0) {
|
||||
int lpToMinus = 1000 * (2 ^ (amplifier + 1));
|
||||
SoulNetworkHandler.syphonAndDamageFromNetwork(
|
||||
entityLiving.getCommandSenderName(), (EntityPlayer) entityLiving, lpToMinus);
|
||||
entityLiving.getCommandSenderName(),
|
||||
(EntityPlayer) entityLiving,
|
||||
lpToMinus);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,10 +1,5 @@
|
||||
package com.arc.bloodarsenal.common;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.AltarRecipeRegistry;
|
||||
import WayofTime.alchemicalWizardry.api.bindingRegistry.BindingRegistry;
|
||||
import WayofTime.alchemicalWizardry.api.items.ShapedBloodOrbRecipe;
|
||||
import com.arc.bloodarsenal.common.block.ModBlocks;
|
||||
import com.arc.bloodarsenal.common.items.ModItems;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -13,12 +8,32 @@ import net.minecraftforge.oredict.OreDictionary;
|
||||
import net.minecraftforge.oredict.ShapedOreRecipe;
|
||||
import net.minecraftforge.oredict.ShapelessOreRecipe;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.AltarRecipeRegistry;
|
||||
import WayofTime.alchemicalWizardry.api.bindingRegistry.BindingRegistry;
|
||||
import WayofTime.alchemicalWizardry.api.items.ShapedBloodOrbRecipe;
|
||||
|
||||
import com.arc.bloodarsenal.common.block.ModBlocks;
|
||||
import com.arc.bloodarsenal.common.items.ModItems;
|
||||
|
||||
public class BloodArsenalRecipes {
|
||||
|
||||
public static void registerAltarRecipes() {
|
||||
AltarRecipeRegistry.registerAltarRecipe(
|
||||
new ItemStack(ModBlocks.blood_tnt), new ItemStack(Blocks.tnt), 3, 10000, 5, 5, false);
|
||||
new ItemStack(ModBlocks.blood_tnt),
|
||||
new ItemStack(Blocks.tnt),
|
||||
3,
|
||||
10000,
|
||||
5,
|
||||
5,
|
||||
false);
|
||||
AltarRecipeRegistry.registerAltarRecipe(
|
||||
new ItemStack(ModBlocks.blood_infused_wood), new ItemStack(Blocks.log), 2, 3000, 5, 5, false);
|
||||
new ItemStack(ModBlocks.blood_infused_wood),
|
||||
new ItemStack(Blocks.log),
|
||||
2,
|
||||
3000,
|
||||
5,
|
||||
5,
|
||||
false);
|
||||
AltarRecipeRegistry.registerAltarRecipe(
|
||||
new ItemStack(ModBlocks.blood_infused_iron_block),
|
||||
new ItemStack(Blocks.iron_block),
|
||||
@@ -28,11 +43,29 @@ public class BloodArsenalRecipes {
|
||||
5,
|
||||
false);
|
||||
AltarRecipeRegistry.registerAltarRecipe(
|
||||
new ItemStack(ModItems.item_blood_cake), new ItemStack(Items.cake), 3, 10000, 5, 5, false);
|
||||
new ItemStack(ModItems.item_blood_cake),
|
||||
new ItemStack(Items.cake),
|
||||
3,
|
||||
10000,
|
||||
5,
|
||||
5,
|
||||
false);
|
||||
AltarRecipeRegistry.registerAltarRecipe(
|
||||
new ItemStack(ModItems.blood_infused_iron), new ItemStack(Items.iron_ingot), 3, 6000, 5, 5, false);
|
||||
new ItemStack(ModItems.blood_infused_iron),
|
||||
new ItemStack(Items.iron_ingot),
|
||||
3,
|
||||
6000,
|
||||
5,
|
||||
5,
|
||||
false);
|
||||
AltarRecipeRegistry.registerAltarRecipe(
|
||||
new ItemStack(ModItems.blood_orange), new ItemStack(Items.dye, 1, 14), 1, 200, 5, 5, false);
|
||||
new ItemStack(ModItems.blood_orange),
|
||||
new ItemStack(Items.dye, 1, 14),
|
||||
1,
|
||||
200,
|
||||
5,
|
||||
5,
|
||||
false);
|
||||
AltarRecipeRegistry.registerAltarRecipe(
|
||||
new ItemStack(ModItems.blood_infused_diamond_active),
|
||||
new ItemStack(ModItems.blood_infused_diamond_unactive),
|
||||
@@ -42,9 +75,21 @@ public class BloodArsenalRecipes {
|
||||
5,
|
||||
false);
|
||||
AltarRecipeRegistry.registerAltarRecipe(
|
||||
new ItemStack(ModItems.soul_fragment), new ItemStack(ModItems.heart), 4, 75000, 5, 5, false);
|
||||
new ItemStack(ModItems.soul_fragment),
|
||||
new ItemStack(ModItems.heart),
|
||||
4,
|
||||
75000,
|
||||
5,
|
||||
5,
|
||||
false);
|
||||
AltarRecipeRegistry.registerAltarRecipe(
|
||||
new ItemStack(ModItems.blood_cookie), new ItemStack(Items.cookie), 1, 2000, 5, 5, false);
|
||||
new ItemStack(ModItems.blood_cookie),
|
||||
new ItemStack(Items.cookie),
|
||||
1,
|
||||
2000,
|
||||
5,
|
||||
5,
|
||||
false);
|
||||
AltarRecipeRegistry.registerAltarRecipe(
|
||||
new ItemStack(ModItems.blood_infused_glowstone_dust),
|
||||
new ItemStack(Items.glowstone_dust),
|
||||
@@ -54,7 +99,13 @@ public class BloodArsenalRecipes {
|
||||
5,
|
||||
false);
|
||||
AltarRecipeRegistry.registerAltarRecipe(
|
||||
new ItemStack(ModItems.blood_money), new ItemStack(Items.paper), 3, 10000, 5, 5, false);
|
||||
new ItemStack(ModItems.blood_money),
|
||||
new ItemStack(Items.paper),
|
||||
3,
|
||||
10000,
|
||||
5,
|
||||
5,
|
||||
false);
|
||||
}
|
||||
|
||||
public static void registerBindingRecipes() {
|
||||
@@ -66,10 +117,10 @@ public class BloodArsenalRecipes {
|
||||
new ItemStack(ModItems.blood_infused_diamond_active));
|
||||
BindingRegistry.registerRecipe(new ItemStack(ModItems.bound_igniter), new ItemStack(Items.flint_and_steel));
|
||||
if (BloodArsenal.isHalloween()) {
|
||||
BindingRegistry.registerRecipe(
|
||||
new ItemStack(ModItems.vampire_cape), new ItemStack(Items.leather_chestplate));
|
||||
BindingRegistry.registerRecipe(
|
||||
new ItemStack(ModItems.vampire_greaves), new ItemStack(Items.leather_leggings));
|
||||
BindingRegistry
|
||||
.registerRecipe(new ItemStack(ModItems.vampire_cape), new ItemStack(Items.leather_chestplate));
|
||||
BindingRegistry
|
||||
.registerRecipe(new ItemStack(ModItems.vampire_greaves), new ItemStack(Items.leather_leggings));
|
||||
BindingRegistry.registerRecipe(new ItemStack(ModItems.vampire_boots), new ItemStack(Items.leather_boots));
|
||||
}
|
||||
}
|
||||
@@ -83,15 +134,23 @@ public class BloodArsenalRecipes {
|
||||
ItemStack demonicSlate = new ItemStack(WayofTime.alchemicalWizardry.ModItems.demonicSlate);
|
||||
ItemStack etherealSlate = new ItemStack(WayofTime.alchemicalWizardry.ModItems.baseItems, 1, 27);
|
||||
ItemStack weakOrb = new ItemStack(WayofTime.alchemicalWizardry.ModItems.weakBloodOrb, 1, craftingConstant);
|
||||
ItemStack apprenticeOrb =
|
||||
new ItemStack(WayofTime.alchemicalWizardry.ModItems.apprenticeBloodOrb, 1, craftingConstant);
|
||||
ItemStack magicianOrb =
|
||||
new ItemStack(WayofTime.alchemicalWizardry.ModItems.magicianBloodOrb, 1, craftingConstant);
|
||||
ItemStack apprenticeOrb = new ItemStack(
|
||||
WayofTime.alchemicalWizardry.ModItems.apprenticeBloodOrb,
|
||||
1,
|
||||
craftingConstant);
|
||||
ItemStack magicianOrb = new ItemStack(
|
||||
WayofTime.alchemicalWizardry.ModItems.magicianBloodOrb,
|
||||
1,
|
||||
craftingConstant);
|
||||
ItemStack masterOrb = new ItemStack(WayofTime.alchemicalWizardry.ModItems.masterBloodOrb, 1, craftingConstant);
|
||||
ItemStack archmageOrb =
|
||||
new ItemStack(WayofTime.alchemicalWizardry.ModItems.archmageBloodOrb, 1, craftingConstant);
|
||||
ItemStack transcendentOrb =
|
||||
new ItemStack(WayofTime.alchemicalWizardry.ModItems.transcendentBloodOrb, 1, craftingConstant);
|
||||
ItemStack archmageOrb = new ItemStack(
|
||||
WayofTime.alchemicalWizardry.ModItems.archmageBloodOrb,
|
||||
1,
|
||||
craftingConstant);
|
||||
ItemStack transcendentOrb = new ItemStack(
|
||||
WayofTime.alchemicalWizardry.ModItems.transcendentBloodOrb,
|
||||
1,
|
||||
craftingConstant);
|
||||
|
||||
addOreDictBloodOrbRecipe(
|
||||
new ItemStack(ModBlocks.blood_stained_ice, 8),
|
||||
@@ -352,7 +411,14 @@ public class BloodArsenalRecipes {
|
||||
'g',
|
||||
transcendentOrb);
|
||||
addOreDictBloodOrbRecipe(
|
||||
new ItemStack(ModItems.blood_burned_string, 4), "aaa", "aba", "aaa", 'a', Items.string, 'b', weakOrb);
|
||||
new ItemStack(ModItems.blood_burned_string, 4),
|
||||
"aaa",
|
||||
"aba",
|
||||
"aaa",
|
||||
'a',
|
||||
Items.string,
|
||||
'b',
|
||||
weakOrb);
|
||||
addOreDictBloodOrbRecipe(
|
||||
new ItemStack(ModItems.sigil_of_augmented_holding),
|
||||
"aba",
|
||||
@@ -418,7 +484,13 @@ public class BloodArsenalRecipes {
|
||||
'd',
|
||||
magicianOrb);
|
||||
addOreDictBloodOrbRecipe(
|
||||
new ItemStack(ModItems.glass_helmet), "aaa", "aba", 'a', ModItems.glass_shard, 'b', apprenticeOrb);
|
||||
new ItemStack(ModItems.glass_helmet),
|
||||
"aaa",
|
||||
"aba",
|
||||
'a',
|
||||
ModItems.glass_shard,
|
||||
'b',
|
||||
apprenticeOrb);
|
||||
addOreDictBloodOrbRecipe(
|
||||
new ItemStack(ModItems.glass_chestplate),
|
||||
"aba",
|
||||
@@ -438,7 +510,13 @@ public class BloodArsenalRecipes {
|
||||
'b',
|
||||
apprenticeOrb);
|
||||
addOreDictBloodOrbRecipe(
|
||||
new ItemStack(ModItems.glass_boots), "a a", "aba", 'a', ModItems.glass_shard, 'b', apprenticeOrb);
|
||||
new ItemStack(ModItems.glass_boots),
|
||||
"a a",
|
||||
"aba",
|
||||
'a',
|
||||
ModItems.glass_shard,
|
||||
'b',
|
||||
apprenticeOrb);
|
||||
addOreDictBloodOrbRecipe(
|
||||
new ItemStack(ModItems.transparent_orb),
|
||||
"aba",
|
||||
@@ -510,7 +588,11 @@ public class BloodArsenalRecipes {
|
||||
'a',
|
||||
ModItems.blood_infused_iron);
|
||||
addOreDictRecipe(
|
||||
new ItemStack(ModBlocks.blood_stained_ice_packed), "aa", "aa", 'a', ModBlocks.blood_stained_ice);
|
||||
new ItemStack(ModBlocks.blood_stained_ice_packed),
|
||||
"aa",
|
||||
"aa",
|
||||
'a',
|
||||
ModBlocks.blood_stained_ice);
|
||||
addOreDictRecipe(
|
||||
new ItemStack(ModBlocks.blood_infused_glowstone),
|
||||
"aa",
|
||||
@@ -581,15 +663,28 @@ public class BloodArsenalRecipes {
|
||||
'b',
|
||||
ModItems.blood_infused_stick);
|
||||
addOreDictRecipe(
|
||||
new ItemStack(ModItems.blood_money, 1, 1), "aa", "aa", 'a', new ItemStack(ModItems.blood_money));
|
||||
new ItemStack(ModItems.blood_money, 1, 1),
|
||||
"aa",
|
||||
"aa",
|
||||
'a',
|
||||
new ItemStack(ModItems.blood_money));
|
||||
addOreDictRecipe(
|
||||
new ItemStack(ModItems.blood_money, 1, 2), "aa", "aa", 'a', new ItemStack(ModItems.blood_money, 1, 1));
|
||||
new ItemStack(ModItems.blood_money, 1, 2),
|
||||
"aa",
|
||||
"aa",
|
||||
'a',
|
||||
new ItemStack(ModItems.blood_money, 1, 1));
|
||||
addOreDictRecipe(
|
||||
new ItemStack(ModItems.blood_money, 1, 3), "aa", "aa", 'a', new ItemStack(ModItems.blood_money, 1, 2));
|
||||
new ItemStack(ModItems.blood_money, 1, 3),
|
||||
"aa",
|
||||
"aa",
|
||||
'a',
|
||||
new ItemStack(ModItems.blood_money, 1, 2));
|
||||
|
||||
addShapelessOreDictRecipe(new ItemStack(ModBlocks.blood_infused_planks, 4), ModBlocks.blood_infused_wood);
|
||||
addShapelessOreDictRecipe(
|
||||
new ItemStack(WayofTime.alchemicalWizardry.ModItems.blankSlate, 9), ModBlocks.blood_stone);
|
||||
new ItemStack(WayofTime.alchemicalWizardry.ModItems.blankSlate, 9),
|
||||
ModBlocks.blood_stone);
|
||||
addShapelessOreDictRecipe(
|
||||
new ItemStack(WayofTime.alchemicalWizardry.ModItems.reinforcedSlate, 9),
|
||||
new ItemStack(ModBlocks.blood_stone, 1, 1));
|
||||
@@ -623,14 +718,14 @@ public class BloodArsenalRecipes {
|
||||
int craftingConstant = OreDictionary.WILDCARD_VALUE;
|
||||
|
||||
ItemStack weakOrb = new ItemStack(WayofTime.alchemicalWizardry.ModItems.weakBloodOrb, 1, craftingConstant);
|
||||
// ItemStack apprenticeOrb = new ItemStack(WayofTime.alchemicalWizardry.ModItems.apprenticeBloodOrb, 1,
|
||||
// ItemStack apprenticeOrb = new ItemStack(WayofTime.alchemicalWizardry.ModItems.apprenticeBloodOrb, 1,
|
||||
// craftingConstant);
|
||||
// ItemStack magicianOrb = new ItemStack(WayofTime.alchemicalWizardry.ModItems.magicianBloodOrb, 1,
|
||||
// ItemStack magicianOrb = new ItemStack(WayofTime.alchemicalWizardry.ModItems.magicianBloodOrb, 1,
|
||||
// craftingConstant);
|
||||
ItemStack masterOrb = new ItemStack(WayofTime.alchemicalWizardry.ModItems.masterBloodOrb, 1, craftingConstant);
|
||||
// ItemStack archmageOrb = new ItemStack(WayofTime.alchemicalWizardry.ModItems.archmageBloodOrb, 1,
|
||||
// ItemStack archmageOrb = new ItemStack(WayofTime.alchemicalWizardry.ModItems.archmageBloodOrb, 1,
|
||||
// craftingConstant);
|
||||
// ItemStack transcendentOrb = new ItemStack(WayofTime.alchemicalWizardry.ModItems.transcendentBloodOrb,
|
||||
// ItemStack transcendentOrb = new ItemStack(WayofTime.alchemicalWizardry.ModItems.transcendentBloodOrb,
|
||||
// 1, craftingConstant);
|
||||
|
||||
addOreDictBloodOrbRecipe(
|
||||
|
||||
@@ -1,11 +1,13 @@
|
||||
package com.arc.bloodarsenal.common;
|
||||
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import com.arc.bloodarsenal.common.entity.EntityBloodTNT;
|
||||
import com.arc.bloodarsenal.common.tinkers.IClientCode;
|
||||
import cpw.mods.fml.common.registry.EntityRegistry;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
public class CommonProxy {
|
||||
|
||||
public void init() {
|
||||
// registerEntityTrackers();
|
||||
}
|
||||
@@ -23,9 +25,9 @@ public class CommonProxy {
|
||||
public static void registerEntityTrackers() {
|
||||
int entityID = EntityRegistry.findGlobalUniqueEntityId();
|
||||
EntityRegistry.registerGlobalEntityID(EntityBloodTNT.class, "bloodTNT", entityID);
|
||||
EntityRegistry.registerModEntity(
|
||||
EntityBloodTNT.class, "bloodTNT", entityID, BloodArsenal.instance, 64, 100, true);
|
||||
// EntityRegistry.registerModEntity(EntityBloodHound.class, "BloodHound", 3, BloodArsenal.instance, 96,
|
||||
EntityRegistry
|
||||
.registerModEntity(EntityBloodTNT.class, "bloodTNT", entityID, BloodArsenal.instance, 64, 100, true);
|
||||
// EntityRegistry.registerModEntity(EntityBloodHound.class, "BloodHound", 3, BloodArsenal.instance, 96,
|
||||
// 3, true);
|
||||
}
|
||||
|
||||
|
||||
@@ -1,12 +1,7 @@
|
||||
package com.arc.bloodarsenal.common.block;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
|
||||
import com.arc.bloodarsenal.common.BloodArsenalConfig;
|
||||
import cpw.mods.fml.common.Loader;
|
||||
import cpw.mods.fml.common.Optional;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import java.util.Random;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
@@ -16,12 +11,22 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.*;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import squeek.applecore.api.food.FoodValues;
|
||||
import squeek.applecore.api.food.IEdibleBlock;
|
||||
import squeek.applecore.api.food.ItemFoodProxy;
|
||||
import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
|
||||
|
||||
import com.arc.bloodarsenal.common.BloodArsenalConfig;
|
||||
|
||||
import cpw.mods.fml.common.Loader;
|
||||
import cpw.mods.fml.common.Optional;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
@Optional.Interface(iface = "squeek.applecore.api.food.IEdibleBlock", modid = "AppleCore")
|
||||
public class BlockBloodCake extends Block implements IEdibleBlock {
|
||||
|
||||
private boolean isEdibleAtMaxHunger = false;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@@ -105,8 +110,8 @@ public class BlockBloodCake extends Block implements IEdibleBlock {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onBlockActivated(
|
||||
World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) {
|
||||
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX,
|
||||
float hitY, float hitZ) {
|
||||
eatCake(player);
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -5,6 +5,7 @@ import net.minecraft.block.material.Material;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
|
||||
public class BlockBloodInfusedDiamond extends Block {
|
||||
|
||||
public BlockBloodInfusedDiamond() {
|
||||
super(Material.iron);
|
||||
setHardness(10.0F);
|
||||
|
||||
@@ -1,12 +1,15 @@
|
||||
package com.arc.bloodarsenal.common.block;
|
||||
|
||||
import com.arc.bloodarsenal.common.items.ModItems;
|
||||
import java.util.Random;
|
||||
|
||||
import net.minecraft.block.BlockGlowstone;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.item.Item;
|
||||
|
||||
import com.arc.bloodarsenal.common.items.ModItems;
|
||||
|
||||
public class BlockBloodInfusedGlowstone extends BlockGlowstone {
|
||||
|
||||
public BlockBloodInfusedGlowstone() {
|
||||
super(Material.glass);
|
||||
setHardness(0.5F);
|
||||
|
||||
@@ -4,6 +4,7 @@ import net.minecraft.block.Block;
|
||||
import net.minecraft.block.material.Material;
|
||||
|
||||
public class BlockBloodInfusedPlanks extends Block {
|
||||
|
||||
public BlockBloodInfusedPlanks() {
|
||||
super(Material.wood);
|
||||
setHardness(3.0F);
|
||||
|
||||
@@ -1,13 +1,15 @@
|
||||
package com.arc.bloodarsenal.common.block;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.minecraft.block.BlockRotatedPillar;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.util.IIcon;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class BlockBloodInfusedWood extends BlockRotatedPillar {
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
private IIcon top;
|
||||
|
||||
|
||||
@@ -4,6 +4,7 @@ import net.minecraft.block.Block;
|
||||
import net.minecraft.block.material.Material;
|
||||
|
||||
public class BlockBloodLamp extends Block {
|
||||
|
||||
public BlockBloodLamp() {
|
||||
super(Material.iron);
|
||||
setStepSound(soundTypePiston);
|
||||
|
||||
@@ -1,13 +1,16 @@
|
||||
package com.arc.bloodarsenal.common.block;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import java.util.Random;
|
||||
|
||||
import net.minecraft.block.BlockBreakable;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class BlockBloodStainedGlass extends BlockBreakable {
|
||||
|
||||
public BlockBloodStainedGlass() {
|
||||
super("blood_stained_glass", Material.glass, false);
|
||||
setHardness(1.0F);
|
||||
|
||||
@@ -1,9 +1,8 @@
|
||||
package com.arc.bloodarsenal.common.block;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Random;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockBreakable;
|
||||
import net.minecraft.block.material.Material;
|
||||
@@ -18,7 +17,11 @@ import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.event.ForgeEventFactory;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class BlockBloodStainedIce extends BlockBreakable {
|
||||
|
||||
public BlockBloodStainedIce() {
|
||||
super("blood_stained_ice", Material.ice, false);
|
||||
slipperiness = 0.99F;
|
||||
@@ -54,7 +57,17 @@ public class BlockBloodStainedIce extends BlockBreakable {
|
||||
if (itemstack != null) items.add(itemstack);
|
||||
|
||||
ForgeEventFactory.fireBlockHarvesting(
|
||||
items, par1World, this, par3, par4, par5, par6, 0, 1.0f, true, par2EntityPlayer);
|
||||
items,
|
||||
par1World,
|
||||
this,
|
||||
par3,
|
||||
par4,
|
||||
par5,
|
||||
par6,
|
||||
0,
|
||||
1.0f,
|
||||
true,
|
||||
par2EntityPlayer);
|
||||
for (ItemStack is : items) dropBlockAsItem(par1World, par3, par4, par5, is);
|
||||
} else {
|
||||
if (par1World.provider.isHellWorld) {
|
||||
|
||||
@@ -1,10 +1,12 @@
|
||||
package com.arc.bloodarsenal.common.block;
|
||||
|
||||
import java.util.Random;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.material.Material;
|
||||
|
||||
public class BlockBloodStainedPackedIce extends Block {
|
||||
|
||||
public BlockBloodStainedPackedIce() {
|
||||
super(Material.packedIce);
|
||||
slipperiness = 0.99F;
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
package com.arc.bloodarsenal.common.block;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
@@ -11,7 +10,11 @@ import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.IIcon;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class BlockBloodStone extends Block {
|
||||
|
||||
private IIcon blood_stone_1;
|
||||
private IIcon blood_stone_2;
|
||||
private IIcon blood_stone_3;
|
||||
|
||||
@@ -1,10 +1,7 @@
|
||||
package com.arc.bloodarsenal.common.block;
|
||||
|
||||
import com.arc.bloodarsenal.common.entity.EntityBloodTNT;
|
||||
import com.arc.bloodarsenal.common.items.ModItems;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import java.util.Random;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockTNT;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
@@ -17,7 +14,14 @@ import net.minecraft.util.IIcon;
|
||||
import net.minecraft.world.Explosion;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import com.arc.bloodarsenal.common.entity.EntityBloodTNT;
|
||||
import com.arc.bloodarsenal.common.items.ModItems;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class BlockBloodTNT extends BlockTNT {
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
private IIcon top;
|
||||
|
||||
@@ -78,8 +82,8 @@ public class BlockBloodTNT extends BlockTNT {
|
||||
spawnTNT(par1World, par2, par3, par4, par5, null);
|
||||
}
|
||||
|
||||
public void spawnTNT(
|
||||
World par1World, int par2, int par3, int par4, int par5, EntityLivingBase par6EntityLivingBase) {
|
||||
public void spawnTNT(World par1World, int par2, int par3, int par4, int par5,
|
||||
EntityLivingBase par6EntityLivingBase) {
|
||||
if (!par1World.isRemote) {
|
||||
if ((par5 & 1) == 1) {
|
||||
EntityBloodTNT entitytntprimed = new EntityBloodTNT(
|
||||
@@ -95,19 +99,10 @@ public class BlockBloodTNT extends BlockTNT {
|
||||
}
|
||||
|
||||
@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
|
||||
|| par5.getCurrentEquippedItem().getItem() == ModItems.bound_igniter)) {
|
||||
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
|
||||
|| par5.getCurrentEquippedItem().getItem() == ModItems.bound_igniter)) {
|
||||
spawnTNT(par1World, par2, par3, par4, 1, par5);
|
||||
par1World.setBlockToAir(par2, par3, par4);
|
||||
par5.getCurrentEquippedItem().damageItem(1, par5);
|
||||
|
||||
@@ -3,6 +3,7 @@ package com.arc.bloodarsenal.common.block;
|
||||
import net.minecraft.block.BlockTorch;
|
||||
|
||||
public class BlockBloodTorch extends BlockTorch {
|
||||
|
||||
public BlockBloodTorch() {
|
||||
super();
|
||||
setHardness(0.0F);
|
||||
|
||||
@@ -1,11 +1,9 @@
|
||||
package com.arc.bloodarsenal.common.block;
|
||||
|
||||
import com.arc.bloodarsenal.common.items.ModItems;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
import java.util.Random;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.entity.Entity;
|
||||
@@ -18,7 +16,13 @@ import net.minecraft.util.Direction;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import com.arc.bloodarsenal.common.items.ModItems;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class BlockBurnedString extends Block {
|
||||
|
||||
public BlockBurnedString() {
|
||||
super(Material.circuits);
|
||||
setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.15625F, 1.0F);
|
||||
@@ -31,8 +35,8 @@ public class BlockBurnedString extends Block {
|
||||
}
|
||||
|
||||
@Override
|
||||
public AxisAlignedBB getCollisionBoundingBoxFromPool(
|
||||
World p_149668_1_, int p_149668_2_, int p_149668_3_, int p_149668_4_) {
|
||||
public AxisAlignedBB getCollisionBoundingBoxFromPool(World p_149668_1_, int p_149668_2_, int p_149668_3_,
|
||||
int p_149668_4_) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@@ -63,8 +67,8 @@ public class BlockBurnedString extends Block {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setBlockBoundsBasedOnState(
|
||||
IBlockAccess p_149719_1_, int p_149719_2_, int p_149719_3_, int p_149719_4_) {
|
||||
public void setBlockBoundsBasedOnState(IBlockAccess p_149719_1_, int p_149719_2_, int p_149719_3_,
|
||||
int p_149719_4_) {
|
||||
int l = p_149719_1_.getBlockMetadata(p_149719_2_, p_149719_3_, p_149719_4_);
|
||||
boolean flag = (l & 4) == 4;
|
||||
boolean flag1 = (l & 2) == 2;
|
||||
@@ -92,18 +96,13 @@ public class BlockBurnedString extends Block {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void breakBlock(
|
||||
World p_149749_1_, int p_149749_2_, int p_149749_3_, int p_149749_4_, Block p_149749_5_, int p_149749_6_) {
|
||||
public void breakBlock(World p_149749_1_, int p_149749_2_, int p_149749_3_, int p_149749_4_, Block p_149749_5_,
|
||||
int p_149749_6_) {
|
||||
this.func_150138_a(p_149749_1_, p_149749_2_, p_149749_3_, p_149749_4_, p_149749_6_ | 1);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onBlockHarvested(
|
||||
World p_149681_1_,
|
||||
int p_149681_2_,
|
||||
int p_149681_3_,
|
||||
int p_149681_4_,
|
||||
int p_149681_5_,
|
||||
public void onBlockHarvested(World p_149681_1_, int p_149681_2_, int p_149681_3_, int p_149681_4_, int p_149681_5_,
|
||||
EntityPlayer p_149681_6_) {
|
||||
if (!p_149681_1_.isRemote) {
|
||||
if (p_149681_6_.getCurrentEquippedItem() != null
|
||||
@@ -153,8 +152,8 @@ public class BlockBurnedString extends Block {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onEntityCollidedWithBlock(
|
||||
World p_149670_1_, int p_149670_2_, int p_149670_3_, int p_149670_4_, Entity p_149670_5_) {
|
||||
public void onEntityCollidedWithBlock(World p_149670_1_, int p_149670_2_, int p_149670_3_, int p_149670_4_,
|
||||
Entity p_149670_5_) {
|
||||
if (!p_149670_1_.isRemote) {
|
||||
if ((p_149670_1_.getBlockMetadata(p_149670_2_, p_149670_3_, p_149670_4_) & 1) != 1) {
|
||||
this.func_150140_e(p_149670_1_, p_149670_2_, p_149670_3_, p_149670_4_);
|
||||
@@ -218,13 +217,8 @@ public class BlockBurnedString extends Block {
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public static boolean func_150139_a(
|
||||
IBlockAccess p_150139_0_,
|
||||
int p_150139_1_,
|
||||
int p_150139_2_,
|
||||
int p_150139_3_,
|
||||
int p_150139_4_,
|
||||
int p_150139_5_) {
|
||||
public static boolean func_150139_a(IBlockAccess p_150139_0_, int p_150139_1_, int p_150139_2_, int p_150139_3_,
|
||||
int p_150139_4_, int p_150139_5_) {
|
||||
int j1 = p_150139_1_ + Direction.offsetX[p_150139_5_];
|
||||
int k1 = p_150139_3_ + Direction.offsetZ[p_150139_5_];
|
||||
Block block = p_150139_0_.getBlock(j1, p_150139_2_, k1);
|
||||
|
||||
@@ -1,13 +1,8 @@
|
||||
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.common.tileentity.TileCompactedMRS;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
@@ -21,7 +16,17 @@ import net.minecraft.util.MovingObjectPosition;
|
||||
import net.minecraft.world.Explosion;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.rituals.Rituals;
|
||||
import WayofTime.alchemicalWizardry.common.block.BlockMasterStone;
|
||||
import WayofTime.alchemicalWizardry.common.items.ActivationCrystal;
|
||||
|
||||
import com.arc.bloodarsenal.common.tileentity.TileCompactedMRS;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class BlockCompactedMRS extends BlockMasterStone {
|
||||
|
||||
public BlockCompactedMRS() {
|
||||
super();
|
||||
setBlockName("compacted_mrs");
|
||||
@@ -124,8 +129,8 @@ public class BlockCompactedMRS extends BlockMasterStone {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onBlockActivated(
|
||||
World world, int x, int y, int z, EntityPlayer player, int idk, float what, float these, float are) {
|
||||
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int idk, float what,
|
||||
float these, float are) {
|
||||
TileCompactedMRS tileEntity = (TileCompactedMRS) world.getTileEntity(x, y, z);
|
||||
|
||||
if (tileEntity != null) {
|
||||
|
||||
@@ -1,22 +1,7 @@
|
||||
package com.arc.bloodarsenal.common.block;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.items.interfaces.IBloodOrb;
|
||||
import WayofTime.alchemicalWizardry.api.rituals.RitualComponent;
|
||||
import WayofTime.alchemicalWizardry.api.rituals.Rituals;
|
||||
import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
|
||||
import WayofTime.alchemicalWizardry.common.block.BlockAltar;
|
||||
import WayofTime.alchemicalWizardry.common.block.BlockMasterStone;
|
||||
import WayofTime.alchemicalWizardry.common.bloodAltarUpgrade.AltarComponent;
|
||||
import WayofTime.alchemicalWizardry.common.bloodAltarUpgrade.AltarUpgradeComponent;
|
||||
import WayofTime.alchemicalWizardry.common.bloodAltarUpgrade.UpgradedAltars;
|
||||
import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar;
|
||||
import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone;
|
||||
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 java.util.List;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockContainer;
|
||||
import net.minecraft.block.material.Material;
|
||||
@@ -32,7 +17,27 @@ import net.minecraft.util.StatCollector;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.fluids.FluidContainerRegistry;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.items.interfaces.IBloodOrb;
|
||||
import WayofTime.alchemicalWizardry.api.rituals.RitualComponent;
|
||||
import WayofTime.alchemicalWizardry.api.rituals.Rituals;
|
||||
import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
|
||||
import WayofTime.alchemicalWizardry.common.block.BlockAltar;
|
||||
import WayofTime.alchemicalWizardry.common.block.BlockMasterStone;
|
||||
import WayofTime.alchemicalWizardry.common.bloodAltarUpgrade.AltarComponent;
|
||||
import WayofTime.alchemicalWizardry.common.bloodAltarUpgrade.AltarUpgradeComponent;
|
||||
import WayofTime.alchemicalWizardry.common.bloodAltarUpgrade.UpgradedAltars;
|
||||
import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar;
|
||||
import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone;
|
||||
|
||||
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;
|
||||
|
||||
public class BlockCompacter extends BlockContainer {
|
||||
|
||||
private String ritualName;
|
||||
private int direction;
|
||||
|
||||
@@ -72,8 +77,8 @@ public class BlockCompacter extends BlockContainer {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onBlockActivated(
|
||||
World world, int x, int y, int z, EntityPlayer player, int idk, float what, float these, float are) {
|
||||
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int idk, float what,
|
||||
float these, float are) {
|
||||
world.markBlockForUpdate(x, y, z);
|
||||
TileEntity tileEntity = world.getTileEntity(x, y, z);
|
||||
|
||||
@@ -141,16 +146,18 @@ public class BlockCompacter extends BlockContainer {
|
||||
}
|
||||
|
||||
int activationCost = Rituals.getCostForActivation(ritualName);
|
||||
int cost = (activationCost * (int) multiplier)
|
||||
/ 2; // Divided by 2 since this fires twice apparently and also because I'm nice
|
||||
int cost = (activationCost * (int) multiplier) / 2; // Divided by 2 since this fires
|
||||
// twice apparently and also because
|
||||
// I'm nice
|
||||
|
||||
if (cost <= currentEssence) {
|
||||
compactRitual(tile);
|
||||
SoulNetworkHandler.syphonFromNetwork(owner, cost);
|
||||
--player.inventory.getCurrentItem().stackSize;
|
||||
} else {
|
||||
player.addChatComponentMessage(new ChatComponentText(
|
||||
StatCollector.translateToLocal("message.compacter.notEnoughLP")));
|
||||
player.addChatComponentMessage(
|
||||
new ChatComponentText(
|
||||
StatCollector.translateToLocal("message.compacter.notEnoughLP")));
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -165,13 +172,14 @@ public class BlockCompacter extends BlockContainer {
|
||||
if (tier == 0) {
|
||||
return false;
|
||||
} else if (altar.getStackInSlot(0) != null) {
|
||||
player.addChatComponentMessage(new ChatComponentText(
|
||||
StatCollector.translateToLocal("message.compacter.itemInAltar")));
|
||||
player.addChatComponentMessage(
|
||||
new ChatComponentText(
|
||||
StatCollector.translateToLocal("message.compacter.itemInAltar")));
|
||||
} else {
|
||||
float multiplier = 1;
|
||||
|
||||
AltarUpgradeComponent upgradeComponent =
|
||||
UpgradedAltars.getUpgrades(world, x, y + 1, z, tier);
|
||||
AltarUpgradeComponent upgradeComponent = UpgradedAltars
|
||||
.getUpgrades(world, x, y + 1, z, tier);
|
||||
|
||||
int speedUpgrades = upgradeComponent.getSpeedUpgrades();
|
||||
int efficiencyUpgrades = upgradeComponent.getEfficiencyUpgrades();
|
||||
@@ -203,12 +211,15 @@ public class BlockCompacter extends BlockContainer {
|
||||
SoulNetworkHandler.syphonFromNetwork(owner, cost);
|
||||
--player.inventory.getCurrentItem().stackSize;
|
||||
} else {
|
||||
player.addChatComponentMessage(new ChatComponentText(
|
||||
StatCollector.translateToLocal("message.compacter.notEnoughLP")));
|
||||
player.addChatComponentMessage(
|
||||
new ChatComponentText(
|
||||
StatCollector
|
||||
.translateToLocal("message.compacter.notEnoughLP")));
|
||||
}
|
||||
} else {
|
||||
player.addChatComponentMessage(new ChatComponentText(
|
||||
StatCollector.translateToLocal("message.compacter.wrongOrbTier")));
|
||||
player.addChatComponentMessage(
|
||||
new ChatComponentText(
|
||||
StatCollector.translateToLocal("message.compacter.wrongOrbTier")));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -370,7 +381,9 @@ public class BlockCompacter extends BlockContainer {
|
||||
world.setBlockToAir(x + altarComponent.getX(), y + altarComponent.getY(), z + altarComponent.getZ());
|
||||
world.setBlockToAir(x, y, z);
|
||||
world.markBlockForUpdate(
|
||||
x + altarComponent.getX(), y + altarComponent.getY(), z + altarComponent.getZ());
|
||||
x + altarComponent.getX(),
|
||||
y + altarComponent.getY(),
|
||||
z + altarComponent.getZ());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -5,6 +5,7 @@ import net.minecraft.block.material.Material;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
|
||||
public class BlockInfusedIron extends Block {
|
||||
|
||||
public BlockInfusedIron() {
|
||||
super(Material.iron);
|
||||
setHardness(7.5F);
|
||||
|
||||
@@ -1,12 +1,7 @@
|
||||
package com.arc.bloodarsenal.common.block;
|
||||
|
||||
import WayofTime.alchemicalWizardry.ModItems;
|
||||
import WayofTime.alchemicalWizardry.api.items.interfaces.IBloodOrb;
|
||||
import WayofTime.alchemicalWizardry.common.items.sigil.holding.SigilOfHolding;
|
||||
import com.arc.bloodarsenal.common.tileentity.TileLPMaterializer;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import java.util.Random;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockContainer;
|
||||
import net.minecraft.block.material.Material;
|
||||
@@ -23,7 +18,17 @@ import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.fluids.FluidContainerRegistry;
|
||||
|
||||
import WayofTime.alchemicalWizardry.ModItems;
|
||||
import WayofTime.alchemicalWizardry.api.items.interfaces.IBloodOrb;
|
||||
import WayofTime.alchemicalWizardry.common.items.sigil.holding.SigilOfHolding;
|
||||
|
||||
import com.arc.bloodarsenal.common.tileentity.TileLPMaterializer;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class BlockLPMaterializer extends BlockContainer {
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
private IIcon output;
|
||||
|
||||
@@ -68,8 +73,8 @@ public class BlockLPMaterializer extends BlockContainer {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onBlockActivated(
|
||||
World world, int x, int y, int z, EntityPlayer player, int idk, float what, float these, float are) {
|
||||
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int idk, float what,
|
||||
float these, float are) {
|
||||
TileLPMaterializer tileEntity = (TileLPMaterializer) world.getTileEntity(x, y, z);
|
||||
|
||||
if (tileEntity == null) {
|
||||
@@ -157,8 +162,7 @@ public class BlockLPMaterializer extends BlockContainer {
|
||||
new ItemStack(item.getItem(), item.stackSize, item.getItemDamage()));
|
||||
|
||||
if (item.hasTagCompound()) {
|
||||
entityItem.getEntityItem().setTagCompound((NBTTagCompound)
|
||||
item.getTagCompound().copy());
|
||||
entityItem.getEntityItem().setTagCompound((NBTTagCompound) item.getTagCompound().copy());
|
||||
}
|
||||
|
||||
float factor = 0.05F;
|
||||
|
||||
@@ -1,9 +1,7 @@
|
||||
package com.arc.bloodarsenal.common.block;
|
||||
|
||||
import WayofTime.alchemicalWizardry.ModItems;
|
||||
import WayofTime.alchemicalWizardry.common.items.sigil.holding.SigilOfHolding;
|
||||
import com.arc.bloodarsenal.common.tileentity.TileLifeInfuser;
|
||||
import java.util.Random;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockContainer;
|
||||
import net.minecraft.block.material.Material;
|
||||
@@ -17,7 +15,13 @@ import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.fluids.FluidContainerRegistry;
|
||||
|
||||
import WayofTime.alchemicalWizardry.ModItems;
|
||||
import WayofTime.alchemicalWizardry.common.items.sigil.holding.SigilOfHolding;
|
||||
|
||||
import com.arc.bloodarsenal.common.tileentity.TileLifeInfuser;
|
||||
|
||||
public class BlockLifeInfuser extends BlockContainer {
|
||||
|
||||
public BlockLifeInfuser() {
|
||||
super(Material.iron);
|
||||
setHardness(6.0F);
|
||||
@@ -28,8 +32,8 @@ public class BlockLifeInfuser extends BlockContainer {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onBlockActivated(
|
||||
World world, int x, int y, int z, EntityPlayer player, int idk, float what, float these, float are) {
|
||||
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int idk, float what,
|
||||
float these, float are) {
|
||||
TileLifeInfuser tileEntity = (TileLifeInfuser) world.getTileEntity(x, y, z);
|
||||
|
||||
if (tileEntity == null || player.isSneaking()) {
|
||||
@@ -115,8 +119,7 @@ public class BlockLifeInfuser extends BlockContainer {
|
||||
new ItemStack(item.getItem(), item.stackSize, item.getItemDamage()));
|
||||
|
||||
if (item.hasTagCompound()) {
|
||||
entityItem.getEntityItem().setTagCompound((NBTTagCompound)
|
||||
item.getTagCompound().copy());
|
||||
entityItem.getEntityItem().setTagCompound((NBTTagCompound) item.getTagCompound().copy());
|
||||
}
|
||||
|
||||
float factor = 0.05F;
|
||||
|
||||
@@ -1,14 +1,8 @@
|
||||
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.holding.SigilOfHolding;
|
||||
import com.arc.bloodarsenal.common.tileentity.TilePortableAltar;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Random;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockContainer;
|
||||
import net.minecraft.block.material.Material;
|
||||
@@ -25,7 +19,18 @@ import net.minecraft.util.IIcon;
|
||||
import net.minecraft.util.MovingObjectPosition;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import WayofTime.alchemicalWizardry.ModItems;
|
||||
import WayofTime.alchemicalWizardry.api.items.IAltarManipulator;
|
||||
import WayofTime.alchemicalWizardry.common.items.EnergyBattery;
|
||||
import WayofTime.alchemicalWizardry.common.items.sigil.holding.SigilOfHolding;
|
||||
|
||||
import com.arc.bloodarsenal.common.tileentity.TilePortableAltar;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class BlockPortableAltar extends BlockContainer {
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
private IIcon topIcon;
|
||||
|
||||
@@ -93,8 +98,8 @@ public class BlockPortableAltar extends BlockContainer {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onBlockActivated(
|
||||
World world, int x, int y, int z, EntityPlayer player, int idk, float what, float these, float are) {
|
||||
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int idk, float what,
|
||||
float these, float are) {
|
||||
TilePortableAltar tileEntity = (TilePortableAltar) world.getTileEntity(x, y, z);
|
||||
|
||||
if (tileEntity == null || player.isSneaking()) {
|
||||
@@ -191,8 +196,7 @@ public class BlockPortableAltar extends BlockContainer {
|
||||
new ItemStack(item.getItem(), item.stackSize, item.getItemDamage()));
|
||||
|
||||
if (item.hasTagCompound()) {
|
||||
entityItem.getEntityItem().setTagCompound((NBTTagCompound)
|
||||
item.getTagCompound().copy());
|
||||
entityItem.getEntityItem().setTagCompound((NBTTagCompound) item.getTagCompound().copy());
|
||||
}
|
||||
|
||||
float factor = 0.05F;
|
||||
|
||||
@@ -1,5 +1,10 @@
|
||||
package com.arc.bloodarsenal.common.block;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.item.ItemBlock;
|
||||
|
||||
import com.arc.bloodarsenal.common.BloodArsenal;
|
||||
import com.arc.bloodarsenal.common.BloodArsenalConfig;
|
||||
import com.arc.bloodarsenal.common.items.block.BloodStoneBlock;
|
||||
@@ -7,11 +12,9 @@ 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 java.util.ArrayList;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.item.ItemBlock;
|
||||
|
||||
public class ModBlocks {
|
||||
|
||||
public static Block blood_stone;
|
||||
public static Block blood_tnt;
|
||||
public static Block blood_stained_glass;
|
||||
@@ -48,8 +51,10 @@ public class ModBlocks {
|
||||
blood_infused_glowstone = registerBlock(new BlockBloodInfusedGlowstone(), "blood_infused_glowstone");
|
||||
blood_lamp = registerBlock(new BlockBloodLamp(), "blood_lamp");
|
||||
blood_infused_diamond_block = registerBlock(new BlockBloodInfusedDiamond(), "blood_infused_diamond_block");
|
||||
portable_altar = (BlockPortableAltar)
|
||||
registerBlock(new BlockPortableAltar(), PortableAltarBlock.class, "portable_altar");
|
||||
portable_altar = (BlockPortableAltar) registerBlock(
|
||||
new BlockPortableAltar(),
|
||||
PortableAltarBlock.class,
|
||||
"portable_altar");
|
||||
life_infuser = registerBlock(new BlockLifeInfuser(), "life_infuser");
|
||||
compacter = registerBlock(new BlockCompacter(), "compacter");
|
||||
lp_materializer = registerBlock(new BlockLPMaterializer(), "lp_materializer");
|
||||
@@ -106,7 +111,6 @@ public class ModBlocks {
|
||||
try {
|
||||
Class clazz = Class.forName("com.arc.bloodarsenal.common.block.MultipartHandler");
|
||||
clazz.newInstance();
|
||||
} catch (Throwable e) {
|
||||
}
|
||||
} catch (Throwable e) {}
|
||||
}
|
||||
}
|
||||
@@ -1,24 +1,25 @@
|
||||
/**
|
||||
* This class was created by <Vazkii>. It's distributed as
|
||||
* part of the Botania Mod. Get the Source Code in github:
|
||||
* This class was created by <Vazkii>. It's distributed as part of the Botania Mod. Get the Source Code in github:
|
||||
* https://github.com/Vazkii/Botania
|
||||
*
|
||||
* Botania is Open Source and distributed under the
|
||||
* Botania License: http://botaniamod.net/license.php
|
||||
* Botania is Open Source and distributed under the Botania License: http://botaniamod.net/license.php
|
||||
*
|
||||
* File Created @ [Sep 1, 2015, 5:32:15 PM (GMT)]
|
||||
*/
|
||||
package com.arc.bloodarsenal.common.block;
|
||||
|
||||
import codechicken.microblock.BlockMicroMaterial;
|
||||
import codechicken.microblock.MicroMaterialRegistry;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import codechicken.microblock.BlockMicroMaterial;
|
||||
import codechicken.microblock.MicroMaterialRegistry;
|
||||
|
||||
public class MultipartHandler {
|
||||
|
||||
public MultipartHandler() {
|
||||
registerAllMultiparts(ModBlocks.blood_stone);
|
||||
registerAllMultiparts(ModBlocks.blood_stained_glass);
|
||||
@@ -52,6 +53,7 @@ public class MultipartHandler {
|
||||
|
||||
private static void registerMultipart(Block block, int meta) {
|
||||
MicroMaterialRegistry.registerMaterial(
|
||||
new BlockMicroMaterial(block, meta), block.getUnlocalizedName() + (meta == 0 ? "" : "_" + meta));
|
||||
new BlockMicroMaterial(block, meta),
|
||||
block.getUnlocalizedName() + (meta == 0 ? "" : "_" + meta));
|
||||
}
|
||||
}
|
||||
@@ -1,13 +1,15 @@
|
||||
package com.arc.bloodarsenal.common.entity;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class EntityBloodTNT extends Entity {
|
||||
|
||||
public int fuse;
|
||||
private EntityLivingBase tntPlacedBy;
|
||||
|
||||
@@ -18,8 +20,8 @@ public class EntityBloodTNT extends Entity {
|
||||
yOffset = height / 2.0F;
|
||||
}
|
||||
|
||||
public EntityBloodTNT(
|
||||
World par1World, double par2, double par4, double par6, EntityLivingBase par8EntityLivingBase) {
|
||||
public EntityBloodTNT(World par1World, double par2, double par4, double par6,
|
||||
EntityLivingBase par8EntityLivingBase) {
|
||||
this(par1World);
|
||||
setPosition(par2, par4, par6);
|
||||
float f = (float) (Math.random() * Math.PI * 2.0D);
|
||||
|
||||
@@ -1,10 +1,7 @@
|
||||
package com.arc.bloodarsenal.common.entity;
|
||||
|
||||
import com.arc.bloodarsenal.common.BloodArsenal;
|
||||
import com.arc.bloodarsenal.common.items.ModItems;
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import java.util.Random;
|
||||
|
||||
import net.minecraft.entity.monster.EntityZombie;
|
||||
import net.minecraft.entity.passive.EntityVillager;
|
||||
import net.minecraft.entity.passive.EntityWolf;
|
||||
@@ -13,7 +10,14 @@ import net.minecraft.potion.Potion;
|
||||
import net.minecraft.potion.PotionEffect;
|
||||
import net.minecraftforge.event.entity.living.LivingDropsEvent;
|
||||
|
||||
import com.arc.bloodarsenal.common.BloodArsenal;
|
||||
import com.arc.bloodarsenal.common.items.ModItems;
|
||||
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
|
||||
public class ModLivingDropsEvent {
|
||||
|
||||
@SubscribeEvent
|
||||
public void onEntityDrop(LivingDropsEvent event) {
|
||||
Random random = new Random();
|
||||
|
||||
@@ -9,6 +9,7 @@ import net.minecraft.util.MathHelper;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
public class AIAttackOnCollide extends EntityAIBase {
|
||||
|
||||
World worldObj;
|
||||
EntityCreature attacker;
|
||||
int attackTick;
|
||||
@@ -60,10 +61,8 @@ public class AIAttackOnCollide extends EntityAIBase {
|
||||
@Override
|
||||
public boolean continueExecuting() {
|
||||
EntityLivingBase entitylivingbase = this.attacker.getAttackTarget();
|
||||
return entitylivingbase != null
|
||||
&& entitylivingbase.isEntityAlive()
|
||||
&& (!this.longMemory
|
||||
? !this.attacker.getNavigator().noPath()
|
||||
return entitylivingbase != null && entitylivingbase.isEntityAlive()
|
||||
&& (!this.longMemory ? !this.attacker.getNavigator().noPath()
|
||||
: this.attacker.isWithinHomeDistance(
|
||||
MathHelper.floor_double(entitylivingbase.posX),
|
||||
MathHelper.floor_double(entitylivingbase.posY),
|
||||
@@ -85,13 +84,12 @@ public class AIAttackOnCollide extends EntityAIBase {
|
||||
public void updateTask() {
|
||||
EntityLivingBase entitylivingbase = this.attacker.getAttackTarget();
|
||||
this.attacker.getLookHelper().setLookPositionWithEntity(entitylivingbase, 30.0F, 30.0F);
|
||||
double d0 = this.attacker.getDistanceSq(
|
||||
entitylivingbase.posX, entitylivingbase.boundingBox.minY, entitylivingbase.posZ);
|
||||
double d0 = this.attacker
|
||||
.getDistanceSq(entitylivingbase.posX, entitylivingbase.boundingBox.minY, entitylivingbase.posZ);
|
||||
double d1 = (double) (this.attacker.width * 2.0F * this.attacker.width * 2.0F + entitylivingbase.width);
|
||||
--this.field_75445_i;
|
||||
|
||||
if ((this.longMemory || this.attacker.getEntitySenses().canSee(entitylivingbase))
|
||||
&& this.field_75445_i <= 0
|
||||
if ((this.longMemory || this.attacker.getEntitySenses().canSee(entitylivingbase)) && this.field_75445_i <= 0
|
||||
&& (this.field_151497_i == 0.0D && this.field_151495_j == 0.0D && this.field_151496_k == 0.0D
|
||||
|| entitylivingbase.getDistanceSq(this.field_151497_i, this.field_151495_j, this.field_151496_k)
|
||||
>= 1.0D
|
||||
@@ -99,16 +97,12 @@ public class AIAttackOnCollide extends EntityAIBase {
|
||||
this.field_151497_i = entitylivingbase.posX;
|
||||
this.field_151495_j = entitylivingbase.boundingBox.minY;
|
||||
this.field_151496_k = entitylivingbase.posZ;
|
||||
this.field_75445_i =
|
||||
failedPathFindingPenalty + 4 + this.attacker.getRNG().nextInt(7);
|
||||
this.field_75445_i = failedPathFindingPenalty + 4 + this.attacker.getRNG().nextInt(7);
|
||||
|
||||
if (this.attacker.getNavigator().getPath() != null) {
|
||||
PathPoint finalPathPoint =
|
||||
this.attacker.getNavigator().getPath().getFinalPathPoint();
|
||||
if (finalPathPoint != null
|
||||
&& entitylivingbase.getDistanceSq(
|
||||
finalPathPoint.xCoord, finalPathPoint.yCoord, finalPathPoint.zCoord)
|
||||
< 1) {
|
||||
PathPoint finalPathPoint = this.attacker.getNavigator().getPath().getFinalPathPoint();
|
||||
if (finalPathPoint != null && entitylivingbase
|
||||
.getDistanceSq(finalPathPoint.xCoord, finalPathPoint.yCoord, finalPathPoint.zCoord) < 1) {
|
||||
failedPathFindingPenalty = 0;
|
||||
} else {
|
||||
failedPathFindingPenalty += 10;
|
||||
|
||||
@@ -8,6 +8,7 @@ import net.minecraft.util.MathHelper;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
public class AIFollowOwner extends EntityAIBase {
|
||||
|
||||
private EntityTameable thePet;
|
||||
private EntityLivingBase theOwner;
|
||||
World theWorld;
|
||||
@@ -77,8 +78,8 @@ public class AIFollowOwner extends EntityAIBase {
|
||||
* Updates the task
|
||||
*/
|
||||
public void updateTask() {
|
||||
this.thePet.getLookHelper().setLookPositionWithEntity(this.theOwner, 10.0F, (float)
|
||||
this.thePet.getVerticalFaceSpeed());
|
||||
this.thePet.getLookHelper()
|
||||
.setLookPositionWithEntity(this.theOwner, 10.0F, (float) this.thePet.getVerticalFaceSpeed());
|
||||
|
||||
if (!this.thePet.isSitting()) {
|
||||
if (--this.field_75343_h <= 0) {
|
||||
@@ -95,12 +96,8 @@ public class AIFollowOwner extends EntityAIBase {
|
||||
for (int i1 = 0; i1 <= 4; ++i1) {
|
||||
if ((l < 1 || i1 < 1 || l > 3 || i1 > 3)
|
||||
&& World.doesBlockHaveSolidTopSurface(this.theWorld, i + l, k - 1, j + i1)
|
||||
&& !this.theWorld
|
||||
.getBlock(i + l, k, j + i1)
|
||||
.isNormalCube()
|
||||
&& !this.theWorld
|
||||
.getBlock(i + l, k + 1, j + i1)
|
||||
.isNormalCube()) {
|
||||
&& !this.theWorld.getBlock(i + l, k, j + i1).isNormalCube()
|
||||
&& !this.theWorld.getBlock(i + l, k + 1, j + i1).isNormalCube()) {
|
||||
this.thePet.setLocationAndAngles(
|
||||
(double) ((float) (i + l) + 0.5F),
|
||||
(double) k,
|
||||
|
||||
@@ -2,11 +2,13 @@ package com.arc.bloodarsenal.common.entity.ai;
|
||||
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.entity.EntityCreature;
|
||||
import net.minecraft.entity.ai.EntityAITarget;
|
||||
import net.minecraft.util.AxisAlignedBB;
|
||||
|
||||
public class AIHurtByTarget extends EntityAITarget {
|
||||
|
||||
boolean entityCallsForHelp;
|
||||
private int field_142052_b;
|
||||
|
||||
@@ -36,20 +38,18 @@ public class AIHurtByTarget extends EntityAITarget {
|
||||
List list = this.taskOwner.worldObj.getEntitiesWithinAABB(
|
||||
this.taskOwner.getClass(),
|
||||
AxisAlignedBB.getBoundingBox(
|
||||
this.taskOwner.posX,
|
||||
this.taskOwner.posY,
|
||||
this.taskOwner.posZ,
|
||||
this.taskOwner.posX + 1.0D,
|
||||
this.taskOwner.posY + 1.0D,
|
||||
this.taskOwner.posZ + 1.0D)
|
||||
.expand(d0, 10.0D, d0));
|
||||
this.taskOwner.posX,
|
||||
this.taskOwner.posY,
|
||||
this.taskOwner.posZ,
|
||||
this.taskOwner.posX + 1.0D,
|
||||
this.taskOwner.posY + 1.0D,
|
||||
this.taskOwner.posZ + 1.0D).expand(d0, 10.0D, d0));
|
||||
Iterator iterator = list.iterator();
|
||||
|
||||
while (iterator.hasNext()) {
|
||||
EntityCreature entitycreature = (EntityCreature) iterator.next();
|
||||
|
||||
if (this.taskOwner != entitycreature
|
||||
&& entitycreature.getAttackTarget() == null
|
||||
if (this.taskOwner != entitycreature && entitycreature.getAttackTarget() == null
|
||||
&& !entitycreature.isOnSameTeam(this.taskOwner.getAITarget())) {
|
||||
entitycreature.setAttackTarget(this.taskOwner.getAITarget());
|
||||
}
|
||||
|
||||
@@ -6,6 +6,7 @@ import net.minecraft.entity.ai.EntityAIBase;
|
||||
import net.minecraft.util.MathHelper;
|
||||
|
||||
public class AILeapAtTarget extends EntityAIBase {
|
||||
|
||||
EntityLiving leaper;
|
||||
EntityLivingBase leapTarget;
|
||||
float leapMotionY;
|
||||
@@ -24,10 +25,7 @@ public class AILeapAtTarget extends EntityAIBase {
|
||||
return false;
|
||||
} else {
|
||||
double d0 = this.leaper.getDistanceSqToEntity(this.leapTarget);
|
||||
return d0 >= 4.0D
|
||||
&& d0 <= 16.0D
|
||||
&& this.leaper.onGround
|
||||
&& this.leaper.getRNG().nextInt(5) == 0;
|
||||
return d0 >= 4.0D && d0 <= 16.0D && this.leaper.onGround && this.leaper.getRNG().nextInt(5) == 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -5,6 +5,7 @@ import net.minecraft.entity.ai.EntityAITarget;
|
||||
import net.minecraft.entity.passive.EntityTameable;
|
||||
|
||||
public class AIOwnerHurtByTarget extends EntityAITarget {
|
||||
|
||||
EntityTameable theDefendingTameable;
|
||||
EntityLivingBase theOwnerAttacker;
|
||||
private int field_142051_e;
|
||||
@@ -29,8 +30,7 @@ public class AIOwnerHurtByTarget extends EntityAITarget {
|
||||
} else {
|
||||
this.theOwnerAttacker = entitylivingbase.getAITarget();
|
||||
int i = entitylivingbase.func_142015_aE();
|
||||
return i != this.field_142051_e
|
||||
&& this.isSuitableTarget(this.theOwnerAttacker, false)
|
||||
return i != this.field_142051_e && this.isSuitableTarget(this.theOwnerAttacker, false)
|
||||
&& this.theDefendingTameable.func_142018_a(this.theOwnerAttacker, entitylivingbase);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,6 +5,7 @@ import net.minecraft.entity.ai.EntityAITarget;
|
||||
import net.minecraft.entity.passive.EntityTameable;
|
||||
|
||||
public class AIOwnerHurtTarget extends EntityAITarget {
|
||||
|
||||
EntityTameable theEntityTameable;
|
||||
EntityLivingBase theTarget;
|
||||
private int field_142050_e;
|
||||
@@ -29,8 +30,7 @@ public class AIOwnerHurtTarget extends EntityAITarget {
|
||||
} else {
|
||||
this.theTarget = entitylivingbase.getLastAttacker();
|
||||
int i = entitylivingbase.getLastAttackerTime();
|
||||
return i != this.field_142050_e
|
||||
&& this.isSuitableTarget(this.theTarget, false)
|
||||
return i != this.field_142050_e && this.isSuitableTarget(this.theTarget, false)
|
||||
&& this.theEntityTameable.func_142018_a(this.theTarget, entitylivingbase);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
package com.arc.bloodarsenal.common.entity.mob;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockColored;
|
||||
import net.minecraft.entity.Entity;
|
||||
@@ -25,7 +23,11 @@ import net.minecraft.util.DamageSource;
|
||||
import net.minecraft.util.MathHelper;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class EntityBloodHound extends EntityTameable {
|
||||
|
||||
private float field_70926_e;
|
||||
private float field_70924_f;
|
||||
/** true is the wolf is wet else false */
|
||||
@@ -121,11 +123,9 @@ public class EntityBloodHound extends EntityTameable {
|
||||
* Returns the sound this mob makes while it's alive.
|
||||
*/
|
||||
protected String getLivingSound() {
|
||||
return this.isAngry()
|
||||
? "mob.wolf.growl"
|
||||
return this.isAngry() ? "mob.wolf.growl"
|
||||
: (this.rand.nextInt(3) == 0
|
||||
? (this.isTamed() && this.dataWatcher.getWatchableObjectFloat(18) < 10.0F
|
||||
? "mob.wolf.whine"
|
||||
? (this.isTamed() && this.dataWatcher.getWatchableObjectFloat(18) < 10.0F ? "mob.wolf.whine"
|
||||
: "mob.wolf.panting")
|
||||
: "mob.wolf.bark");
|
||||
}
|
||||
@@ -240,18 +240,15 @@ public class EntityBloodHound extends EntityTameable {
|
||||
*/
|
||||
@SideOnly(Side.CLIENT)
|
||||
public float getShadingWhileShaking(float p_70915_1_) {
|
||||
return 0.75F
|
||||
+ (this.prevTimeWolfIsShaking + (this.timeWolfIsShaking - this.prevTimeWolfIsShaking) * p_70915_1_)
|
||||
/ 2.0F
|
||||
* 0.25F;
|
||||
return 0.75F + (this.prevTimeWolfIsShaking + (this.timeWolfIsShaking - this.prevTimeWolfIsShaking) * p_70915_1_)
|
||||
/ 2.0F
|
||||
* 0.25F;
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public float getShakeAngle(float p_70923_1_, float p_70923_2_) {
|
||||
float f2 = (this.prevTimeWolfIsShaking
|
||||
+ (this.timeWolfIsShaking - this.prevTimeWolfIsShaking) * p_70923_1_
|
||||
+ p_70923_2_)
|
||||
/ 1.8F;
|
||||
float f2 = (this.prevTimeWolfIsShaking + (this.timeWolfIsShaking - this.prevTimeWolfIsShaking) * p_70923_1_
|
||||
+ p_70923_2_) / 1.8F;
|
||||
|
||||
if (f2 < 0.0F) {
|
||||
f2 = 0.0F;
|
||||
@@ -259,8 +256,7 @@ public class EntityBloodHound extends EntityTameable {
|
||||
f2 = 1.0F;
|
||||
}
|
||||
|
||||
return MathHelper.sin(f2 * (float) Math.PI)
|
||||
* MathHelper.sin(f2 * (float) Math.PI * 11.0F)
|
||||
return MathHelper.sin(f2 * (float) Math.PI) * MathHelper.sin(f2 * (float) Math.PI * 11.0F)
|
||||
* 0.15F
|
||||
* (float) Math.PI;
|
||||
}
|
||||
@@ -383,8 +379,7 @@ public class EntityBloodHound extends EntityTameable {
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public float getTailRotation() {
|
||||
return this.isAngry()
|
||||
? 1.5393804F
|
||||
return this.isAngry() ? 1.5393804F
|
||||
: (this.isTamed()
|
||||
? (0.55F - (20.0F - this.dataWatcher.getWatchableObjectFloat(18)) * 0.02F) * (float) Math.PI
|
||||
: ((float) Math.PI / 5F));
|
||||
@@ -438,11 +433,9 @@ public class EntityBloodHound extends EntityTameable {
|
||||
}
|
||||
}
|
||||
|
||||
return p_142018_1_ instanceof EntityPlayer
|
||||
&& p_142018_2_ instanceof EntityPlayer
|
||||
&& !((EntityPlayer) p_142018_2_).canAttackPlayer((EntityPlayer) p_142018_1_)
|
||||
? false
|
||||
: !(p_142018_1_ instanceof EntityHorse) || !((EntityHorse) p_142018_1_).isTame();
|
||||
return p_142018_1_ instanceof EntityPlayer && p_142018_2_ instanceof EntityPlayer
|
||||
&& !((EntityPlayer) p_142018_2_).canAttackPlayer((EntityPlayer) p_142018_1_) ? false
|
||||
: !(p_142018_1_ instanceof EntityHorse) || !((EntityHorse) p_142018_1_).isTame();
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -2,15 +2,18 @@ package com.arc.bloodarsenal.common.gui;
|
||||
|
||||
import static com.arc.bloodarsenal.common.BloodArsenalConfig.*;
|
||||
|
||||
import com.arc.bloodarsenal.common.BloodArsenal;
|
||||
import cpw.mods.fml.client.config.*;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.client.gui.GuiScreen;
|
||||
import net.minecraftforge.common.config.ConfigCategory;
|
||||
import net.minecraftforge.common.config.ConfigElement;
|
||||
|
||||
import com.arc.bloodarsenal.common.BloodArsenal;
|
||||
import cpw.mods.fml.client.config.*;
|
||||
|
||||
public class ConfigGui extends GuiConfig {
|
||||
|
||||
public ConfigGui(GuiScreen parentScreen) {
|
||||
super(
|
||||
parentScreen,
|
||||
|
||||
@@ -1,11 +1,14 @@
|
||||
package com.arc.bloodarsenal.common.gui;
|
||||
|
||||
import cpw.mods.fml.client.IModGuiFactory;
|
||||
import java.util.Set;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.GuiScreen;
|
||||
|
||||
import cpw.mods.fml.client.IModGuiFactory;
|
||||
|
||||
public class ConfigGuiFactory implements IModGuiFactory {
|
||||
|
||||
@Override
|
||||
public void initialize(Minecraft minecraftInstance) {}
|
||||
|
||||
|
||||
@@ -1,13 +1,15 @@
|
||||
package com.arc.bloodarsenal.common.gui;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
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;
|
||||
|
||||
public class GuiHandler implements IGuiHandler {
|
||||
|
||||
@Override
|
||||
public Object getServerGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) {
|
||||
switch (id) {
|
||||
|
||||
@@ -1,81 +1,56 @@
|
||||
package com.arc.bloodarsenal.common.items;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.util.StatCollector;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class ItemBloodArsenal extends Item {
|
||||
private static final String[] ITEM_NAMES = new String[] {
|
||||
"amorphic_catalyst",
|
||||
"blood_infused_stick",
|
||||
"blood_infused_iron",
|
||||
"soul_fragment",
|
||||
"orange_juice",
|
||||
"blood_infused_glowstone_dust",
|
||||
"wolf_hide"
|
||||
};
|
||||
|
||||
private static final String[] ITEM_NAMES = new String[] { "amorphic_catalyst", "blood_infused_stick",
|
||||
"blood_infused_iron", "soul_fragment", "orange_juice", "blood_infused_glowstone_dust", "wolf_hide" };
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
private IIcon[] icons;
|
||||
|
||||
public ItemBloodArsenal() {
|
||||
super();
|
||||
// setCreativeTab(BloodArsenal.BA_TAB);
|
||||
// setCreativeTab(BloodArsenal.BA_TAB);
|
||||
}
|
||||
|
||||
/* @Override
|
||||
public void registerIcons(IIconRegister iconRegister)
|
||||
{
|
||||
icons = new IIcon[ITEM_NAMES.length];
|
||||
/*
|
||||
* @Override public void registerIcons(IIconRegister iconRegister) { icons = new IIcon[ITEM_NAMES.length]; for (int
|
||||
* i = 0; i < ITEM_NAMES.length; ++i) { icons[i] = iconRegister.registerIcon("BloodArsenal:" + ITEM_NAMES[i]); } if
|
||||
* (AlchemicalWizardry.wimpySettings) { ModItems.heart.setTextureName("BloodArsenal:heart2"); } else {
|
||||
* ModItems.heart.setTextureName("BloodArsenal:heart"); }
|
||||
*/
|
||||
|
||||
for (int i = 0; i < ITEM_NAMES.length; ++i)
|
||||
{
|
||||
icons[i] = iconRegister.registerIcon("BloodArsenal:" + ITEM_NAMES[i]);
|
||||
}
|
||||
// String unlocalizedName = this.getUnlocalizedName().replaceAll("item.", "");
|
||||
// itemIcon = iconRegister.registerIcon(BloodArsenal.MODID + ":" + unlocalizedName);
|
||||
|
||||
if (AlchemicalWizardry.wimpySettings)
|
||||
{
|
||||
ModItems.heart.setTextureName("BloodArsenal:heart2");
|
||||
}
|
||||
else
|
||||
{
|
||||
ModItems.heart.setTextureName("BloodArsenal:heart");
|
||||
}
|
||||
*/
|
||||
|
||||
// String unlocalizedName = this.getUnlocalizedName().replaceAll("item.", "");
|
||||
// itemIcon = iconRegister.registerIcon(BloodArsenal.MODID + ":" + unlocalizedName);
|
||||
|
||||
/* if (this.equals(ModItems.amorphic_catalyst))
|
||||
itemIcon = iconRegister.registerIcon("BloodArsenal:amorphic_catalyst");
|
||||
else if (this.equals(ModItems.blood_infused_iron))
|
||||
itemIcon = iconRegister.registerIcon("BloodArsenal:blood_infused_iron");
|
||||
else if (this.equals(ModItems.soul_fragment))
|
||||
itemIcon = iconRegister.registerIcon("BloodArsenal:soul_fragment");
|
||||
else if (this.equals(ModItems.heart))
|
||||
itemIcon = iconRegister.registerIcon("BloodArsenal:heart");
|
||||
else if (this.equals(ModItems.blood_infused_stick))
|
||||
itemIcon = iconRegister.registerIcon("BloodArsenal:blood_infused_stick");
|
||||
else if (this.equals(ModItems.blood_cookie))
|
||||
itemIcon = iconRegister.registerIcon("BloodArsenal:blood_cookie");
|
||||
else if (this.equals(ModItems.orange_juice))
|
||||
itemIcon = iconRegister.registerIcon("BloodArsenal:orange_juice");
|
||||
else if (this.equals(ModItems.blood_infused_glowstone_dust))
|
||||
itemIcon = iconRegister.registerIcon("BloodArsenal:blood_infused_glowstone_dust");
|
||||
else if (this.equals(ModItems.wolf_hide))
|
||||
itemIcon = iconRegister.registerIcon("BloodArsenal:wolf_hide");
|
||||
else if (this.equals(ModItems.blood_burned_string))
|
||||
itemIcon = iconRegister.registerIcon("BloodArsenal:blood_burned_string");
|
||||
else if (this.equals(ModItems.glass_shard))
|
||||
itemIcon = iconRegister.registerIcon("BloodArsenal:glass_shard");
|
||||
|
||||
}
|
||||
*/
|
||||
/*
|
||||
* if (this.equals(ModItems.amorphic_catalyst)) itemIcon =
|
||||
* iconRegister.registerIcon("BloodArsenal:amorphic_catalyst"); else if (this.equals(ModItems.blood_infused_iron))
|
||||
* itemIcon = iconRegister.registerIcon("BloodArsenal:blood_infused_iron"); else if
|
||||
* (this.equals(ModItems.soul_fragment)) itemIcon = iconRegister.registerIcon("BloodArsenal:soul_fragment"); else if
|
||||
* (this.equals(ModItems.heart)) itemIcon = iconRegister.registerIcon("BloodArsenal:heart"); else if
|
||||
* (this.equals(ModItems.blood_infused_stick)) itemIcon =
|
||||
* iconRegister.registerIcon("BloodArsenal:blood_infused_stick"); else if (this.equals(ModItems.blood_cookie))
|
||||
* itemIcon = iconRegister.registerIcon("BloodArsenal:blood_cookie"); else if (this.equals(ModItems.orange_juice))
|
||||
* itemIcon = iconRegister.registerIcon("BloodArsenal:orange_juice"); else if
|
||||
* (this.equals(ModItems.blood_infused_glowstone_dust)) itemIcon =
|
||||
* iconRegister.registerIcon("BloodArsenal:blood_infused_glowstone_dust"); else if (this.equals(ModItems.wolf_hide))
|
||||
* itemIcon = iconRegister.registerIcon("BloodArsenal:wolf_hide"); else if
|
||||
* (this.equals(ModItems.blood_burned_string)) itemIcon =
|
||||
* iconRegister.registerIcon("BloodArsenal:blood_burned_string"); else if (this.equals(ModItems.glass_shard))
|
||||
* itemIcon = iconRegister.registerIcon("BloodArsenal:glass_shard"); }
|
||||
*/
|
||||
@Override
|
||||
public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) {
|
||||
if (this.equals(ModItems.amorphic_catalyst)) {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.arc.bloodarsenal.common.items;
|
||||
|
||||
import com.arc.bloodarsenal.common.BloodArsenal;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemFood;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -10,7 +10,10 @@ import net.minecraft.potion.PotionEffect;
|
||||
import net.minecraft.util.StatCollector;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import com.arc.bloodarsenal.common.BloodArsenal;
|
||||
|
||||
public class ItemBloodCookie extends ItemFood {
|
||||
|
||||
public ItemBloodCookie() {
|
||||
super(2, 0.3F, false);
|
||||
setUnlocalizedName("blood_cookie");
|
||||
|
||||
@@ -1,12 +1,7 @@
|
||||
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.common.BloodArsenal;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
@@ -18,8 +13,18 @@ import net.minecraft.util.MathHelper;
|
||||
import net.minecraft.util.StatCollector;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.soulNetwork.LifeEssenceNetwork;
|
||||
import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
|
||||
import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
|
||||
|
||||
import com.arc.bloodarsenal.common.BloodArsenal;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class ItemBloodMoney extends Item {
|
||||
private final int[] MONEY_MULTIPLIER = new int[] {1, 4, 16, 64};
|
||||
|
||||
private final int[] MONEY_MULTIPLIER = new int[] { 1, 4, 16, 64 };
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
private IIcon[] icons;
|
||||
|
||||
@@ -1,13 +1,16 @@
|
||||
package com.arc.bloodarsenal.common.items;
|
||||
|
||||
import com.arc.bloodarsenal.common.BloodArsenal;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemFood;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.StatCollector;
|
||||
|
||||
import com.arc.bloodarsenal.common.BloodArsenal;
|
||||
|
||||
public class ItemBloodOrange extends ItemFood {
|
||||
|
||||
public ItemBloodOrange() {
|
||||
super(2, 0.2F, false);
|
||||
setUnlocalizedName("blood_orange");
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
package com.arc.bloodarsenal.common.items;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
@@ -12,8 +11,12 @@ import net.minecraft.util.IIcon;
|
||||
import net.minecraft.util.MathHelper;
|
||||
import net.minecraft.util.StatCollector;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class ItemBoundDiamondShards extends Item {
|
||||
private final String[] shardTypes = new String[] {"", "air", "earth", "fire", "water", "dusk", "dawn"};
|
||||
|
||||
private final String[] shardTypes = new String[] { "", "air", "earth", "fire", "water", "dusk", "dawn" };
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
private IIcon[] icons;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.arc.bloodarsenal.common.items;
|
||||
|
||||
import com.arc.bloodarsenal.common.BloodArsenal;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemFood;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -9,7 +9,10 @@ import net.minecraft.potion.Potion;
|
||||
import net.minecraft.potion.PotionEffect;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import com.arc.bloodarsenal.common.BloodArsenal;
|
||||
|
||||
public class ItemJuiceAndCookies extends ItemFood {
|
||||
|
||||
public ItemJuiceAndCookies() {
|
||||
super(6, 0.6F, false);
|
||||
setMaxStackSize(1);
|
||||
|
||||
@@ -1,9 +1,7 @@
|
||||
package com.arc.bloodarsenal.common.items;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
|
||||
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
|
||||
import com.arc.bloodarsenal.common.BloodArsenal;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
@@ -14,7 +12,13 @@ import net.minecraft.potion.PotionEffect;
|
||||
import net.minecraft.util.StatCollector;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
|
||||
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
|
||||
|
||||
import com.arc.bloodarsenal.common.BloodArsenal;
|
||||
|
||||
public class ItemSoulBooster extends Item implements IBindable {
|
||||
|
||||
public ItemSoulBooster() {
|
||||
super();
|
||||
setMaxStackSize(1);
|
||||
|
||||
@@ -1,11 +1,8 @@
|
||||
package com.arc.bloodarsenal.common.items;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
|
||||
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
|
||||
import com.arc.bloodarsenal.common.BloodArsenal;
|
||||
import cpw.mods.fml.relauncher.ReflectionHelper;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
@@ -16,7 +13,14 @@ import net.minecraft.potion.PotionEffect;
|
||||
import net.minecraft.util.StatCollector;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
|
||||
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
|
||||
|
||||
import com.arc.bloodarsenal.common.BloodArsenal;
|
||||
import cpw.mods.fml.relauncher.ReflectionHelper;
|
||||
|
||||
public class ItemSoulNullifier extends Item implements IBindable {
|
||||
|
||||
public ItemSoulNullifier() {
|
||||
super();
|
||||
setMaxStackSize(1);
|
||||
@@ -70,20 +74,21 @@ public class ItemSoulNullifier extends Item implements IBindable {
|
||||
if (par3EntityPlayer.isBurning()) {
|
||||
par3EntityPlayer.extinguish();
|
||||
removed = true;
|
||||
} else
|
||||
for (PotionEffect potion : potions) {
|
||||
int id = potion.getPotionID();
|
||||
boolean badEffect;
|
||||
} else for (PotionEffect potion : potions) {
|
||||
int id = potion.getPotionID();
|
||||
boolean badEffect;
|
||||
|
||||
badEffect = ReflectionHelper.getPrivateValue(
|
||||
Potion.class, Potion.potionTypes[id], new String[] {"isBadEffect", "field_76418_K"});
|
||||
badEffect = ReflectionHelper.getPrivateValue(
|
||||
Potion.class,
|
||||
Potion.potionTypes[id],
|
||||
new String[] { "isBadEffect", "field_76418_K" });
|
||||
|
||||
if (badEffect) {
|
||||
par3EntityPlayer.removePotionEffect(id);
|
||||
removed = true;
|
||||
break;
|
||||
}
|
||||
if (badEffect) {
|
||||
par3EntityPlayer.removePotionEffect(id);
|
||||
removed = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (removed) {
|
||||
EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, 500);
|
||||
|
||||
@@ -1,6 +1,19 @@
|
||||
package com.arc.bloodarsenal.common.items;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemReed;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.api.wands.StaffRod;
|
||||
import thaumcraft.api.wands.WandCap;
|
||||
import thaumcraft.api.wands.WandRod;
|
||||
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
|
||||
|
||||
import com.arc.bloodarsenal.common.BloodArsenal;
|
||||
import com.arc.bloodarsenal.common.BloodArsenalConfig;
|
||||
import com.arc.bloodarsenal.common.block.ModBlocks;
|
||||
@@ -13,20 +26,12 @@ import com.arc.bloodarsenal.common.items.sigil.*;
|
||||
import com.arc.bloodarsenal.common.items.sigil.holding.SigilAugmentedHolding;
|
||||
import com.arc.bloodarsenal.common.items.tool.*;
|
||||
import com.arc.bloodarsenal.common.thaumcraft.*;
|
||||
|
||||
import cpw.mods.fml.common.Optional;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemReed;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.api.wands.StaffRod;
|
||||
import thaumcraft.api.wands.WandCap;
|
||||
import thaumcraft.api.wands.WandRod;
|
||||
|
||||
public class ModItems {
|
||||
|
||||
public static Item bound_bow;
|
||||
public static Item blood_orange;
|
||||
public static Item blood_infused_pickaxe_wood;
|
||||
@@ -167,8 +172,9 @@ public class ModItems {
|
||||
self_sacrifice_amulet = registerItem(new SelfSacrificeAmulet(), "self_sacrifice_amulet");
|
||||
sacrifice_amulet = registerItem(new SacrificeAmulet(), "sacrifice_amulet");
|
||||
empowered_sacrifice_amulet = registerItem(new EmpoweredSacrificeAmulet(), "empowered_sacrifice_amulet");
|
||||
empowered_self_sacrifice_amulet =
|
||||
registerItem(new EmpoweredSelfSacrificeAmulet(), "empowered_self_sacrifice_amulet");
|
||||
empowered_self_sacrifice_amulet = registerItem(
|
||||
new EmpoweredSelfSacrificeAmulet(),
|
||||
"empowered_self_sacrifice_amulet");
|
||||
}
|
||||
|
||||
@Optional.Method(modid = "Thaumcraft")
|
||||
@@ -194,7 +200,7 @@ public class ModItems {
|
||||
WAND_CAP_BLOOD_INFUSED_IRON = new BloodyWandCap(
|
||||
"blood_iron",
|
||||
0.85F,
|
||||
Arrays.asList(new Aspect[] {Aspect.WATER}),
|
||||
Arrays.asList(new Aspect[] { Aspect.WATER }),
|
||||
0.80F,
|
||||
new ItemStack(wandCap, 1, 0),
|
||||
5,
|
||||
|
||||
+23
-14
@@ -1,11 +1,8 @@
|
||||
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 java.util.List;
|
||||
import java.util.Random;
|
||||
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.enchantment.Enchantment;
|
||||
import net.minecraft.enchantment.EnchantmentHelper;
|
||||
@@ -24,7 +21,14 @@ import net.minecraft.util.StatCollector;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.ISpecialArmor;
|
||||
|
||||
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;
|
||||
|
||||
public class ElementalLifeImbuedArmor extends ItemArmor implements ISpecialArmor, IFillable {
|
||||
|
||||
private final int maxLP = 100000;
|
||||
private String LP_STORED = "LPStored";
|
||||
|
||||
@@ -55,8 +59,10 @@ public class ElementalLifeImbuedArmor extends ItemArmor implements ISpecialArmor
|
||||
@Override
|
||||
public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) {
|
||||
par3List.add(StatCollector.translateToLocal("tooltip.armor.elementalLifeImbuedArmor"));
|
||||
par3List.add(StatCollector.translateToLocal("tooltip.fillable.currentAmount") + " " + EnumChatFormatting.RED
|
||||
+ par1ItemStack.getTagCompound().getInteger(LP_STORED));
|
||||
par3List.add(
|
||||
StatCollector.translateToLocal("tooltip.fillable.currentAmount") + " "
|
||||
+ EnumChatFormatting.RED
|
||||
+ par1ItemStack.getTagCompound().getInteger(LP_STORED));
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -155,19 +161,23 @@ public class ElementalLifeImbuedArmor extends ItemArmor implements ISpecialArmor
|
||||
}
|
||||
|
||||
@Override
|
||||
public ArmorProperties getProperties(
|
||||
EntityLivingBase player, ItemStack armor, DamageSource source, double damage, int slot) {
|
||||
public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage,
|
||||
int slot) {
|
||||
final double absorbRatio = 0.5;
|
||||
|
||||
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);
|
||||
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);
|
||||
0,
|
||||
absorbRatio * getArmorMaterial().getDamageReductionAmount(armorType) * 0.05,
|
||||
absorbMax);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -176,8 +186,8 @@ public class ElementalLifeImbuedArmor extends ItemArmor implements ISpecialArmor
|
||||
}
|
||||
|
||||
protected int getLPPerDamage(ItemStack stack) {
|
||||
int unbreakingLevel = MathHelper.clamp_int(
|
||||
EnchantmentHelper.getEnchantmentLevel(Enchantment.unbreaking.effectId, stack), 0, 4);
|
||||
int unbreakingLevel = MathHelper
|
||||
.clamp_int(EnchantmentHelper.getEnchantmentLevel(Enchantment.unbreaking.effectId, stack), 0, 4);
|
||||
return 100 * (5 - unbreakingLevel) / 5;
|
||||
}
|
||||
|
||||
@@ -199,8 +209,7 @@ public class ElementalLifeImbuedArmor extends ItemArmor implements ISpecialArmor
|
||||
|
||||
@Override
|
||||
public void onArmorTick(World world, EntityPlayer player, ItemStack armor) {
|
||||
if (hasArmorSetItem(player, 0)
|
||||
&& hasArmorSetItem(player, 1)
|
||||
if (hasArmorSetItem(player, 0) && hasArmorSetItem(player, 1)
|
||||
&& hasArmorSetItem(player, 2)
|
||||
&& hasArmorSetItem(player, 3)) {
|
||||
if (player.getHealth() < player.getMaxHealth()
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
package com.arc.bloodarsenal.common.items.armor;
|
||||
|
||||
import com.arc.bloodarsenal.common.BloodArsenal;
|
||||
import com.arc.bloodarsenal.common.items.ModItems;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemArmor;
|
||||
@@ -10,7 +9,11 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.StatCollector;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import com.arc.bloodarsenal.common.BloodArsenal;
|
||||
import com.arc.bloodarsenal.common.items.ModItems;
|
||||
|
||||
public class GlassArmor extends ItemArmor {
|
||||
|
||||
public GlassArmor(int armorType) {
|
||||
super(BloodArsenal.glassArmor, 1, armorType);
|
||||
setMaxDamage(42); // The answer to everything in the universe
|
||||
|
||||
@@ -1,11 +1,8 @@
|
||||
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 java.util.List;
|
||||
import java.util.Random;
|
||||
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.enchantment.Enchantment;
|
||||
import net.minecraft.enchantment.EnchantmentHelper;
|
||||
@@ -24,7 +21,14 @@ import net.minecraft.util.StatCollector;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.ISpecialArmor;
|
||||
|
||||
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;
|
||||
|
||||
public class LifeImbuedArmor extends ItemArmor implements ISpecialArmor, IFillable {
|
||||
|
||||
private int maxLP = 100000;
|
||||
private String LP_STORED = "LPStored";
|
||||
public double absorbRatio = 0.5;
|
||||
@@ -57,8 +61,10 @@ public class LifeImbuedArmor extends ItemArmor implements ISpecialArmor, IFillab
|
||||
@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));
|
||||
par3List.add(
|
||||
StatCollector.translateToLocal("tooltip.fillable.currentAmount") + " "
|
||||
+ EnumChatFormatting.RED
|
||||
+ par1ItemStack.getTagCompound().getInteger(LP_STORED));
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -157,17 +163,21 @@ public class LifeImbuedArmor extends ItemArmor implements ISpecialArmor, IFillab
|
||||
}
|
||||
|
||||
@Override
|
||||
public ArmorProperties getProperties(
|
||||
EntityLivingBase player, ItemStack armor, DamageSource source, double damage, int slot) {
|
||||
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);
|
||||
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);
|
||||
0,
|
||||
absorbRatio * getArmorMaterial().getDamageReductionAmount(armorType) * 0.05,
|
||||
absorbMax);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -176,8 +186,8 @@ public class LifeImbuedArmor extends ItemArmor implements ISpecialArmor, IFillab
|
||||
}
|
||||
|
||||
protected int getLPPerDamage(ItemStack stack) {
|
||||
int unbreakingLevel = MathHelper.clamp_int(
|
||||
EnchantmentHelper.getEnchantmentLevel(Enchantment.unbreaking.effectId, stack), 0, 4);
|
||||
int unbreakingLevel = MathHelper
|
||||
.clamp_int(EnchantmentHelper.getEnchantmentLevel(Enchantment.unbreaking.effectId, stack), 0, 4);
|
||||
return 100 * (5 - unbreakingLevel) / 5;
|
||||
}
|
||||
|
||||
@@ -199,8 +209,7 @@ public class LifeImbuedArmor extends ItemArmor implements ISpecialArmor, IFillab
|
||||
|
||||
@Override
|
||||
public void onArmorTick(World world, EntityPlayer player, ItemStack armor) {
|
||||
if (hasArmorSetItem(player, 0)
|
||||
&& hasArmorSetItem(player, 1)
|
||||
if (hasArmorSetItem(player, 0) && hasArmorSetItem(player, 1)
|
||||
&& hasArmorSetItem(player, 2)
|
||||
&& hasArmorSetItem(player, 3)) {
|
||||
if (player.getHealth() < player.getMaxHealth()
|
||||
|
||||
@@ -1,10 +1,5 @@
|
||||
package com.arc.bloodarsenal.common.items.armor;
|
||||
|
||||
import com.arc.bloodarsenal.client.renderer.model.ModelVampireCostume;
|
||||
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.model.ModelBiped;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.Entity;
|
||||
@@ -19,7 +14,15 @@ import net.minecraft.potion.PotionEffect;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import com.arc.bloodarsenal.client.renderer.model.ModelVampireCostume;
|
||||
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;
|
||||
|
||||
public class VampireCostume extends ItemArmor {
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
private IIcon chestIcon;
|
||||
|
||||
@@ -76,8 +79,7 @@ public class VampireCostume extends ItemArmor {
|
||||
|
||||
if (entityLiving instanceof EntityPlayer) {
|
||||
if (((EntityPlayer) entityLiving).getItemInUseDuration() > 0) {
|
||||
EnumAction enumaction =
|
||||
((EntityPlayer) entityLiving).getItemInUse().getItemUseAction();
|
||||
EnumAction enumaction = ((EntityPlayer) entityLiving).getItemInUse().getItemUseAction();
|
||||
|
||||
if (enumaction == EnumAction.block) {
|
||||
this.model.heldItemRight = 3;
|
||||
|
||||
+27
-23
@@ -1,20 +1,7 @@
|
||||
package com.arc.bloodarsenal.common.items.bauble;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
|
||||
import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
|
||||
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
|
||||
import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
|
||||
import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar;
|
||||
import baubles.api.BaubleType;
|
||||
import baubles.api.IBauble;
|
||||
import baubles.common.container.InventoryBaubles;
|
||||
import baubles.common.lib.PlayerHandler;
|
||||
import com.arc.bloodarsenal.common.BloodArsenalConfig;
|
||||
import com.arc.bloodarsenal.common.items.ModItems;
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
@@ -31,7 +18,25 @@ import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.common.util.FakePlayer;
|
||||
import net.minecraftforge.event.entity.living.LivingDeathEvent;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
|
||||
import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
|
||||
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
|
||||
import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
|
||||
import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar;
|
||||
import baubles.api.BaubleType;
|
||||
import baubles.api.IBauble;
|
||||
import baubles.common.container.InventoryBaubles;
|
||||
import baubles.common.lib.PlayerHandler;
|
||||
|
||||
import com.arc.bloodarsenal.common.BloodArsenalConfig;
|
||||
import com.arc.bloodarsenal.common.items.ModItems;
|
||||
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class EmpoweredSacrificeAmulet extends SacrificeAmulet implements IBauble, IBindable {
|
||||
|
||||
public EmpoweredSacrificeAmulet() {
|
||||
super();
|
||||
setHasSubtypes(true);
|
||||
@@ -43,8 +48,7 @@ public class EmpoweredSacrificeAmulet extends SacrificeAmulet implements IBauble
|
||||
public void sacrificeHandler(LivingDeathEvent event) {
|
||||
Entity killer = event.source.getEntity();
|
||||
|
||||
if (killer != null
|
||||
&& killer instanceof EntityPlayerMP
|
||||
if (killer != null && killer instanceof EntityPlayerMP
|
||||
&& !(killer instanceof FakePlayer)
|
||||
&& BloodArsenalConfig.baublesIntegration) {
|
||||
EntityLivingBase victim = event.entityLiving;
|
||||
@@ -57,8 +61,7 @@ public class EmpoweredSacrificeAmulet extends SacrificeAmulet implements IBauble
|
||||
|
||||
if (stack != null) {
|
||||
if (stack.getItem() == ModItems.empowered_sacrifice_amulet) {
|
||||
EmpoweredSacrificeAmulet sacrificeAmulet =
|
||||
(EmpoweredSacrificeAmulet) ModItems.empowered_sacrifice_amulet;
|
||||
EmpoweredSacrificeAmulet sacrificeAmulet = (EmpoweredSacrificeAmulet) ModItems.empowered_sacrifice_amulet;
|
||||
float victimHealth = victim.getMaxHealth();
|
||||
boolean healthGood = victimHealth > 4.0F;
|
||||
int lpReceived = healthGood ? 200 : 50;
|
||||
@@ -66,7 +69,8 @@ public class EmpoweredSacrificeAmulet extends SacrificeAmulet implements IBauble
|
||||
|
||||
if (shouldExecute) {
|
||||
sacrificeAmulet.setStoredLP(
|
||||
stack, Math.min(sacrificeAmulet.getStoredLP(stack) + (lpReceived * 5), 50000));
|
||||
stack,
|
||||
Math.min(sacrificeAmulet.getStoredLP(stack) + (lpReceived * 5), 50000));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -102,15 +106,15 @@ public class EmpoweredSacrificeAmulet extends SacrificeAmulet implements IBauble
|
||||
SoulNetworkHandler.addCurrentEssenceToMaximum(
|
||||
owner,
|
||||
50,
|
||||
SoulNetworkHandler.getMaximumForOrbTier(
|
||||
SoulNetworkHandler.getCurrentMaxOrb(owner)));
|
||||
SoulNetworkHandler
|
||||
.getMaximumForOrbTier(SoulNetworkHandler.getCurrentMaxOrb(owner)));
|
||||
setStoredLP(par1ItemStack, getStoredLP(par1ItemStack) - 50);
|
||||
} else if (this.getStoredLP(par1ItemStack) > 0) {
|
||||
SoulNetworkHandler.addCurrentEssenceToMaximum(
|
||||
owner,
|
||||
this.getStoredLP(par1ItemStack),
|
||||
SoulNetworkHandler.getMaximumForOrbTier(
|
||||
SoulNetworkHandler.getCurrentMaxOrb(owner)));
|
||||
SoulNetworkHandler
|
||||
.getMaximumForOrbTier(SoulNetworkHandler.getCurrentMaxOrb(owner)));
|
||||
setStoredLP(par1ItemStack, 0);
|
||||
}
|
||||
}
|
||||
|
||||
+25
-22
@@ -1,20 +1,7 @@
|
||||
package com.arc.bloodarsenal.common.items.bauble;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
|
||||
import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
|
||||
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
|
||||
import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
|
||||
import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar;
|
||||
import baubles.api.BaubleType;
|
||||
import baubles.api.IBauble;
|
||||
import baubles.common.container.InventoryBaubles;
|
||||
import baubles.common.lib.PlayerHandler;
|
||||
import com.arc.bloodarsenal.common.BloodArsenalConfig;
|
||||
import com.arc.bloodarsenal.common.items.ModItems;
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
@@ -32,7 +19,25 @@ import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.event.entity.living.LivingAttackEvent;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
|
||||
import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
|
||||
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
|
||||
import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
|
||||
import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar;
|
||||
import baubles.api.BaubleType;
|
||||
import baubles.api.IBauble;
|
||||
import baubles.common.container.InventoryBaubles;
|
||||
import baubles.common.lib.PlayerHandler;
|
||||
|
||||
import com.arc.bloodarsenal.common.BloodArsenalConfig;
|
||||
import com.arc.bloodarsenal.common.items.ModItems;
|
||||
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class EmpoweredSelfSacrificeAmulet extends SelfSacrificeAmulet implements IBauble, IBindable {
|
||||
|
||||
public EmpoweredSelfSacrificeAmulet() {
|
||||
super();
|
||||
setHasSubtypes(true);
|
||||
@@ -45,8 +50,7 @@ public class EmpoweredSelfSacrificeAmulet extends SelfSacrificeAmulet implements
|
||||
EntityLivingBase entityAttacked = event.entityLiving;
|
||||
Entity entityAttacking = event.source.getSourceOfDamage();
|
||||
|
||||
if (entityAttacking != null
|
||||
&& entityAttacked != null
|
||||
if (entityAttacking != null && entityAttacked != null
|
||||
&& entityAttacked instanceof EntityPlayerMP
|
||||
&& BloodArsenalConfig.baublesIntegration) {
|
||||
float damageDone = event.ammount;
|
||||
@@ -59,8 +63,7 @@ public class EmpoweredSelfSacrificeAmulet extends SelfSacrificeAmulet implements
|
||||
|
||||
if (stack != null) {
|
||||
if (stack.getItem() == ModItems.empowered_self_sacrifice_amulet) {
|
||||
EmpoweredSelfSacrificeAmulet selfSacrificeAmulet =
|
||||
(EmpoweredSelfSacrificeAmulet) ModItems.empowered_self_sacrifice_amulet;
|
||||
EmpoweredSelfSacrificeAmulet selfSacrificeAmulet = (EmpoweredSelfSacrificeAmulet) ModItems.empowered_self_sacrifice_amulet;
|
||||
int lpReceived = (int) damageDone;
|
||||
boolean shouldExecute = selfSacrificeAmulet.getStoredLP(stack) < 50000;
|
||||
|
||||
@@ -114,15 +117,15 @@ public class EmpoweredSelfSacrificeAmulet extends SelfSacrificeAmulet implements
|
||||
SoulNetworkHandler.addCurrentEssenceToMaximum(
|
||||
owner,
|
||||
50,
|
||||
SoulNetworkHandler.getMaximumForOrbTier(
|
||||
SoulNetworkHandler.getCurrentMaxOrb(owner)));
|
||||
SoulNetworkHandler
|
||||
.getMaximumForOrbTier(SoulNetworkHandler.getCurrentMaxOrb(owner)));
|
||||
setStoredLP(par1ItemStack, getStoredLP(par1ItemStack) - 50);
|
||||
} else if (this.getStoredLP(par1ItemStack) > 0) {
|
||||
SoulNetworkHandler.addCurrentEssenceToMaximum(
|
||||
owner,
|
||||
this.getStoredLP(par1ItemStack),
|
||||
SoulNetworkHandler.getMaximumForOrbTier(
|
||||
SoulNetworkHandler.getCurrentMaxOrb(owner)));
|
||||
SoulNetworkHandler
|
||||
.getMaximumForOrbTier(SoulNetworkHandler.getCurrentMaxOrb(owner)));
|
||||
setStoredLP(par1ItemStack, 0);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,17 +1,19 @@
|
||||
package com.arc.bloodarsenal.common.items.bauble;
|
||||
|
||||
import baubles.api.IBauble;
|
||||
import baubles.common.container.InventoryBaubles;
|
||||
import baubles.common.lib.PlayerHandler;
|
||||
import cpw.mods.fml.common.Optional;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import baubles.api.IBauble;
|
||||
import baubles.common.container.InventoryBaubles;
|
||||
import baubles.common.lib.PlayerHandler;
|
||||
import cpw.mods.fml.common.Optional;
|
||||
|
||||
@Optional.Interface(iface = "baubles.api.IBauble", modid = "Baubles")
|
||||
public abstract class ItemBauble extends Item implements IBauble {
|
||||
|
||||
public ItemBauble() {
|
||||
super();
|
||||
setMaxStackSize(1);
|
||||
@@ -32,8 +34,8 @@ public abstract class ItemBauble extends Item implements IBauble {
|
||||
baubles.setInventorySlotContents(i, par1ItemStack.copy());
|
||||
|
||||
if (!par3EntityPlayer.capabilities.isCreativeMode) {
|
||||
par3EntityPlayer.inventory.setInventorySlotContents(
|
||||
par3EntityPlayer.inventory.currentItem, null);
|
||||
par3EntityPlayer.inventory
|
||||
.setInventorySlotContents(par3EntityPlayer.inventory.currentItem, null);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,17 +1,7 @@
|
||||
package com.arc.bloodarsenal.common.items.bauble;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.items.IAltarManipulator;
|
||||
import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar;
|
||||
import baubles.api.BaubleType;
|
||||
import baubles.api.IBauble;
|
||||
import baubles.common.container.InventoryBaubles;
|
||||
import baubles.common.lib.PlayerHandler;
|
||||
import com.arc.bloodarsenal.common.BloodArsenalConfig;
|
||||
import com.arc.bloodarsenal.common.items.ModItems;
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
@@ -28,7 +18,22 @@ import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.common.util.FakePlayer;
|
||||
import net.minecraftforge.event.entity.living.LivingDeathEvent;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.items.IAltarManipulator;
|
||||
import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar;
|
||||
import baubles.api.BaubleType;
|
||||
import baubles.api.IBauble;
|
||||
import baubles.common.container.InventoryBaubles;
|
||||
import baubles.common.lib.PlayerHandler;
|
||||
|
||||
import com.arc.bloodarsenal.common.BloodArsenalConfig;
|
||||
import com.arc.bloodarsenal.common.items.ModItems;
|
||||
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class SacrificeAmulet extends ItemBauble implements IAltarManipulator, IBauble {
|
||||
|
||||
public SacrificeAmulet() {
|
||||
super();
|
||||
MinecraftForge.EVENT_BUS.register(this);
|
||||
@@ -38,8 +43,7 @@ public class SacrificeAmulet extends ItemBauble implements IAltarManipulator, IB
|
||||
public void sacrificeHandler(LivingDeathEvent event) {
|
||||
Entity killer = event.source.getEntity();
|
||||
|
||||
if (killer != null
|
||||
&& killer instanceof EntityPlayerMP
|
||||
if (killer != null && killer instanceof EntityPlayerMP
|
||||
&& !(killer instanceof FakePlayer)
|
||||
&& BloodArsenalConfig.baublesIntegration) {
|
||||
EntityLivingBase victim = event.entityLiving;
|
||||
@@ -60,7 +64,8 @@ public class SacrificeAmulet extends ItemBauble implements IAltarManipulator, IB
|
||||
|
||||
if (shouldExecute) {
|
||||
sacrificeAmulet.setStoredLP(
|
||||
stack, Math.min(sacrificeAmulet.getStoredLP(stack) + (lpReceived * 2), 10000));
|
||||
stack,
|
||||
Math.min(sacrificeAmulet.getStoredLP(stack) + (lpReceived * 2), 10000));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,17 +1,7 @@
|
||||
package com.arc.bloodarsenal.common.items.bauble;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.items.IAltarManipulator;
|
||||
import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar;
|
||||
import baubles.api.BaubleType;
|
||||
import baubles.api.IBauble;
|
||||
import baubles.common.container.InventoryBaubles;
|
||||
import baubles.common.lib.PlayerHandler;
|
||||
import com.arc.bloodarsenal.common.BloodArsenalConfig;
|
||||
import com.arc.bloodarsenal.common.items.ModItems;
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
@@ -28,7 +18,22 @@ import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.event.entity.living.LivingAttackEvent;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.items.IAltarManipulator;
|
||||
import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar;
|
||||
import baubles.api.BaubleType;
|
||||
import baubles.api.IBauble;
|
||||
import baubles.common.container.InventoryBaubles;
|
||||
import baubles.common.lib.PlayerHandler;
|
||||
|
||||
import com.arc.bloodarsenal.common.BloodArsenalConfig;
|
||||
import com.arc.bloodarsenal.common.items.ModItems;
|
||||
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class SelfSacrificeAmulet extends ItemBauble implements IAltarManipulator, IBauble {
|
||||
|
||||
public SelfSacrificeAmulet() {
|
||||
super();
|
||||
MinecraftForge.EVENT_BUS.register(this);
|
||||
@@ -38,8 +43,7 @@ public class SelfSacrificeAmulet extends ItemBauble implements IAltarManipulator
|
||||
public void selfSacrificeHandler(LivingAttackEvent event) {
|
||||
EntityLivingBase entityAttacked = event.entityLiving;
|
||||
|
||||
if (entityAttacked != null
|
||||
&& entityAttacked instanceof EntityPlayerMP
|
||||
if (entityAttacked != null && entityAttacked instanceof EntityPlayerMP
|
||||
&& BloodArsenalConfig.baublesIntegration) {
|
||||
float damageDone = event.ammount;
|
||||
|
||||
|
||||
@@ -1,18 +1,22 @@
|
||||
package com.arc.bloodarsenal.common.items.bauble;
|
||||
|
||||
import baubles.api.BaubleType;
|
||||
import baubles.api.IBauble;
|
||||
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;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.potion.PotionEffect;
|
||||
|
||||
import baubles.api.BaubleType;
|
||||
import baubles.api.IBauble;
|
||||
|
||||
import com.arc.bloodarsenal.common.BloodArsenal;
|
||||
import com.arc.bloodarsenal.common.BloodArsenalConfig;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class VampireRing extends ItemBauble implements IBauble {
|
||||
|
||||
public VampireRing() {
|
||||
super();
|
||||
setMaxStackSize(1);
|
||||
|
||||
@@ -5,6 +5,7 @@ import net.minecraft.item.ItemBlock;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
public class BloodStoneBlock extends ItemBlock {
|
||||
|
||||
public BloodStoneBlock(Block block) {
|
||||
super(block);
|
||||
setHasSubtypes(true);
|
||||
|
||||
@@ -1,9 +1,7 @@
|
||||
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 java.util.List;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.gui.GuiScreen;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
@@ -11,7 +9,12 @@ import net.minecraft.item.ItemBlock;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.StatCollector;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.rituals.Rituals;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class CompactedMRSBlock extends ItemBlock {
|
||||
|
||||
public CompactedMRSBlock(Block block) {
|
||||
super(block);
|
||||
setMaxStackSize(1);
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
package com.arc.bloodarsenal.common.items.block;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.gui.GuiScreen;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
@@ -10,7 +9,11 @@ import net.minecraft.item.ItemBlock;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.StatCollector;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class PortableAltarBlock extends ItemBlock {
|
||||
|
||||
public PortableAltarBlock(Block block) {
|
||||
super(block);
|
||||
setMaxStackSize(1);
|
||||
@@ -35,7 +38,8 @@ public class PortableAltarBlock extends ItemBlock {
|
||||
|
||||
addStringToTooltip(StatCollector.translateToLocal("tooltip.altarTier") + " &c" + alterTier + "&7", par3List);
|
||||
addStringToTooltip(
|
||||
StatCollector.translateToLocal("tooltip.currentEssence") + " &c" + currentEssence + "&7", par3List);
|
||||
StatCollector.translateToLocal("tooltip.currentEssence") + " &c" + currentEssence + "&7",
|
||||
par3List);
|
||||
addStringToTooltip(StatCollector.translateToLocal("tooltip.capacity") + " &c" + capacity + "&7", par3List);
|
||||
}
|
||||
|
||||
|
||||
@@ -1,5 +1,16 @@
|
||||
package com.arc.bloodarsenal.common.items.book;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.crafting.IRecipe;
|
||||
import net.minecraft.util.EnumChatFormatting;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.util.StatCollector;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.items.ShapelessBloodOrbRecipe;
|
||||
import amerifrance.guideapi.api.GuideRegistry;
|
||||
import amerifrance.guideapi.api.abstraction.CategoryAbstract;
|
||||
@@ -12,19 +23,12 @@ import amerifrance.guideapi.categories.CategoryItemStack;
|
||||
import amerifrance.guideapi.entries.EntryUniText;
|
||||
import amerifrance.guideapi.pages.PageIRecipe;
|
||||
import amerifrance.guideapi.pages.PageUnlocImage;
|
||||
|
||||
import com.arc.bloodarsenal.common.items.ModItems;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.crafting.IRecipe;
|
||||
import net.minecraft.util.EnumChatFormatting;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.util.StatCollector;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
|
||||
public class BloodBurnedTome {
|
||||
|
||||
public static Book burnedTome;
|
||||
public static List<CategoryAbstract> categories = new ArrayList<CategoryAbstract>();
|
||||
private static final String R_LOC = "BloodArsenal:book/images/";
|
||||
@@ -33,21 +37,21 @@ public class BloodBurnedTome {
|
||||
registerLifebringer();
|
||||
|
||||
BookBuilder bookBuilder = new BookBuilder();
|
||||
bookBuilder
|
||||
.setCategories(categories)
|
||||
.setUnlocBookTitle("guide.bloodarsenal.book.title")
|
||||
bookBuilder.setCategories(categories).setUnlocBookTitle("guide.bloodarsenal.book.title")
|
||||
.setUnlocWelcomeMessage("guide.bloodarsenal.book.welcomeMessage")
|
||||
.setUnlocDisplayName("guide.bloodarsenal.book.name")
|
||||
.setAuthor("-An Arc Mage")
|
||||
.setUnlocDisplayName("guide.bloodarsenal.book.name").setAuthor("-An Arc Mage")
|
||||
.setItemTexture("BloodArsenal:burned_tome");
|
||||
burnedTome = bookBuilder.build();
|
||||
GuideRegistry.registerBook(burnedTome);
|
||||
GameRegistry.addRecipe(new ShapelessBloodOrbRecipe(
|
||||
GuideRegistry.getItemStackForBook(burnedTome),
|
||||
ModItems.glass_shard,
|
||||
Items.writable_book,
|
||||
new ItemStack(
|
||||
WayofTime.alchemicalWizardry.ModItems.apprenticeBloodOrb, 1, OreDictionary.WILDCARD_VALUE)));
|
||||
GameRegistry.addRecipe(
|
||||
new ShapelessBloodOrbRecipe(
|
||||
GuideRegistry.getItemStackForBook(burnedTome),
|
||||
ModItems.glass_shard,
|
||||
Items.writable_book,
|
||||
new ItemStack(
|
||||
WayofTime.alchemicalWizardry.ModItems.apprenticeBloodOrb,
|
||||
1,
|
||||
OreDictionary.WILDCARD_VALUE)));
|
||||
RecipeHolder.init();
|
||||
}
|
||||
|
||||
@@ -66,13 +70,17 @@ public class BloodBurnedTome {
|
||||
makePage(lifeBringerEntries, glass, "glass");
|
||||
}
|
||||
|
||||
categories.add(new CategoryItemStack(
|
||||
lifeBringerEntries, "guide.bloodarsenal.category.lifeBringer", new ItemStack(ModItems.bound_bow)));
|
||||
categories.add(
|
||||
new CategoryItemStack(
|
||||
lifeBringerEntries,
|
||||
"guide.bloodarsenal.category.lifeBringer",
|
||||
new ItemStack(ModItems.bound_bow)));
|
||||
}
|
||||
|
||||
private static void makePage(List<EntryAbstract> entries, ArrayList<IPage> pages, String name, Object... others) {
|
||||
pages.addAll(PageHelper.pagesForLongText(
|
||||
replaceColors(StatCollector.translateToLocal("guide.bloodarsenal.entry." + name))));
|
||||
pages.addAll(
|
||||
PageHelper.pagesForLongText(
|
||||
replaceColors(StatCollector.translateToLocal("guide.bloodarsenal.entry." + name))));
|
||||
|
||||
if (others != null) {
|
||||
for (Object code : others) {
|
||||
@@ -93,7 +101,8 @@ public class BloodBurnedTome {
|
||||
|
||||
private static Object[] s(String pageName) {
|
||||
if (pageName != null) {
|
||||
return PageHelper.pagesForLongText(
|
||||
return PageHelper
|
||||
.pagesForLongText(
|
||||
replaceColors(StatCollector.translateToLocal("guide.bloodarsenal.entry." + pageName)))
|
||||
.toArray();
|
||||
}
|
||||
@@ -117,10 +126,11 @@ public class BloodBurnedTome {
|
||||
if (names != null) {
|
||||
ArrayList<PageUnlocImage> images = new ArrayList<PageUnlocImage>();
|
||||
for (String name : names) {
|
||||
images.add(new PageUnlocImage(
|
||||
replaceColors(StatCollector.translateToLocal("guide.bloodarsenal.caption." + name)),
|
||||
new ResourceLocation(R_LOC + name + ".png"),
|
||||
true));
|
||||
images.add(
|
||||
new PageUnlocImage(
|
||||
replaceColors(StatCollector.translateToLocal("guide.bloodarsenal.caption." + name)),
|
||||
new ResourceLocation(R_LOC + name + ".png"),
|
||||
true));
|
||||
}
|
||||
|
||||
return images.toArray();
|
||||
|
||||
@@ -1,13 +1,16 @@
|
||||
package com.arc.bloodarsenal.common.items.book;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.AltarRecipe;
|
||||
import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.AltarRecipeRegistry;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.crafting.CraftingManager;
|
||||
import net.minecraft.item.crafting.IRecipe;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.AltarRecipe;
|
||||
import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.AltarRecipeRegistry;
|
||||
|
||||
public class RecipeHolder {
|
||||
|
||||
private static List recipeList;
|
||||
|
||||
public static IRecipe glassSacrificialDagger;
|
||||
|
||||
@@ -1,10 +1,7 @@
|
||||
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;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
@@ -13,7 +10,13 @@ import net.minecraft.util.IIcon;
|
||||
import net.minecraft.util.StatCollector;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
|
||||
import WayofTime.alchemicalWizardry.common.items.EnergyBattery;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class TransparentOrb extends EnergyBattery {
|
||||
|
||||
IIcon icons[] = new IIcon[45];
|
||||
|
||||
public TransparentOrb(int damage) {
|
||||
@@ -26,10 +29,12 @@ public class TransparentOrb extends EnergyBattery {
|
||||
list.add(StatCollector.translateToLocal("tooltip.energybattery.desc"));
|
||||
|
||||
if (itemStack.getTagCompound() != null) {
|
||||
list.add(StatCollector.translateToLocal("tooltip.owner.currentowner") + " "
|
||||
+ itemStack.getTagCompound().getString("ownerName"));
|
||||
list.add(StatCollector.translateToLocal("tooltip.energybattery.currentLP") + " "
|
||||
+ this.getCurrentEssence(itemStack));
|
||||
list.add(
|
||||
StatCollector.translateToLocal("tooltip.owner.currentowner") + " "
|
||||
+ itemStack.getTagCompound().getString("ownerName"));
|
||||
list.add(
|
||||
StatCollector.translateToLocal("tooltip.energybattery.currentLP") + " "
|
||||
+ this.getCurrentEssence(itemStack));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -39,8 +44,8 @@ public class TransparentOrb extends EnergyBattery {
|
||||
return;
|
||||
}
|
||||
|
||||
int maxEssence = SoulNetworkHandler.getMaximumForOrbTier(
|
||||
SoulNetworkHandler.getCurrentMaxOrb(SoulNetworkHandler.getOwnerName(itemStack)));
|
||||
int maxEssence = SoulNetworkHandler
|
||||
.getMaximumForOrbTier(SoulNetworkHandler.getCurrentMaxOrb(SoulNetworkHandler.getOwnerName(itemStack)));
|
||||
int section = maxEssence / 44;
|
||||
int currentEssence = SoulNetworkHandler.getCurrentEssence(SoulNetworkHandler.getOwnerName(itemStack));
|
||||
|
||||
|
||||
@@ -1,13 +1,7 @@
|
||||
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.common.BloodArsenalConfig;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
@@ -19,7 +13,18 @@ import net.minecraft.util.IIcon;
|
||||
import net.minecraft.util.StatCollector;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
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.common.BloodArsenalConfig;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class SigilDivinity extends EnergyItems implements ArmourUpgrade, IBindable, ISigil {
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public IIcon activeIcon;
|
||||
|
||||
|
||||
@@ -1,11 +1,7 @@
|
||||
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.common.BloodArsenalConfig;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
@@ -14,7 +10,15 @@ import net.minecraft.util.StatCollector;
|
||||
import net.minecraft.util.Vec3;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
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.common.BloodArsenalConfig;
|
||||
|
||||
public class SigilEnder extends EnergyItems implements IBindable, ISigil {
|
||||
|
||||
public SigilEnder() {
|
||||
super();
|
||||
setMaxStackSize(1);
|
||||
@@ -79,9 +83,8 @@ public class SigilEnder extends EnergyItems implements IBindable, ISigil {
|
||||
Vec3 vec3 = Vec3.createVectorHelper(ex, wy, zee);
|
||||
double distance = playerPrevPos.distanceTo(vec3);
|
||||
|
||||
if (SoulNetworkHandler.getCurrentEssence(
|
||||
itemStack.getTagCompound().getString("ownerName"))
|
||||
>= distance * BloodArsenalConfig.enderSigilTeleportMultiplier
|
||||
if (SoulNetworkHandler.getCurrentEssence(itemStack.getTagCompound().getString("ownerName"))
|
||||
>= distance * BloodArsenalConfig.enderSigilTeleportMultiplier
|
||||
|| player.capabilities.isCreativeMode) {
|
||||
for (int k = 0; k < 8; ++k) {
|
||||
world.spawnParticle(
|
||||
@@ -104,7 +107,9 @@ public class SigilEnder extends EnergyItems implements IBindable, ISigil {
|
||||
|
||||
player.setPositionAndUpdate(ex, wy, zee);
|
||||
EnergyItems.syphonBatteries(
|
||||
itemStack, player, (int) distance * BloodArsenalConfig.enderSigilTeleportMultiplier);
|
||||
itemStack,
|
||||
player,
|
||||
(int) distance * BloodArsenalConfig.enderSigilTeleportMultiplier);
|
||||
world.playSoundAtEntity(player, "mob.endermen.portal", 1F, 1F);
|
||||
player.swingItem();
|
||||
player.setVelocity(0.0D, 0.0D, 0.0D);
|
||||
|
||||
@@ -1,11 +1,7 @@
|
||||
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.common.BloodArsenalConfig;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.entity.effect.EntityLightningBolt;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -16,7 +12,15 @@ import net.minecraft.util.MovingObjectPosition;
|
||||
import net.minecraft.util.StatCollector;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
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.common.BloodArsenalConfig;
|
||||
|
||||
public class SigilLightning extends EnergyItems implements IBindable, ISigil {
|
||||
|
||||
public SigilLightning() {
|
||||
super();
|
||||
setMaxStackSize(1);
|
||||
@@ -94,7 +98,7 @@ public class SigilLightning extends EnergyItems implements IBindable, ISigil {
|
||||
int cost = 0;
|
||||
|
||||
switch (mode) {
|
||||
// 8 per lightning bolt
|
||||
// 8 per lightning bolt
|
||||
case 0:
|
||||
cost = 8 * BloodArsenalConfig.lightningSigilMultiplier;
|
||||
break;
|
||||
@@ -112,9 +116,7 @@ public class SigilLightning extends EnergyItems implements IBindable, ISigil {
|
||||
break;
|
||||
}
|
||||
|
||||
if (SoulNetworkHandler.getCurrentEssence(
|
||||
itemStack.getTagCompound().getString("ownerName"))
|
||||
>= cost
|
||||
if (SoulNetworkHandler.getCurrentEssence(itemStack.getTagCompound().getString("ownerName")) >= cost
|
||||
|| player.capabilities.isCreativeMode) {
|
||||
switch (mode) {
|
||||
case 0:
|
||||
|
||||
@@ -1,13 +1,7 @@
|
||||
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.common.BloodArsenalConfig;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
@@ -18,7 +12,18 @@ import net.minecraft.util.IIcon;
|
||||
import net.minecraft.util.StatCollector;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
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.common.BloodArsenalConfig;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class SigilSwimming extends EnergyItems implements ArmourUpgrade, IBindable, ISigil {
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
private static IIcon activeIcon;
|
||||
|
||||
|
||||
@@ -1,11 +1,5 @@
|
||||
package com.arc.bloodarsenal.common.items.sigil;
|
||||
|
||||
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;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.entity.EntityClientPlayerMP;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
@@ -17,9 +11,18 @@ import net.minecraft.util.Vec3;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.client.event.MouseEvent;
|
||||
|
||||
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;
|
||||
|
||||
public class SigilUtils {
|
||||
public static MovingObjectPosition getTargetBlock(
|
||||
World world, double x, double y, double z, float yaw, float pitch, boolean par3, double range) {
|
||||
|
||||
public static MovingObjectPosition getTargetBlock(World world, double x, double y, double z, float yaw, float pitch,
|
||||
boolean par3, double range) {
|
||||
Vec3 var13 = Vec3.createVectorHelper(x, y, z);
|
||||
float var14 = MathHelper.cos(-yaw * 0.01745329F - 3.141593F);
|
||||
float var15 = MathHelper.sin(-yaw * 0.01745329F - 3.141593F);
|
||||
|
||||
@@ -5,6 +5,7 @@ import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
|
||||
public class AHPacketHandler {
|
||||
|
||||
public static final SimpleNetworkWrapper INSTANCE = NetworkRegistry.INSTANCE.newSimpleChannel("AugmentedHolding");
|
||||
|
||||
public static void init() {
|
||||
|
||||
+3
-1
@@ -1,12 +1,14 @@
|
||||
package com.arc.bloodarsenal.common.items.sigil.holding;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import cpw.mods.fml.common.network.simpleimpl.IMessage;
|
||||
import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
|
||||
import cpw.mods.fml.common.network.simpleimpl.MessageContext;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
public class AHPacketProcessor implements IMessage, IMessageHandler<AHPacketProcessor, IMessage> {
|
||||
|
||||
private int slot;
|
||||
private int mode;
|
||||
|
||||
|
||||
+16
-13
@@ -1,14 +1,16 @@
|
||||
package com.arc.bloodarsenal.common.items.sigil.holding;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil;
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.inventory.Container;
|
||||
import net.minecraft.inventory.IInventory;
|
||||
import net.minecraft.inventory.Slot;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil;
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
|
||||
public class ContainerAugmentedHolding extends Container {
|
||||
|
||||
protected final int PLAYER_INVENTORY_ROWS = 3;
|
||||
protected final int PLAYER_INVENTORY_COLUMNS = 9;
|
||||
|
||||
@@ -29,8 +31,12 @@ public class ContainerAugmentedHolding extends Container {
|
||||
|
||||
for (int rowIndex = 0; rowIndex < PLAYER_INVENTORY_ROWS; ++rowIndex) {
|
||||
for (int columnIndex = 0; columnIndex < PLAYER_INVENTORY_COLUMNS; ++columnIndex) {
|
||||
this.addSlotToContainer(new Slot(
|
||||
player.inventory, columnIndex + rowIndex * 9 + 9, 8 + columnIndex * 18, 39 + rowIndex * 18));
|
||||
this.addSlotToContainer(
|
||||
new Slot(
|
||||
player.inventory,
|
||||
columnIndex + rowIndex * 9 + 9,
|
||||
8 + columnIndex * 18,
|
||||
39 + rowIndex * 18));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -99,8 +105,8 @@ public class ContainerAugmentedHolding extends Container {
|
||||
inventoryColumns,
|
||||
inventoryColumns + (PLAYER_INVENTORY_ROWS * PLAYER_INVENTORY_COLUMNS),
|
||||
false)) {
|
||||
return null;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
if (stackInSlot.stackSize == 0) {
|
||||
@@ -124,16 +130,12 @@ public class ContainerAugmentedHolding extends Container {
|
||||
}
|
||||
|
||||
private class SlotHolding extends Slot {
|
||||
|
||||
private final EntityPlayer player;
|
||||
private ContainerAugmentedHolding containerHolding;
|
||||
|
||||
public SlotHolding(
|
||||
ContainerAugmentedHolding containerHolding,
|
||||
IInventory inventory,
|
||||
EntityPlayer player,
|
||||
int slotIndex,
|
||||
int x,
|
||||
int y) {
|
||||
public SlotHolding(ContainerAugmentedHolding containerHolding, IInventory inventory, EntityPlayer player,
|
||||
int slotIndex, int x, int y) {
|
||||
super(inventory, slotIndex, x, y);
|
||||
this.player = player;
|
||||
this.containerHolding = containerHolding;
|
||||
@@ -155,6 +157,7 @@ public class ContainerAugmentedHolding extends Container {
|
||||
}
|
||||
|
||||
private class SlotDisabled extends Slot {
|
||||
|
||||
public SlotDisabled(IInventory inventory, int slotIndex, int x, int y) {
|
||||
super(inventory, slotIndex, x, y);
|
||||
}
|
||||
|
||||
+5
-2
@@ -1,14 +1,17 @@
|
||||
package com.arc.bloodarsenal.common.items.sigil.holding;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public class GuiAugmentedHolding extends GuiContainer {
|
||||
|
||||
public GuiAugmentedHolding(EntityPlayer player, InventoryAugmentedHolding inventoryHolding) {
|
||||
super(new ContainerAugmentedHolding(player, inventoryHolding));
|
||||
xSize = 176;
|
||||
|
||||
+4
-1
@@ -1,14 +1,17 @@
|
||||
package com.arc.bloodarsenal.common.items.sigil.holding;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil;
|
||||
import java.util.UUID;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.inventory.IInventory;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.nbt.NBTTagList;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil;
|
||||
|
||||
public class InventoryAugmentedHolding implements IInventory {
|
||||
|
||||
public ItemStack parentItemStack;
|
||||
protected ItemStack[] inventory;
|
||||
|
||||
|
||||
+18
-19
@@ -1,8 +1,7 @@
|
||||
package com.arc.bloodarsenal.common.items.sigil.holding;
|
||||
|
||||
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
|
||||
import com.arc.bloodarsenal.common.BloodArsenal;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -13,7 +12,12 @@ import net.minecraft.util.MathHelper;
|
||||
import net.minecraft.util.StatCollector;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
|
||||
|
||||
import com.arc.bloodarsenal.common.BloodArsenal;
|
||||
|
||||
public class SigilAugmentedHolding extends EnergyItems {
|
||||
|
||||
private static int invSize = 8;
|
||||
|
||||
private static final String NBT_CURRENT_SIGIL = "CurrentSigil";
|
||||
@@ -47,8 +51,9 @@ public class SigilAugmentedHolding extends EnergyItems {
|
||||
par3List.add(StatCollector.translateToLocal("tooltip.sigil.augmentedHolding"));
|
||||
|
||||
if (!(par1ItemStack.getTagCompound() == null)) {
|
||||
par3List.add(StatCollector.translateToLocal("tooltip.owner.currentowner") + " "
|
||||
+ par1ItemStack.getTagCompound().getString("ownerName"));
|
||||
par3List.add(
|
||||
StatCollector.translateToLocal("tooltip.owner.currentowner") + " "
|
||||
+ par1ItemStack.getTagCompound().getString("ownerName"));
|
||||
ItemStack[] inv = getInternalInventory(par1ItemStack);
|
||||
|
||||
if (inv == null) {
|
||||
@@ -64,25 +69,19 @@ public class SigilAugmentedHolding extends EnergyItems {
|
||||
|
||||
for (int i = 0; i <= invSize; i++) {
|
||||
if (inv[i] != null) {
|
||||
par3List.add(StatCollector.translateToLocal("tooltip.item.iteminslot") + " " + (i + 1) + ": "
|
||||
+ inv[i].getDisplayName());
|
||||
par3List.add(
|
||||
StatCollector.translateToLocal("tooltip.item.iteminslot") + " "
|
||||
+ (i + 1)
|
||||
+ ": "
|
||||
+ inv[i].getDisplayName());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onItemUse(
|
||||
ItemStack par1ItemStack,
|
||||
EntityPlayer par2EntityPlayer,
|
||||
World par3World,
|
||||
int par4,
|
||||
int par5,
|
||||
int par6,
|
||||
int par7,
|
||||
float par8,
|
||||
float par9,
|
||||
float par10) {
|
||||
public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4,
|
||||
int par5, int par6, int par7, float par8, float par9, float par10) {
|
||||
if (checkAndSetItemOwner(par1ItemStack, par2EntityPlayer)) {
|
||||
int currentSlot = getCurrentItem(par1ItemStack);
|
||||
ItemStack[] inv = getInternalInventory(par1ItemStack);
|
||||
@@ -255,8 +254,8 @@ public class SigilAugmentedHolding extends EnergyItems {
|
||||
}
|
||||
}
|
||||
|
||||
public void tickInternalInventory(
|
||||
ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5) {
|
||||
public void tickInternalInventory(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4,
|
||||
boolean par5) {
|
||||
ItemStack[] inv = getInternalInventory(par1ItemStack);
|
||||
|
||||
if (inv == null) {
|
||||
|
||||
@@ -1,11 +1,7 @@
|
||||
package com.arc.bloodarsenal.common.items.tool;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
|
||||
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
|
||||
import com.arc.bloodarsenal.common.BloodArsenal;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.enchantment.Enchantment;
|
||||
import net.minecraft.enchantment.EnchantmentHelper;
|
||||
@@ -24,7 +20,16 @@ import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.event.entity.player.ArrowLooseEvent;
|
||||
import net.minecraftforge.event.entity.player.ArrowNockEvent;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
|
||||
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
|
||||
|
||||
import com.arc.bloodarsenal.common.BloodArsenal;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class BoundBow extends ItemBow implements IBindable {
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
private IIcon active;
|
||||
|
||||
@@ -65,8 +70,8 @@ public class BoundBow extends ItemBow implements IBindable {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onPlayerStoppedUsing(
|
||||
ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, int par4) {
|
||||
public void onPlayerStoppedUsing(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer,
|
||||
int par4) {
|
||||
int j = getMaxItemUseDuration(par1ItemStack) - par4;
|
||||
|
||||
ArrowLooseEvent event = new ArrowLooseEvent(par3EntityPlayer, par1ItemStack, j);
|
||||
@@ -115,7 +120,10 @@ public class BoundBow extends ItemBow implements IBindable {
|
||||
|
||||
par1ItemStack.damageItem(1, par3EntityPlayer);
|
||||
par2World.playSoundAtEntity(
|
||||
par3EntityPlayer, "random.bow", 1.0F, 1.0F / (itemRand.nextFloat() * 0.4F + 1.2F) + f * 0.5F);
|
||||
par3EntityPlayer,
|
||||
"random.bow",
|
||||
1.0F,
|
||||
1.0F / (itemRand.nextFloat() * 0.4F + 1.2F) + f * 0.5F);
|
||||
|
||||
if (flag) {
|
||||
entityarrow.canBePickedUp = 2;
|
||||
|
||||
@@ -1,11 +1,7 @@
|
||||
package com.arc.bloodarsenal.common.items.tool;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
|
||||
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
|
||||
import com.arc.bloodarsenal.common.BloodArsenal;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
@@ -18,7 +14,16 @@ import net.minecraft.util.IIcon;
|
||||
import net.minecraft.util.StatCollector;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
|
||||
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
|
||||
|
||||
import com.arc.bloodarsenal.common.BloodArsenal;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class BoundIgniter extends Item implements IBindable {
|
||||
|
||||
private int energyUsed;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@@ -75,17 +80,8 @@ public class BoundIgniter extends Item implements IBindable {
|
||||
return par1ItemStack;
|
||||
}
|
||||
|
||||
public boolean onItemUse(
|
||||
ItemStack itemStack,
|
||||
EntityPlayer player,
|
||||
World world,
|
||||
int x,
|
||||
int y,
|
||||
int z,
|
||||
int hitSide,
|
||||
float hitX,
|
||||
float hitY,
|
||||
float hitZ) {
|
||||
public boolean onItemUse(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int hitSide,
|
||||
float hitX, float hitY, float hitZ) {
|
||||
NBTTagCompound tag = itemStack.stackTagCompound;
|
||||
|
||||
if (tag.getBoolean("isActive")) {
|
||||
|
||||
@@ -1,14 +1,9 @@
|
||||
package com.arc.bloodarsenal.common.items.tool;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
|
||||
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
|
||||
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 java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Random;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
@@ -28,7 +23,17 @@ import net.minecraft.util.StatCollector;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.IShearable;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
|
||||
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
|
||||
|
||||
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;
|
||||
|
||||
public class BoundShears extends ItemShears implements IBindable {
|
||||
|
||||
private int energyUsed;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@@ -53,14 +58,8 @@ public class BoundShears extends ItemShears implements IBindable {
|
||||
return energyUsed;
|
||||
}
|
||||
|
||||
public boolean onBlockDestroyed(
|
||||
ItemStack par1ItemStack,
|
||||
World par2World,
|
||||
Block par3Block,
|
||||
int par4,
|
||||
int par5,
|
||||
int par6,
|
||||
EntityLivingBase par7EntityLivingBase) {
|
||||
public boolean onBlockDestroyed(ItemStack par1ItemStack, World par2World, Block par3Block, int par4, int par5,
|
||||
int par6, EntityLivingBase par7EntityLivingBase) {
|
||||
if (!(par7EntityLivingBase instanceof EntityPlayer)) return false;
|
||||
EntityPlayer player = (EntityPlayer) par7EntityLivingBase;
|
||||
|
||||
@@ -68,8 +67,7 @@ public class BoundShears extends ItemShears implements IBindable {
|
||||
EnergyItems.syphonBatteries(par1ItemStack, player, 50);
|
||||
}
|
||||
|
||||
if (par3Block.getMaterial() != Material.leaves
|
||||
&& par3Block != Blocks.web
|
||||
if (par3Block.getMaterial() != Material.leaves && par3Block != Blocks.web
|
||||
&& par3Block != Blocks.tallgrass
|
||||
&& par3Block != Blocks.vine
|
||||
&& par3Block != Blocks.tripwire
|
||||
@@ -105,7 +103,11 @@ public class BoundShears extends ItemShears implements IBindable {
|
||||
if (entity instanceof IShearable) {
|
||||
IShearable target = (IShearable) entity;
|
||||
if (target.isShearable(
|
||||
itemstack, entity.worldObj, (int) entity.posX, (int) entity.posY, (int) entity.posZ)) {
|
||||
itemstack,
|
||||
entity.worldObj,
|
||||
(int) entity.posX,
|
||||
(int) entity.posY,
|
||||
(int) entity.posZ)) {
|
||||
ArrayList<ItemStack> drops = target.onSheared(
|
||||
itemstack,
|
||||
entity.worldObj,
|
||||
@@ -155,7 +157,11 @@ public class BoundShears extends ItemShears implements IBindable {
|
||||
double d1 = (double) (rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D;
|
||||
double d2 = (double) (rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D;
|
||||
EntityItem entityitem = new EntityItem(
|
||||
player.worldObj, (double) x + d, (double) y + d1, (double) z + d2, stack);
|
||||
player.worldObj,
|
||||
(double) x + d,
|
||||
(double) y + d1,
|
||||
(double) z + d2,
|
||||
stack);
|
||||
entityitem.delayBeforeCanPickup = 10;
|
||||
player.worldObj.spawnEntityInWorld(entityitem);
|
||||
}
|
||||
|
||||
@@ -1,14 +1,8 @@
|
||||
package com.arc.bloodarsenal.common.items.tool;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
|
||||
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
|
||||
import com.arc.bloodarsenal.common.BloodArsenal;
|
||||
import com.google.common.collect.Sets;
|
||||
import cpw.mods.fml.common.eventhandler.Event;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockBush;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
@@ -25,7 +19,18 @@ import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.event.entity.player.UseHoeEvent;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
|
||||
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
|
||||
|
||||
import com.arc.bloodarsenal.common.BloodArsenal;
|
||||
import com.google.common.collect.Sets;
|
||||
|
||||
import cpw.mods.fml.common.eventhandler.Event;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class BoundSickle extends ItemTool implements IBindable {
|
||||
|
||||
private int energyUsed;
|
||||
|
||||
private int radiusLeaf = 3;
|
||||
@@ -34,22 +39,10 @@ public class BoundSickle extends ItemTool implements IBindable {
|
||||
private static IIcon active;
|
||||
private static IIcon passive;
|
||||
|
||||
private static final Set toolBlocks = Sets.newHashSet(new Block[] {
|
||||
Blocks.leaves,
|
||||
Blocks.leaves2,
|
||||
Blocks.wheat,
|
||||
Blocks.potatoes,
|
||||
Blocks.carrots,
|
||||
Blocks.nether_wart,
|
||||
Blocks.red_mushroom,
|
||||
Blocks.brown_mushroom,
|
||||
Blocks.reeds,
|
||||
Blocks.tallgrass,
|
||||
Blocks.vine,
|
||||
Blocks.waterlily,
|
||||
Blocks.red_flower,
|
||||
Blocks.yellow_flower
|
||||
});
|
||||
private static final Set toolBlocks = Sets.newHashSet(
|
||||
new Block[] { Blocks.leaves, Blocks.leaves2, Blocks.wheat, Blocks.potatoes, Blocks.carrots,
|
||||
Blocks.nether_wart, Blocks.red_mushroom, Blocks.brown_mushroom, Blocks.reeds, Blocks.tallgrass,
|
||||
Blocks.vine, Blocks.waterlily, Blocks.red_flower, Blocks.yellow_flower });
|
||||
|
||||
public BoundSickle(ToolMaterial toolMaterial) {
|
||||
super(1.0F, toolMaterial, toolBlocks);
|
||||
@@ -69,13 +62,7 @@ public class BoundSickle extends ItemTool implements IBindable {
|
||||
return energyUsed;
|
||||
}
|
||||
|
||||
public boolean onBlockDestroyed(
|
||||
ItemStack par1ItemStack,
|
||||
World par2World,
|
||||
Block par3Block,
|
||||
int x,
|
||||
int y,
|
||||
int z,
|
||||
public boolean onBlockDestroyed(ItemStack par1ItemStack, World par2World, Block par3Block, int x, int y, int z,
|
||||
EntityLivingBase par7EntityLivingBase) {
|
||||
NBTTagCompound tag = par1ItemStack.stackTagCompound;
|
||||
|
||||
@@ -149,17 +136,8 @@ public class BoundSickle extends ItemTool implements IBindable {
|
||||
}
|
||||
}
|
||||
|
||||
public boolean onItemUse(
|
||||
ItemStack par1ItemStack,
|
||||
EntityPlayer par2EntityPlayer,
|
||||
World par3World,
|
||||
int x,
|
||||
int y,
|
||||
int z,
|
||||
int par7,
|
||||
float par8,
|
||||
float par9,
|
||||
float par10) {
|
||||
public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int x, int y,
|
||||
int z, int par7, float par8, float par9, float par10) {
|
||||
NBTTagCompound tag = par1ItemStack.stackTagCompound;
|
||||
|
||||
if (tag.getBoolean("isActive")) {
|
||||
@@ -181,8 +159,7 @@ public class BoundSickle extends ItemTool implements IBindable {
|
||||
|
||||
Block block = par3World.getBlock(x, y, z);
|
||||
|
||||
if (par7 != 0
|
||||
&& par3World.getBlock(x, y + 1, z).isAir(par3World, x, y + 1, z)
|
||||
if (par7 != 0 && par3World.getBlock(x, y + 1, z).isAir(par3World, x, y + 1, z)
|
||||
&& (block == Blocks.grass || block == Blocks.dirt)) {
|
||||
Block block1 = Blocks.farmland;
|
||||
par3World.playSoundEffect(
|
||||
|
||||
@@ -1,15 +1,8 @@
|
||||
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.common.BloodArsenal;
|
||||
import com.arc.bloodarsenal.common.BloodArsenalConfig;
|
||||
import com.google.common.collect.Multimap;
|
||||
import java.util.List;
|
||||
import java.util.Random;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
@@ -28,7 +21,18 @@ import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.StatCollector;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
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.common.BloodArsenal;
|
||||
import com.arc.bloodarsenal.common.BloodArsenalConfig;
|
||||
import com.google.common.collect.Multimap;
|
||||
|
||||
public class GlassDaggerOfSacrifice extends EnergyItems {
|
||||
|
||||
private float weaponDamage;
|
||||
|
||||
public GlassDaggerOfSacrifice() {
|
||||
@@ -41,14 +45,12 @@ public class GlassDaggerOfSacrifice extends EnergyItems {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean hitEntity(
|
||||
ItemStack par1ItemStack, EntityLivingBase par2EntityLivingBase, EntityLivingBase par3EntityLivingBase) {
|
||||
if (par3EntityLivingBase == null
|
||||
|| par2EntityLivingBase == null
|
||||
public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase par2EntityLivingBase,
|
||||
EntityLivingBase par3EntityLivingBase) {
|
||||
if (par3EntityLivingBase == null || par2EntityLivingBase == null
|
||||
|| par3EntityLivingBase.worldObj.isRemote
|
||||
|| (par3EntityLivingBase instanceof EntityPlayer
|
||||
&& SpellHelper.isFakePlayer(
|
||||
par3EntityLivingBase.worldObj, (EntityPlayer) par3EntityLivingBase))) {
|
||||
|| (par3EntityLivingBase instanceof EntityPlayer && SpellHelper
|
||||
.isFakePlayer(par3EntityLivingBase.worldObj, (EntityPlayer) par3EntityLivingBase))) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -56,8 +58,7 @@ public class GlassDaggerOfSacrifice extends EnergyItems {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (par2EntityLivingBase.isChild()
|
||||
|| par2EntityLivingBase instanceof EntityPlayer
|
||||
if (par2EntityLivingBase.isChild() || par2EntityLivingBase instanceof EntityPlayer
|
||||
|| par2EntityLivingBase instanceof IBossDisplayData) {
|
||||
return false;
|
||||
}
|
||||
@@ -89,7 +90,16 @@ public class GlassDaggerOfSacrifice extends EnergyItems {
|
||||
|
||||
for (int i = 0; i < 8; i++) {
|
||||
SpellHelper.sendIndexedParticleToAllAround(
|
||||
world, posX, posY, posZ, 20, world.provider.dimensionId, 1, posX, posY, posZ);
|
||||
world,
|
||||
posX,
|
||||
posY,
|
||||
posZ,
|
||||
20,
|
||||
world.provider.dimensionId,
|
||||
1,
|
||||
posX,
|
||||
posY,
|
||||
posZ);
|
||||
}
|
||||
|
||||
par2EntityLivingBase.setHealth(-1);
|
||||
@@ -114,13 +124,10 @@ public class GlassDaggerOfSacrifice extends EnergyItems {
|
||||
return 15.0F;
|
||||
} else {
|
||||
Material material = par2Block.getMaterial();
|
||||
return material != Material.plants
|
||||
&& material != Material.vine
|
||||
&& material != Material.coral
|
||||
&& material != Material.leaves
|
||||
&& material != Material.gourd
|
||||
? 1.0F
|
||||
: 1.5F;
|
||||
return material != Material.plants && material != Material.vine
|
||||
&& material != Material.coral
|
||||
&& material != Material.leaves
|
||||
&& material != Material.gourd ? 1.0F : 1.5F;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,16 +1,8 @@
|
||||
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.common.BloodArsenal;
|
||||
import com.arc.bloodarsenal.common.BloodArsenalConfig;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import java.util.List;
|
||||
import java.util.Random;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
@@ -24,7 +16,20 @@ import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.common.util.FakePlayer;
|
||||
|
||||
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.common.BloodArsenal;
|
||||
import com.arc.bloodarsenal.common.BloodArsenalConfig;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class GlassSacrificialDagger extends Item {
|
||||
|
||||
public GlassSacrificialDagger() {
|
||||
super();
|
||||
setMaxStackSize(1);
|
||||
|
||||
@@ -3,6 +3,7 @@ package com.arc.bloodarsenal.common.items.tool;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
public interface IFillable {
|
||||
|
||||
int getMaxLP();
|
||||
|
||||
int getLPStored(ItemStack container);
|
||||
|
||||
@@ -1,10 +1,7 @@
|
||||
package com.arc.bloodarsenal.common.items.tool;
|
||||
|
||||
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 java.util.List;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.EnumRarity;
|
||||
@@ -12,7 +9,14 @@ import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.StatCollector;
|
||||
|
||||
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;
|
||||
|
||||
public class InfusedDiamond extends Item {
|
||||
|
||||
public InfusedDiamond() {
|
||||
super();
|
||||
setMaxStackSize(1);
|
||||
|
||||
@@ -1,12 +1,8 @@
|
||||
package com.arc.bloodarsenal.common.items.tool;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
|
||||
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
|
||||
import com.arc.bloodarsenal.common.BloodArsenal;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.entity.item.EntityItem;
|
||||
@@ -21,7 +17,16 @@ import net.minecraft.util.StatCollector;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
|
||||
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
|
||||
|
||||
import com.arc.bloodarsenal.common.BloodArsenal;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class InfusedDiamondAxe extends ItemAxe implements IBindable {
|
||||
|
||||
public static ArrayList<List> oreDictLogs = new ArrayList();
|
||||
|
||||
public InfusedDiamondAxe() {
|
||||
@@ -125,7 +130,8 @@ public class InfusedDiamondAxe extends ItemAxe implements IBindable {
|
||||
}
|
||||
|
||||
List<EntityItem> items = world.getEntitiesWithinAABB(
|
||||
EntityItem.class, AxisAlignedBB.getBoundingBox(x - 5, y - 1, z - 5, x + 5, y + 64, z + 5));
|
||||
EntityItem.class,
|
||||
AxisAlignedBB.getBoundingBox(x - 5, y - 1, z - 5, x + 5, y + 64, z + 5));
|
||||
for (EntityItem item : items) {
|
||||
item.setPosition(x + 0.5, y + 0.5, z + 0.5);
|
||||
item.ticksExisted += 20;
|
||||
|
||||
@@ -1,11 +1,7 @@
|
||||
package com.arc.bloodarsenal.common.items.tool;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
|
||||
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
|
||||
import com.arc.bloodarsenal.common.BloodArsenal;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
@@ -18,7 +14,16 @@ import net.minecraft.util.StatCollector;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
|
||||
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
|
||||
|
||||
import com.arc.bloodarsenal.common.BloodArsenal;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class InfusedDiamondPickaxe extends ItemPickaxe implements IBindable {
|
||||
|
||||
private int energyUsed;
|
||||
|
||||
public InfusedDiamondPickaxe() {
|
||||
@@ -71,14 +76,8 @@ public class InfusedDiamondPickaxe extends ItemPickaxe implements IBindable {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onBlockDestroyed(
|
||||
ItemStack par1ItemStack,
|
||||
World par2World,
|
||||
Block par3Block,
|
||||
int par4,
|
||||
int par5,
|
||||
int par6,
|
||||
EntityLivingBase par7EntityLivingBase) {
|
||||
public boolean onBlockDestroyed(ItemStack par1ItemStack, World par2World, Block par3Block, int par4, int par5,
|
||||
int par6, EntityLivingBase par7EntityLivingBase) {
|
||||
if (par7EntityLivingBase instanceof EntityPlayer) {
|
||||
EnergyItems.syphonBatteries(par1ItemStack, (EntityPlayer) par7EntityLivingBase, getEnergyUsed());
|
||||
}
|
||||
|
||||
@@ -1,11 +1,7 @@
|
||||
package com.arc.bloodarsenal.common.items.tool;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
|
||||
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
|
||||
import com.arc.bloodarsenal.common.BloodArsenal;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.EnumRarity;
|
||||
@@ -16,7 +12,16 @@ import net.minecraft.util.StatCollector;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
|
||||
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
|
||||
|
||||
import com.arc.bloodarsenal.common.BloodArsenal;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class InfusedDiamondShovel extends ItemSpade implements IBindable {
|
||||
|
||||
public InfusedDiamondShovel() {
|
||||
super(BloodArsenal.infusedIron);
|
||||
setMaxStackSize(1);
|
||||
|
||||
@@ -1,11 +1,7 @@
|
||||
package com.arc.bloodarsenal.common.items.tool;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
|
||||
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
|
||||
import com.arc.bloodarsenal.common.BloodArsenal;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
@@ -18,7 +14,16 @@ import net.minecraft.util.AxisAlignedBB;
|
||||
import net.minecraft.util.StatCollector;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
|
||||
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
|
||||
|
||||
import com.arc.bloodarsenal.common.BloodArsenal;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class InfusedDiamondSword extends ItemSword implements IBindable {
|
||||
|
||||
public InfusedDiamondSword() {
|
||||
super(BloodArsenal.infusedDiamond);
|
||||
setMaxStackSize(1);
|
||||
@@ -52,8 +57,7 @@ public class InfusedDiamondSword extends ItemSword implements IBindable {
|
||||
|
||||
@Override
|
||||
public boolean onLeftClickEntity(ItemStack stack, EntityPlayer player, Entity entity) {
|
||||
if (!ignoreLeftClick
|
||||
&& entity instanceof EntityLivingBase
|
||||
if (!ignoreLeftClick && entity instanceof EntityLivingBase
|
||||
&& ((EntityLivingBase) entity).hurtTime == 0
|
||||
&& !((EntityLivingBase) entity).isDead) {
|
||||
switch (ToolCapabilities.getMode(stack)) {
|
||||
@@ -102,8 +106,8 @@ public class InfusedDiamondSword extends ItemSword implements IBindable {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean hitEntity(
|
||||
ItemStack par1ItemStack, EntityLivingBase par2EntityLivingBase, EntityLivingBase par3EntityLivingBase) {
|
||||
public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase par2EntityLivingBase,
|
||||
EntityLivingBase par3EntityLivingBase) {
|
||||
if (par3EntityLivingBase instanceof EntityPlayer) {
|
||||
EnergyItems.checkAndSetItemOwner(par1ItemStack, (EntityPlayer) par3EntityLivingBase);
|
||||
}
|
||||
|
||||
@@ -1,11 +1,7 @@
|
||||
package com.arc.bloodarsenal.common.items.tool;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
|
||||
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
|
||||
import com.arc.bloodarsenal.common.BloodArsenal;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
@@ -14,7 +10,16 @@ import net.minecraft.item.ItemAxe;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
|
||||
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
|
||||
|
||||
import com.arc.bloodarsenal.common.BloodArsenal;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class InfusedIronAxe extends ItemAxe implements IBindable {
|
||||
|
||||
private int energyUsed;
|
||||
|
||||
public InfusedIronAxe() {
|
||||
@@ -52,14 +57,8 @@ public class InfusedIronAxe extends ItemAxe implements IBindable {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onBlockDestroyed(
|
||||
ItemStack par1ItemStack,
|
||||
World par2World,
|
||||
Block par3Block,
|
||||
int par4,
|
||||
int par5,
|
||||
int par6,
|
||||
EntityLivingBase par7EntityLivingBase) {
|
||||
public boolean onBlockDestroyed(ItemStack par1ItemStack, World par2World, Block par3Block, int par4, int par5,
|
||||
int par6, EntityLivingBase par7EntityLivingBase) {
|
||||
if (par7EntityLivingBase instanceof EntityPlayer) {
|
||||
EnergyItems.syphonBatteries(par1ItemStack, (EntityPlayer) par7EntityLivingBase, getEnergyUsed());
|
||||
}
|
||||
|
||||
@@ -1,11 +1,7 @@
|
||||
package com.arc.bloodarsenal.common.items.tool;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
|
||||
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
|
||||
import com.arc.bloodarsenal.common.BloodArsenal;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
@@ -14,7 +10,16 @@ import net.minecraft.item.ItemPickaxe;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
|
||||
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
|
||||
|
||||
import com.arc.bloodarsenal.common.BloodArsenal;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class InfusedIronPickaxe extends ItemPickaxe implements IBindable {
|
||||
|
||||
private int energyUsed;
|
||||
|
||||
public InfusedIronPickaxe() {
|
||||
@@ -52,14 +57,8 @@ public class InfusedIronPickaxe extends ItemPickaxe implements IBindable {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onBlockDestroyed(
|
||||
ItemStack par1ItemStack,
|
||||
World par2World,
|
||||
Block par3Block,
|
||||
int par4,
|
||||
int par5,
|
||||
int par6,
|
||||
EntityLivingBase par7EntityLivingBase) {
|
||||
public boolean onBlockDestroyed(ItemStack par1ItemStack, World par2World, Block par3Block, int par4, int par5,
|
||||
int par6, EntityLivingBase par7EntityLivingBase) {
|
||||
if (par7EntityLivingBase instanceof EntityPlayer) {
|
||||
EnergyItems.syphonBatteries(par1ItemStack, (EntityPlayer) par7EntityLivingBase, getEnergyUsed());
|
||||
}
|
||||
|
||||
@@ -1,11 +1,7 @@
|
||||
package com.arc.bloodarsenal.common.items.tool;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
|
||||
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
|
||||
import com.arc.bloodarsenal.common.BloodArsenal;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
@@ -14,7 +10,16 @@ import net.minecraft.item.ItemSpade;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
|
||||
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
|
||||
|
||||
import com.arc.bloodarsenal.common.BloodArsenal;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class InfusedIronShovel extends ItemSpade implements IBindable {
|
||||
|
||||
private int energyUsed;
|
||||
|
||||
public InfusedIronShovel() {
|
||||
@@ -52,14 +57,8 @@ public class InfusedIronShovel extends ItemSpade implements IBindable {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onBlockDestroyed(
|
||||
ItemStack par1ItemStack,
|
||||
World par2World,
|
||||
Block par3Block,
|
||||
int par4,
|
||||
int par5,
|
||||
int par6,
|
||||
EntityLivingBase par7EntityLivingBase) {
|
||||
public boolean onBlockDestroyed(ItemStack par1ItemStack, World par2World, Block par3Block, int par4, int par5,
|
||||
int par6, EntityLivingBase par7EntityLivingBase) {
|
||||
if (par7EntityLivingBase instanceof EntityPlayer) {
|
||||
EnergyItems.syphonBatteries(par1ItemStack, (EntityPlayer) par7EntityLivingBase, getEnergyUsed());
|
||||
}
|
||||
|
||||
Loaded 100 of 136 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user