Begin implementing affix mods

7 files changed, 25 insertions, 12 deletions

diff --git a/src/main/java/darkknight/jewelrycraft/effects/AffixMods.java b/src/main/java/darkknight/jewelrycraft/effects/AffixMods.java
new file mode 100644
index 0000000..b9ec06a
--- /dev/null
+++ b/src/main/java/darkknight/jewelrycraft/effects/AffixMods.java
@@ -0,0 +1,13 @@
+package darkknight.jewelrycraft.effects;
+
+import darkknight.jewelrycraft.api.ModifierEffect;
+
+public class AffixMods {
+	public static ModifierEffect getPrefix(String prefix) {
+		return null;
+	}
+	
+	public static ModifierEffect getSuffix(String suffix) {
+		return null;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/darkknight/jewelrycraft/effects/EffectBlazePowder.java b/src/main/java/darkknight/jewelrycraft/effects/EffectBlazePowder.java
index f65d135..ca35754 100755
--- a/src/main/java/darkknight/jewelrycraft/effects/EffectBlazePowder.java
+++ b/src/main/java/darkknight/jewelrycraft/effects/EffectBlazePowder.java
@@ -1,6 +1,6 @@
 package darkknight.jewelrycraft.effects;

 

-import darkknight.jewelrycraft.api.ModifierEffects;

+import darkknight.jewelrycraft.api.ModifierEffect;

 import darkknight.jewelrycraft.item.ItemBracelet;

 import darkknight.jewelrycraft.item.ItemEarrings;

 import darkknight.jewelrycraft.item.ItemNecklace;

@@ -15,7 +15,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.AxisAlignedBB;

 import net.minecraft.util.DamageSource;

 

-public class EffectBlazePowder extends ModifierEffects {

+public class EffectBlazePowder extends ModifierEffect {

 	public EffectBlazePowder() {

 		super(new ItemStack(Items.blaze_powder));

 	}

diff --git a/src/main/java/darkknight/jewelrycraft/effects/EffectEnderEye.java b/src/main/java/darkknight/jewelrycraft/effects/EffectEnderEye.java
index 1f0c325..01c045a 100755
--- a/src/main/java/darkknight/jewelrycraft/effects/EffectEnderEye.java
+++ b/src/main/java/darkknight/jewelrycraft/effects/EffectEnderEye.java
@@ -1,7 +1,7 @@
 package darkknight.jewelrycraft.effects;

 

 import cpw.mods.fml.relauncher.ReflectionHelper;

-import darkknight.jewelrycraft.api.ModifierEffects;

+import darkknight.jewelrycraft.api.ModifierEffect;

 import darkknight.jewelrycraft.item.ItemBracelet;

 import darkknight.jewelrycraft.item.ItemEarrings;

 import darkknight.jewelrycraft.item.ItemNecklace;

@@ -23,7 +23,7 @@ import net.minecraft.util.*;
 import net.minecraft.world.ChunkPosition;

 import net.minecraft.world.biome.BiomeGenBase;

 

-public class EffectEnderEye extends ModifierEffects {

+public class EffectEnderEye extends ModifierEffect {

 	public EffectEnderEye() {

 		super(new ItemStack(Items.ender_eye));

 	}

diff --git a/src/main/java/darkknight/jewelrycraft/effects/EffectEnderPearl.java b/src/main/java/darkknight/jewelrycraft/effects/EffectEnderPearl.java
index 7722484..fca9fe0 100755
--- a/src/main/java/darkknight/jewelrycraft/effects/EffectEnderPearl.java
+++ b/src/main/java/darkknight/jewelrycraft/effects/EffectEnderPearl.java
@@ -3,7 +3,7 @@ package darkknight.jewelrycraft.effects;
 import java.util.Iterator;

 import java.util.List;

 

-import darkknight.jewelrycraft.api.ModifierEffects;

+import darkknight.jewelrycraft.api.ModifierEffect;

 import darkknight.jewelrycraft.item.ItemBracelet;

 import darkknight.jewelrycraft.item.ItemEarrings;

 import darkknight.jewelrycraft.item.ItemNecklace;

@@ -21,7 +21,7 @@ import net.minecraft.potion.PotionEffect;
 import net.minecraft.util.AxisAlignedBB;

 import net.minecraft.util.DamageSource;

 

-public class EffectEnderPearl extends ModifierEffects {

+public class EffectEnderPearl extends ModifierEffect {

 	public EffectEnderPearl() {

 		super(new ItemStack(Items.ender_pearl));

 	}

diff --git a/src/main/java/darkknight/jewelrycraft/effects/EffectFeather.java b/src/main/java/darkknight/jewelrycraft/effects/EffectFeather.java
index 42df76f..14953e6 100755
--- a/src/main/java/darkknight/jewelrycraft/effects/EffectFeather.java
+++ b/src/main/java/darkknight/jewelrycraft/effects/EffectFeather.java
@@ -3,7 +3,7 @@ package darkknight.jewelrycraft.effects;
 import java.util.Iterator;

 import java.util.List;

 

-import darkknight.jewelrycraft.api.ModifierEffects;

+import darkknight.jewelrycraft.api.ModifierEffect;

 import darkknight.jewelrycraft.damage.DamageSourceList;

 import darkknight.jewelrycraft.item.ItemBracelet;

 import darkknight.jewelrycraft.item.ItemEarrings;

@@ -24,7 +24,7 @@ import net.minecraft.potion.Potion;
 import net.minecraft.potion.PotionEffect;

 import net.minecraft.util.*;

 

-public class EffectFeather extends ModifierEffects {

+public class EffectFeather extends ModifierEffect {

 	public EffectFeather() {

 		super(new ItemStack(Items.feather));

 	}

diff --git a/src/main/java/darkknight/jewelrycraft/effects/EffectObsidian.java b/src/main/java/darkknight/jewelrycraft/effects/EffectObsidian.java
index 95f52b5..0d561e0 100755
--- a/src/main/java/darkknight/jewelrycraft/effects/EffectObsidian.java
+++ b/src/main/java/darkknight/jewelrycraft/effects/EffectObsidian.java
@@ -1,6 +1,6 @@
 package darkknight.jewelrycraft.effects;

 

-import darkknight.jewelrycraft.api.ModifierEffects;

+import darkknight.jewelrycraft.api.ModifierEffect;

 import darkknight.jewelrycraft.damage.DamageSourceList;

 import darkknight.jewelrycraft.item.ItemBracelet;

 import darkknight.jewelrycraft.item.ItemEarrings;

@@ -19,7 +19,7 @@ import net.minecraft.potion.Potion;
 import net.minecraft.potion.PotionEffect;

 import net.minecraft.util.DamageSource;

 

-public class EffectObsidian extends ModifierEffects {

+public class EffectObsidian extends ModifierEffect {

 	public EffectObsidian() {

 		super(new ItemStack(Blocks.obsidian));

 	}

diff --git a/src/main/java/darkknight/jewelrycraft/effects/EffectsList.java b/src/main/java/darkknight/jewelrycraft/effects/EffectsList.java
index 06498f4..186a3bf 100755
--- a/src/main/java/darkknight/jewelrycraft/effects/EffectsList.java
+++ b/src/main/java/darkknight/jewelrycraft/effects/EffectsList.java
@@ -1,10 +1,10 @@
 package darkknight.jewelrycraft.effects;

 

 import cpw.mods.fml.common.event.FMLPostInitializationEvent;

-import darkknight.jewelrycraft.api.ModifierEffects;

+import darkknight.jewelrycraft.api.ModifierEffect;

 

 public class EffectsList {

-	public static ModifierEffects blazePowder, enderEye, feather, enderPearl, obsidian;

+	public static ModifierEffect blazePowder, enderEye, feather, enderPearl, obsidian;

 

 	public static void postInit(FMLPostInitializationEvent e) {

 		blazePowder = new EffectBlazePowder();