Merge pull request #627 from blue42u/patch-exoderp

Fixing the Exo-Derp
SlimeKnights · Apr 29, 2014 · 801a514 · 801a514
2 parents 14b9541 + 30576bd
commit 801a514
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/main/java/tconstruct/common/TRecipes.java b/src/main/java/tconstruct/common/TRecipes.java
@@ -656,7 +656,7 @@ protected static void addRecipesForCraftingTable ()
         ItemStack exoChestStack = new ItemStack(TRepo.exoChest);
         ItemStack exoPantsStack = new ItemStack(TRepo.exoPants);
         ItemStack exoShoesStack = new ItemStack(TRepo.exoShoes);
-        if (!PHConstruct.exoCraftingEnabled)
+        if (PHConstruct.exoCraftingEnabled)
         {
             ToolBuilder.instance.addArmorTag(exoGoggleStack);
             ToolBuilder.instance.addArmorTag(exoChestStack);

diff --git a/src/main/java/tconstruct/items/armor/ExoArmor.java b/src/main/java/tconstruct/items/armor/ExoArmor.java
@@ -39,7 +39,8 @@ public void registerIcons (IIconRegister par1IconRegister)
     @Override
     public String getArmorTexture (ItemStack stack, Entity entity, int slot, String layer)
     {
-        return "tinker:textures/armor/" + textureName + "_" + layer + ".png";
+        int suffix = this.armorType == 2 ? 2 : 1;
+        return "tinker:textures/armor/" + textureName + "_" + suffix + ".png";
     }
 
     @Override