Release 2.0.7

- Fixed more typos, including one in the OreDict
- Added salt OreDict for (begrudging) compatibility with HarvestCraft
- Re-added a couple of missing crafting recipes

Author: DarkBumus

src/main/java/darkbum/saltymod/block/BlockApiary.java

@@ -122,7 +122,7 @@ public TileEntity createNewTileEntity(World world, int meta) {
      */
     @Override
     public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase entity, ItemStack stack) {
-        BlockUtils.setBlockDirectionFromEntity(world, x, y, z, entity);
+        setBlockDirectionFromEntity(world, x, y, z, entity);
     }
 
     /**

src/main/java/darkbum/saltymod/block/BlockMill.java

@@ -114,7 +114,7 @@ public IIcon getIcon(int side, int meta) {
      */
     @Override
     public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase entity, ItemStack stack) {
-        BlockUtils.setBlockDirectionFromEntity(world, x, y, z, entity);
+        setBlockDirectionFromEntity(world, x, y, z, entity);
     }
 
     @Override

src/main/java/darkbum/saltymod/event/EntityItemPickupEventHandler.java

@@ -10,6 +10,8 @@
 import static darkbum.saltymod.init.ModAchievementList.*;
 import static darkbum.saltymod.init.ModBlocks.*;
 import static darkbum.saltymod.init.ModItems.*;
+import static darkbum.saltymod.util.AchievementHelper.*;
+import static net.minecraft.item.Item.*;
 
 /**
  * Event handler class for item pickup-related events.
@@ -28,21 +30,13 @@ public void onEntityItemPickup(EntityItemPickupEvent event) {
         if (!world.isRemote) {
             Item pickedItem = event.item.getEntityItem().getItem();
 
-            if (pickedItem == salt) {
-                player.addStat(find_salt, 1);
-            } else if (pickedItem == salt_shard) {
-                player.addStat(find_salt_crystal, 1);
-            } else if (pickedItem == mineral_mud_ball) {
-                player.addStat(find_mineral_mud, 1);
-            } else if (pickedItem == saltwort) {
-                player.addStat(find_saltwort, 1);
-            } else if (pickedItem == dough) {
-                player.addStat(find_dough, 1);
-            } else if (pickedItem == Item.getItemFromBlock(dry_mud_brick)) {
-                player.addStat(find_mud_brick, 1);
-            } else if (pickedItem == onion) {
-                player.addStat(find_onion, 1);
-            }
+            tryAward(player, pickedItem, salt, find_salt);
+            tryAward(player, pickedItem, salt_shard, find_salt_shard);
+            tryAward(player, pickedItem, mineral_mud_ball, find_mineral_mud);
+            tryAward(player, pickedItem, saltwort, find_saltwort);
+            tryAward(player, pickedItem, dough, find_dough);
+            tryAward(player, pickedItem, getItemFromBlock(dry_mud_brick), find_mud_brick);
+            tryAward(player, pickedItem, onion, find_onion);
         }
     }
 }

src/main/java/darkbum/saltymod/init/ModAchievementList.java

@@ -26,7 +26,7 @@ public class ModAchievementList {
 
     public static Achievement find_salt;
     public static Achievement make_rain;
-    public static Achievement find_salt_crystal;
+    public static Achievement find_salt_shard;
     public static Achievement nav_salt_crystal;
     public static Achievement navelse_salt_crystal;
     public static Achievement slime_salt_crystal;
@@ -70,9 +70,9 @@ public static void init() {
             rainmaker,
             find_salt).registerStat();
 
-        find_salt_crystal = new Achievement(
-            "achievement.find_salt_crystal",
-            "find_salt_crystal",
+        find_salt_shard = new Achievement(
+            "achievement.find_salt_shard",
+            "find_salt_shard",
             -4,
             -2,
             iron_pickaxe,
@@ -84,7 +84,7 @@ public static void init() {
             -4,
             -4,
             Items.bone,
-            find_salt_crystal).registerStat();
+            find_salt_shard).registerStat();
 
         navelse_salt_crystal = new Achievement(
             "achievement.navelse_salt_crystal",
@@ -100,15 +100,15 @@ public static void init() {
             -5,
             -3,
             tough_jelly,
-            find_salt_crystal).setSpecial().registerStat();
+            find_salt_shard).setSpecial().registerStat();
 
         witch_salt_crystal = new Achievement(
             "achievement.witch_salt_crystal",
             "witch_salt_crystal",
             -3,
             -3,
             new ItemStack(dev_item, 1, 2),
-            find_salt_crystal).setSpecial().registerStat();
+            find_salt_shard).setSpecial().registerStat();
 
         farm_salt = new Achievement(
             "achievement.farm_salt",
@@ -272,7 +272,7 @@ public static void init() {
 
         list.add(find_salt);
         list.add(make_rain);
-        list.add(find_salt_crystal);
+        list.add(find_salt_shard);
         list.add(nav_salt_crystal);
         list.add(navelse_salt_crystal);
         list.add(slime_salt_crystal);

src/main/java/darkbum/saltymod/init/ModOreDictionary.java

@@ -1,6 +1,5 @@
 package darkbum.saltymod.init;
 
-import darkbum.saltymod.tileentity.TileEntityEvaporator;
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -86,6 +85,7 @@ public static void init() {
         registerOre("itemRoyaljelly", royal_jelly);
         registerOre("itemIngredientBucket", water_bucket);
         registerOre("itemIngredientBucket", milk_bucket);
+        registerOre("itemSalt", salt);
         registerOre("cropOnion", onion);
         registerOre("cropSaltwort", saltwort);