upstream/MinecraftForge
1
0 Fork 0
mirror of https://github.com/MinecraftForge/MinecraftForge.git synced 2026-11-12 16:27:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2544 from Vazkii/patch-1

Browse Source 
1.9: Fixed registering armor materials through EnumHelper exploding
This commit is contained in:
LexManos committed 2016-03-15 12:41:27 -07:00
2 parents ae72fa7ceb 05801a74af
commit 2bdb614fda
1 file changed
+5 -4
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/net/minecraftforge/common/util/EnumHelper.java
+5 -4
View File
@@ -15,6 +15,7 @@ import net.minecraft.item.EnumAction;
import net.minecraft.item.EnumRarity;
import net.minecraft.item.Item.ToolMaterial;
import net.minecraft.item.ItemArmor.ArmorMaterial;
import net.minecraft.util.SoundEvent;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.util.text.TextFormatting;
import net.minecraft.world.EnumSkyBlock;
@@ -35,7 +36,7 @@ public class EnumHelper
private static Class[][] commonTypes =
{
{EnumAction.class},
{ArmorMaterial.class, String.class, int.class, int[].class, int.class},
{ArmorMaterial.class, String.class, int.class, int[].class, int.class, SoundEvent.class},
{EnumArt.class, String.class, int.class, int.class, int.class, int.class},
{EnumCreatureAttribute.class},
{EnumCreatureType.class, Class.class, int.class, Material.class, boolean.class, boolean.class},
@@ -53,9 +54,9 @@ public class EnumHelper
{
return addEnum(EnumAction.class, name);
}
public static ArmorMaterial addArmorMaterial(String name, String textureName, int durability, int[] reductionAmounts, int enchantability)
public static ArmorMaterial addArmorMaterial(String name, String textureName, int durability, int[] reductionAmounts, int enchantability, SoundEvent soundOnEquip)
{
return addEnum(ArmorMaterial.class, name, textureName, durability, reductionAmounts, enchantability);
return addEnum(ArmorMaterial.class, name, textureName, durability, reductionAmounts, enchantability, soundOnEquip);
}
public static EnumArt addArt(String name, String tile, int sizeX, int sizeY, int offsetX, int offsetY)
{
@@ -281,4 +282,4 @@ public class EnumHelper
setup();
}
}
}
}