More affix work

2 files changed, 25 insertions, 2 deletions

diff --git a/src/main/java/darkknight/jewelrycraft/random/WeightedRandomAffix.java b/src/main/java/darkknight/jewelrycraft/random/WeightedRandomAffix.java
new file mode 100644
index 0000000..e0ddaed
--- /dev/null
+++ b/src/main/java/darkknight/jewelrycraft/random/WeightedRandomAffix.java
@@ -0,0 +1,18 @@
+package darkknight.jewelrycraft.random;
+
+import java.util.Random;
+
+import net.minecraft.util.WeightedRandom.Item;
+
+public class WeightedRandomAffix extends Item {
+	private final String affix;
+
+	public WeightedRandomAffix(String affix, int weight) {
+		super(weight);
+		this.affix = affix;
+	}
+
+	public String getAffix(Random random) {
+		return affix;
+	}
+}
diff --git a/src/main/java/darkknight/jewelrycraft/random/WeightedRandomItem.java b/src/main/java/darkknight/jewelrycraft/random/WeightedRandomItem.java
index 351046b..dba4caa 100755
--- a/src/main/java/darkknight/jewelrycraft/random/WeightedRandomItem.java
+++ b/src/main/java/darkknight/jewelrycraft/random/WeightedRandomItem.java
@@ -51,10 +51,15 @@ public class WeightedRandomItem extends WeightedRandom.Item {
 

 	public ItemStack getItem(Random random) {

 		ItemStack itemstack = this.item.copy();

-		if (maxMeta > 0)

+		

+		if (maxMeta > 0) {

 			itemstack.setItemDamage(minMeta + random.nextInt(maxMeta - minMeta));

-		if (maxItem > 1)

+		}

+		

+		if (maxItem > 1) {

 			itemstack.stackSize = this.minItem + random.nextInt(this.maxItem - this.minItem + 1);

+		}

+		

 		return itemstack;

 	}

 }
\ No newline at end of file