Ported to 1.7

2014-02-08 19:34:52 -06:00
parent 30c1deb8cf
commit d50c7f6312
328 changed files with 2209 additions and 2311 deletions
@@ -3,7 +3,7 @@ package appeng.helpers;
 import java.util.Random;

 import net.minecraft.entity.passive.EntityVillager;
-import net.minecraft.item.Item;
+import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import net.minecraft.village.MerchantRecipe;
 import net.minecraft.village.MerchantRecipeList;
@@ -44,7 +44,7 @@ public class AETrading implements IVillageTradeHandler
 	{
 		// Sell
 		ItemStack From = item.copy();
-		ItemStack To = new ItemStack( Item.emerald );
+		ItemStack To = new ItemStack( Items.emerald );

 		int multiplier = (Math.abs( rand.nextInt() ) % 6);
 		emera += (Math.abs( rand.nextInt() ) % greed) - multiplier;