Working api + hoping to fix jenkins build + trying to make blocks shiny

5 files changed, 4 insertions, 85 deletions

diff --git a/src/main/java/darkknight/jewelrycraft/effects/EffectBlazePowder.java b/src/main/java/darkknight/jewelrycraft/effects/EffectBlazePowder.java
index fdcdd3b..1ddc364 100644
--- a/src/main/java/darkknight/jewelrycraft/effects/EffectBlazePowder.java
+++ b/src/main/java/darkknight/jewelrycraft/effects/EffectBlazePowder.java
@@ -9,6 +9,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.util.DamageSource;
+import darkknight.jewelrycraft.api.ModifierEffects;
 import darkknight.jewelrycraft.item.ItemBracelet;
 import darkknight.jewelrycraft.item.ItemEarrings;
 import darkknight.jewelrycraft.item.ItemNecklace;
diff --git a/src/main/java/darkknight/jewelrycraft/effects/EffectEnderEye.java b/src/main/java/darkknight/jewelrycraft/effects/EffectEnderEye.java
index 4c36593..39a1613 100644
--- a/src/main/java/darkknight/jewelrycraft/effects/EffectEnderEye.java
+++ b/src/main/java/darkknight/jewelrycraft/effects/EffectEnderEye.java
@@ -17,6 +17,7 @@ import net.minecraft.util.Vec3;
 import net.minecraft.world.ChunkPosition;
 import net.minecraft.world.biome.BiomeGenBase;
 import cpw.mods.fml.relauncher.ReflectionHelper;
+import darkknight.jewelrycraft.api.ModifierEffects;
 import darkknight.jewelrycraft.item.ItemBracelet;
 import darkknight.jewelrycraft.item.ItemEarrings;
 import darkknight.jewelrycraft.item.ItemNecklace;
diff --git a/src/main/java/darkknight/jewelrycraft/effects/EffectFeather.java b/src/main/java/darkknight/jewelrycraft/effects/EffectFeather.java
index 512a25b..3a68957 100644
--- a/src/main/java/darkknight/jewelrycraft/effects/EffectFeather.java
+++ b/src/main/java/darkknight/jewelrycraft/effects/EffectFeather.java
@@ -16,6 +16,7 @@ import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.util.ChatComponentText;
 import net.minecraft.util.DamageSource;
 import net.minecraft.util.EnumChatFormatting;
+import darkknight.jewelrycraft.api.ModifierEffects;
 import darkknight.jewelrycraft.damage.DamageSourceList;
 import darkknight.jewelrycraft.item.ItemBracelet;
 import darkknight.jewelrycraft.item.ItemEarrings;
diff --git a/src/main/java/darkknight/jewelrycraft/effects/EffectsList.java b/src/main/java/darkknight/jewelrycraft/effects/EffectsList.java
index 13abc48..b30fa0c 100644
--- a/src/main/java/darkknight/jewelrycraft/effects/EffectsList.java
+++ b/src/main/java/darkknight/jewelrycraft/effects/EffectsList.java
@@ -1,6 +1,7 @@
 package darkknight.jewelrycraft.effects;
 
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;
+import darkknight.jewelrycraft.api.ModifierEffects;
 
 public class EffectsList
 {
diff --git a/src/main/java/darkknight/jewelrycraft/effects/ModifierEffects.java b/src/main/java/darkknight/jewelrycraft/effects/ModifierEffects.java
deleted file mode 100644
index d3c8e38..0000000
--- a/src/main/java/darkknight/jewelrycraft/effects/ModifierEffects.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package darkknight.jewelrycraft.effects;
-
-import java.util.ArrayList;
-import java.util.Random;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.DamageSource;
-
-public class ModifierEffects
-{
-    protected ItemStack modifier;
-    protected Random rand = new Random();
-    protected static ArrayList<ModifierEffects> effects = new ArrayList<ModifierEffects>();
-    
-    /**
-     * @param modifier
-     */
-    public ModifierEffects(ItemStack modifier)
-    {
-        this.modifier = modifier;
-        effects.add(this);
-    }
-    
-    /**
-     * @return
-     */
-    public static ArrayList<ModifierEffects> getEffects()
-    {
-        return effects;
-    }
-    
-    /**
-     * @param item
-     * @param player
-     * @param jewelry
-     */
-    public void action(ItemStack item, EntityPlayer player, Item jewelry)
-    {};
-    
-    /**
-     * @param item
-     * @param player
-     * @param target
-     * @param jewelry
-     * @return
-     */
-    public boolean onEntityAttackedCacellable(ItemStack item, EntityPlayer player, Entity target, Item jewelry, float amount)
-    {
-        return false;
-    }
-    
-    /**
-     * @param item
-     * @param player
-     * @param source
-     * @param jewelry
-     * @return
-     */
-    public boolean onPlayerAttackedCacellable(ItemStack item, EntityPlayer player, DamageSource source, Item jewelry, float amount)
-    {
-        return false;
-    }
-    
-    /**
-     * @param item
-     * @param player
-     * @param target
-     * @param jewelry
-     * @return
-     */
-    public void onEntityAttacked(ItemStack item, EntityPlayer player, Entity target, Item jewelry, float amount)
-    {}
-    
-    /**
-     * @param item
-     * @param player
-     * @param source
-     * @param jewelry
-     * @return
-     */
-    public void onPlayerAttacked(ItemStack item, EntityPlayer player, DamageSource source, Item jewelry, float amount)
-    {}
-}