diff --git a/README.md b/README.md index 6f420f75db..a5eb98d636 100644 --- a/README.md +++ b/README.md @@ -1,27 +1 @@ - - -[![CurseForge downloads](http://cf.way2muchnoise.eu/full_264231_downloads.svg)](https://www.curseforge.com/minecraft/mc-mods/ice-and-fire-dragons) - -# Ice and Fire - -Ice and Fire is a minecraft mod created by Raptorfarian and Alexthe666 which adds various mythical creatures like dragons, hypogriffs, faries and many more to the game! - -## Reporting issues -If you encounter any bugs or problems with the mod you can open an issue [here](https://github.com/Alex-the-666/Ice_and_Fire/issues). -**Please make sure that the issue you are encountering hasn't been reported yet.** -You can do this by using the search tool. - -Make sure to carefully read and follow the issue template. Issues that are duplicates or don't contain the necessary information to triage and debug it may be closed. -### **Please post your suggestions over [here](https://github.com/Alex-the-666/Ice-and-Fire-Suggestions/issues)** - -## Community -[![Discord chat](https://img.shields.io/badge/chat%20on-discord-7289DA?logo=discord&logoColor=white)](https://discord.gg/WfumvTg) - -We have an official Ice and Fire [discord community](https://discord.gg/WfumvTg). By joining you can: -- Be notified whenever a new version of the mod get's released -- Find servers that have ice and Fire installed -- Get help if you have any issues -- ... and much more! -# FAQ -Please take a look at the wiki pages on [fandom](https://ice-and-fire-mod.fandom.com/wiki/Frequently_asked_questions) and [github](https://github.com/Alex-the-666/Ice_and_Fire/wiki) - +It's just a simple fix for some armor values ​​that are incorrect. diff --git a/src/main/java/com/github/alexthe666/iceandfire/enums/EnumDragonArmor.java b/src/main/java/com/github/alexthe666/iceandfire/enums/EnumDragonArmor.java index 0168667b15..99fa3bba37 100644 --- a/src/main/java/com/github/alexthe666/iceandfire/enums/EnumDragonArmor.java +++ b/src/main/java/com/github/alexthe666/iceandfire/enums/EnumDragonArmor.java @@ -40,7 +40,7 @@ public enum EnumDragonArmor { public static void initArmors() { for (int i = 0; i < EnumDragonArmor.values().length; i++) { - EnumDragonArmor.values()[i].armorMaterial = new IafArmorMaterial("iceandfire:armor_dragon_scales" + (i + 1), 36, new int[]{5, 7, 9, 5}, 15, SoundEvents.ARMOR_EQUIP_CHAIN, 2); + EnumDragonArmor.values()[i].armorMaterial = new IafArmorMaterial("iceandfire:armor_dragon_scales" + (i + 1), 36, new int[]{5, 9, 7, 5}, 15, SoundEvents.ARMOR_EQUIP_CHAIN, 2); String sub = EnumDragonArmor.values()[i].name(); int finalI = i; diff --git a/src/main/java/com/github/alexthe666/iceandfire/item/IafItemRegistry.java b/src/main/java/com/github/alexthe666/iceandfire/item/IafItemRegistry.java index f0dba0652e..5d4122afec 100644 --- a/src/main/java/com/github/alexthe666/iceandfire/item/IafItemRegistry.java +++ b/src/main/java/com/github/alexthe666/iceandfire/item/IafItemRegistry.java @@ -28,19 +28,19 @@ @Mod.EventBusSubscriber(modid = IceAndFire.MODID, bus = Mod.EventBusSubscriber.Bus.MOD) public class IafItemRegistry { - public static CustomArmorMaterial SILVER_ARMOR_MATERIAL = new IafArmorMaterial("silver", 15, new int[]{1, 4, 5, 2}, 20, SoundEvents.ARMOR_EQUIP_CHAIN, 0); - public static CustomArmorMaterial COPPER_ARMOR_MATERIAL = new IafArmorMaterial("copper", 10, new int[]{1, 3, 4, 2}, 15, SoundEvents.ARMOR_EQUIP_GOLD, 0); + public static CustomArmorMaterial SILVER_ARMOR_MATERIAL = new IafArmorMaterial("silver", 15, new int[]{1, 5, 4, 2}, 20, SoundEvents.ARMOR_EQUIP_CHAIN, 0); + public static CustomArmorMaterial COPPER_ARMOR_MATERIAL = new IafArmorMaterial("copper", 10, new int[]{1, 4, 3, 2}, 15, SoundEvents.ARMOR_EQUIP_GOLD, 0); public static CustomArmorMaterial BLINDFOLD_ARMOR_MATERIAL = new IafArmorMaterial("blindfold", 5, new int[]{1, 1, 1, 1}, 10, SoundEvents.ARMOR_EQUIP_LEATHER, 0); public static CustomArmorMaterial SHEEP_ARMOR_MATERIAL = new IafArmorMaterial("sheep", 5, new int[]{1, 3, 2, 1}, 15, SoundEvents.ARMOR_EQUIP_LEATHER, 0); - public static CustomArmorMaterial MYRMEX_DESERT_ARMOR_MATERIAL = new IafArmorMaterial("myrmexdesert", 20, new int[]{3, 5, 8, 4}, 15, SoundEvents.ARMOR_EQUIP_LEATHER, 0); - public static CustomArmorMaterial MYRMEX_JUNGLE_ARMOR_MATERIAL = new IafArmorMaterial("myrmexjungle", 20, new int[]{3, 5, 8, 4}, 15, SoundEvents.ARMOR_EQUIP_LEATHER, 0); + public static CustomArmorMaterial MYRMEX_DESERT_ARMOR_MATERIAL = new IafArmorMaterial("myrmexdesert", 20, new int[]{3, 8, 5, 4}, 15, SoundEvents.ARMOR_EQUIP_LEATHER, 0); + public static CustomArmorMaterial MYRMEX_JUNGLE_ARMOR_MATERIAL = new IafArmorMaterial("myrmexjungle", 20, new int[]{3, 8, 5, 4}, 15, SoundEvents.ARMOR_EQUIP_LEATHER, 0); public static CustomArmorMaterial EARPLUGS_ARMOR_MATERIAL = new IafArmorMaterial("earplugs", 5, new int[]{1, 1, 1, 1}, 10, SoundEvents.ARMOR_EQUIP_LEATHER, 0); - public static CustomArmorMaterial DEATHWORM_0_ARMOR_MATERIAL = new IafArmorMaterial("yellow seathworm", 15, new int[]{2, 5, 7, 3}, 5, SoundEvents.ARMOR_EQUIP_LEATHER, 1.5F); - public static CustomArmorMaterial DEATHWORM_1_ARMOR_MATERIAL = new IafArmorMaterial("white seathworm", 15, new int[]{2, 5, 7, 3}, 5, SoundEvents.ARMOR_EQUIP_LEATHER, 1.5F); - public static CustomArmorMaterial DEATHWORM_2_ARMOR_MATERIAL = new IafArmorMaterial("red deathworm", 15, new int[]{2, 5, 7, 3}, 5, SoundEvents.ARMOR_EQUIP_LEATHER, 1.5F); - public static CustomArmorMaterial TROLL_MOUNTAIN_ARMOR_MATERIAL = new IafArmorMaterial("mountain troll", 20, new int[]{2, 5, 7, 3}, 10, SoundEvents.ARMOR_EQUIP_LEATHER, 1F); - public static CustomArmorMaterial TROLL_FOREST_ARMOR_MATERIAL = new IafArmorMaterial("forest troll", 20, new int[]{2, 5, 7, 3}, 10, SoundEvents.ARMOR_EQUIP_LEATHER, 1F); - public static CustomArmorMaterial TROLL_FROST_ARMOR_MATERIAL = new IafArmorMaterial("frost troll", 20, new int[]{2, 5, 7, 3}, 10, SoundEvents.ARMOR_EQUIP_LEATHER, 1F); + public static CustomArmorMaterial DEATHWORM_0_ARMOR_MATERIAL = new IafArmorMaterial("yellow seathworm", 15, new int[]{2, 7, 5, 3}, 5, SoundEvents.ARMOR_EQUIP_LEATHER, 1.5F); + public static CustomArmorMaterial DEATHWORM_1_ARMOR_MATERIAL = new IafArmorMaterial("white seathworm", 15, new int[]{2, 7, 5, 3}, 5, SoundEvents.ARMOR_EQUIP_LEATHER, 1.5F); + public static CustomArmorMaterial DEATHWORM_2_ARMOR_MATERIAL = new IafArmorMaterial("red deathworm", 15, new int[]{2, 7, 5, 3}, 5, SoundEvents.ARMOR_EQUIP_LEATHER, 1.5F); + public static CustomArmorMaterial TROLL_MOUNTAIN_ARMOR_MATERIAL = new IafArmorMaterial("mountain troll", 20, new int[]{2, 7, 5, 3}, 10, SoundEvents.ARMOR_EQUIP_LEATHER, 1F); + public static CustomArmorMaterial TROLL_FOREST_ARMOR_MATERIAL = new IafArmorMaterial("forest troll", 20, new int[]{2, 7, 5, 3}, 10, SoundEvents.ARMOR_EQUIP_LEATHER, 1F); + public static CustomArmorMaterial TROLL_FROST_ARMOR_MATERIAL = new IafArmorMaterial("frost troll", 20, new int[]{2, 7, 5, 3}, 10, SoundEvents.ARMOR_EQUIP_LEATHER, 1F); public static CustomArmorMaterial DRAGONSTEEL_FIRE_ARMOR_MATERIAL = new DragonsteelArmorMaterial("dragonsteel_fire", (int) (0.02D * IafConfig.dragonsteelBaseDurabilityEquipment), new int[]{IafConfig.dragonsteelBaseArmor - 6, IafConfig.dragonsteelBaseArmor - 3, IafConfig.dragonsteelBaseArmor, IafConfig.dragonsteelBaseArmor - 5}, 30, SoundEvents.ARMOR_EQUIP_DIAMOND, IafConfig.dragonsteelBaseArmorToughness); public static CustomArmorMaterial DRAGONSTEEL_ICE_ARMOR_MATERIAL = new DragonsteelArmorMaterial("dragonsteel_ice", (int) (0.02D * IafConfig.dragonsteelBaseDurabilityEquipment), new int[]{IafConfig.dragonsteelBaseArmor - 6, IafConfig.dragonsteelBaseArmor - 3, IafConfig.dragonsteelBaseArmor, IafConfig.dragonsteelBaseArmor - 5}, 30, SoundEvents.ARMOR_EQUIP_DIAMOND, IafConfig.dragonsteelBaseArmorToughness); public static CustomArmorMaterial DRAGONSTEEL_LIGHTNING_ARMOR_MATERIAL = new DragonsteelArmorMaterial("dragonsteel_lightning", (int) (0.02D * IafConfig.dragonsteelBaseDurabilityEquipment), new int[]{IafConfig.dragonsteelBaseArmor - 6, IafConfig.dragonsteelBaseArmor - 3, IafConfig.dragonsteelBaseArmor, IafConfig.dragonsteelBaseArmor - 5}, 30, SoundEvents.ARMOR_EQUIP_DIAMOND, IafConfig.dragonsteelBaseArmorToughness);