From 4f69a026984098eeef3df028f3257432d796bb96 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Mon, 30 May 2016 23:55:16 +0200 Subject: [PATCH] Update forge and fix addArmorMaterial. Closes #101 --- build.gradle | 2 +- .../mod/material/InitArmorMaterials.java | 6 +++--- .../ellpeck/actuallyadditions/mod/util/Util.java | 14 +++++++------- .../entity/shield/additionalbanners_apple.png | Bin 0 -> 3000 bytes 4 files changed, 11 insertions(+), 11 deletions(-) create mode 100644 src/main/resources/assets/minecraft/textures/entity/shield/additionalbanners_apple.png diff --git a/build.gradle b/build.gradle index fe799456b..dad62d983 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ group = "de.ellpeck.actuallyadditions" archivesBaseName = "ActuallyAdditions" minecraft { - version = "1.9.4-12.17.0.1909-1.9.4" + version = "1.9.4-12.17.0.1936-1.9.4" runDir = "idea" mappings = "snapshot_20160519" diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/material/InitArmorMaterials.java b/src/main/java/de/ellpeck/actuallyadditions/mod/material/InitArmorMaterials.java index d297251bc..97ca8781d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/material/InitArmorMaterials.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/material/InitArmorMaterials.java @@ -16,6 +16,8 @@ import net.minecraft.item.ItemArmor.ArmorMaterial; import net.minecraft.util.SoundEvent; import net.minecraftforge.common.util.EnumHelper; +import java.util.Locale; + public class InitArmorMaterials{ public static ArmorMaterial armorMaterialEmerald; @@ -45,8 +47,6 @@ public class InitArmorMaterials{ } private static ArmorMaterial addArmorMaterial(String name, String textureName, int durability, int[] reductionAmounts, int enchantability, SoundEvent soundOnEquip){ - //TODO Fuck forge because this broke - //return EnumHelper.addArmorMaterial((ModUtil.MOD_ID+"_"+name).toUpperCase(Locale.ROOT), textureName, durability, reductionAmounts, enchantability, soundOnEquip); - return EnumHelper.addEnum(ArmorMaterial.class, name, new Class[]{String.class, int.class, int[].class, int.class, SoundEvent.class, float.class}, textureName, durability, reductionAmounts, enchantability, soundOnEquip, 0F); + return EnumHelper.addArmorMaterial((ModUtil.MOD_ID+"_"+name).toUpperCase(Locale.ROOT), textureName, durability, reductionAmounts, enchantability, soundOnEquip, 0F); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/Util.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/Util.java index fef3fd90e..34698494b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/Util.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/Util.java @@ -28,14 +28,14 @@ public class Util{ @SuppressWarnings("deprecation") public static final int BUCKET = FluidContainerRegistry.BUCKET_VOLUME; - public static final EnumRarity CRYSTAL_RED_RARITY = addRarity(ModUtil.MOD_ID+"crystalRed", TextFormatting.DARK_RED, ModUtil.NAME+" Red Crystal"); - public static final EnumRarity CRYSTAL_BLUE_RARITY = addRarity(ModUtil.MOD_ID+"crystalBlue", TextFormatting.DARK_BLUE, ModUtil.NAME+" Blue Crystal"); - public static final EnumRarity CRYSTAL_LIGHT_BLUE_RARITY = addRarity(ModUtil.MOD_ID+"crystalLightBlue", TextFormatting.BLUE, ModUtil.NAME+" Light Blue Crystal"); - public static final EnumRarity CRYSTAL_BLACK_RARITY = addRarity(ModUtil.MOD_ID+"crystalBlack", TextFormatting.DARK_GRAY, ModUtil.NAME+" Black Crystal"); - public static final EnumRarity CRYSTAL_GREEN_RARITY = addRarity(ModUtil.MOD_ID+"crystalGreen", TextFormatting.DARK_GREEN, ModUtil.NAME+" Green Crystal"); - public static final EnumRarity CRYSTAL_WHITE_RARITY = addRarity(ModUtil.MOD_ID+"crystalWhite", TextFormatting.GRAY, ModUtil.NAME+" White Crystal"); + public static final EnumRarity CRYSTAL_RED_RARITY = addRarity("crystalRed", TextFormatting.DARK_RED, ModUtil.NAME+" Red Crystal"); + public static final EnumRarity CRYSTAL_BLUE_RARITY = addRarity("crystalBlue", TextFormatting.DARK_BLUE, ModUtil.NAME+" Blue Crystal"); + public static final EnumRarity CRYSTAL_LIGHT_BLUE_RARITY = addRarity("crystalLightBlue", TextFormatting.BLUE, ModUtil.NAME+" Light Blue Crystal"); + public static final EnumRarity CRYSTAL_BLACK_RARITY = addRarity("crystalBlack", TextFormatting.DARK_GRAY, ModUtil.NAME+" Black Crystal"); + public static final EnumRarity CRYSTAL_GREEN_RARITY = addRarity("crystalGreen", TextFormatting.DARK_GREEN, ModUtil.NAME+" Green Crystal"); + public static final EnumRarity CRYSTAL_WHITE_RARITY = addRarity("crystalWhite", TextFormatting.GRAY, ModUtil.NAME+" White Crystal"); - public static final EnumRarity FALLBACK_RARITY = EnumHelper.addRarity(ModUtil.MOD_ID+".fallback", TextFormatting.STRIKETHROUGH, ModUtil.NAME+" Fallback"); + public static final EnumRarity FALLBACK_RARITY = addRarity("fallback", TextFormatting.STRIKETHROUGH, ModUtil.NAME+" Fallback"); public static void registerEvent(Object o){ MinecraftForge.EVENT_BUS.register(o); diff --git a/src/main/resources/assets/minecraft/textures/entity/shield/additionalbanners_apple.png b/src/main/resources/assets/minecraft/textures/entity/shield/additionalbanners_apple.png new file mode 100644 index 0000000000000000000000000000000000000000..0700393800a84567736fcc18f6c409271e9d29f2 GIT binary patch literal 3000 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 bWHKdKbM1A**hZblMF30;EcI(4ZcqLP+QWTQ literal 0 HcmV?d00001