diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/ModItems.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/ModItems.java index 7a384cf5..3ea2a521 100644 --- a/src/main/java/com/fouristhenumber/utilitiesinexcess/ModItems.java +++ b/src/main/java/com/fouristhenumber/utilitiesinexcess/ModItems.java @@ -51,7 +51,11 @@ public enum ModItems { PRECISION_SHEARS(PrecisionShearsConfig.enable, new ItemPrecisionShears(), "precision_shears"), ETHERIC_SWORD(EthericSwordConfig.enable, new ItemEthericSword(), "etheric_sword"), REVERSING_HOE(ReversingHoeConfig.enable, new ItemReversingHoe(), "reversing_hoe"), - HEAVENLY_RING(ItemConfig.enableHeavenlyRing, new ItemHeavenlyRing(), "heavenly_ring"), + HEAVENLY_RING_FEATHER(ItemConfig.enableHeavenlyRing, new ItemHeavenlyRing("feather", 8), "heavenly_ring_feather"), + HEAVENLY_RING_DRAGON(ItemConfig.enableHeavenlyRing, new ItemHeavenlyRing("dragon", 8), "heavenly_ring_dragon"), + HEAVENLY_RING_FAIRY(ItemConfig.enableHeavenlyRing, new ItemHeavenlyRing("fairy", 8), "heavenly_ring_fairy"), + HEAVENLY_RING_METAL(ItemConfig.enableHeavenlyRing, new ItemHeavenlyRing("metal", 8), "heavenly_ring_metal"), + HEAVENLY_RING_MAGIC(ItemConfig.enableHeavenlyRing, new ItemHeavenlyRing("magic", 8), "heavenly_ring_magic"), MOB_JAR(ItemConfig.enableMobJar, new ItemMobJar(), "mob_jar"), WATERING_CAN_BASIC(WateringCanConfig.wateringCan.Tier.enableWateringCanBasic, new ItemWateringCan(1,3), "watering_can_basic"), WATERING_CAN_ADVANCED(WateringCanConfig.wateringCan.Tier.enableWateringCanAdvanced, new ItemWateringCan(2,5), "watering_can_advanced"), diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/client/IMCForNEI.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/client/IMCForNEI.java index 27bd9e02..e92777c3 100644 --- a/src/main/java/com/fouristhenumber/utilitiesinexcess/client/IMCForNEI.java +++ b/src/main/java/com/fouristhenumber/utilitiesinexcess/client/IMCForNEI.java @@ -98,9 +98,13 @@ public static void IMCSender() { "nei.infopage.uie.watering_can.1"); if (Mods.Baubles.isLoaded()) { - sendInfoPage("", "nei.infopage.uie.heavenly_ring.2"); + sendInfoPage( + ",,,,", + "nei.infopage.uie.heavenly_ring.2"); } else { - sendInfoPage("", "nei.infopage.uie.heavenly_ring.1"); + sendInfoPage( + ",,,,", + "nei.infopage.uie.heavenly_ring.1"); } sendInfoPage("", "nei.infopage.uie.trash_can_item.1"); diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/ItemHeavenlyRing.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/ItemHeavenlyRing.java index 95e731ac..a5305c72 100644 --- a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/ItemHeavenlyRing.java +++ b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/ItemHeavenlyRing.java @@ -5,14 +5,15 @@ import java.util.Map; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; +import net.minecraft.world.World; import net.minecraftforge.client.event.RenderPlayerEvent; import net.minecraftforge.common.util.FakePlayer; @@ -33,48 +34,56 @@ @Optional.Interface(iface = "baubles.api.IBauble", modid = "Baubles") public class ItemHeavenlyRing extends Item implements IBauble { - private static final int RING_COUNT = 5; + private final int RING_COUNT; + private final String SUFFIX; - private static IIcon[] itemIcons = new IIcon[RING_COUNT]; - public static IIcon[] wingIcons = new IIcon[RING_COUNT]; + public final IIcon[] wingIcons; - public ItemHeavenlyRing() { - setTextureName("utilitiesinexcess:heavenly_ring"); - setUnlocalizedName("heavenly_ring"); + public ItemHeavenlyRing(String suffix, int variants) { + RING_COUNT = variants; + SUFFIX = suffix; + + wingIcons = new IIcon[RING_COUNT]; + + setTextureName("utilitiesinexcess:heavenly_ring_" + suffix); + setUnlocalizedName("heavenly_ring_" + suffix); setMaxDamage(0); setHasSubtypes(true); setMaxStackSize(1); } @Override - @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs tab, List itemList) { - for (int i = 0; i < RING_COUNT; ++i) { - itemList.add(new ItemStack(item, 1, i)); + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + int meta = stack.getItemDamage(); + if (meta == RING_COUNT - 1) { + stack.setItemDamage(0); + } else { + stack.setItemDamage(meta + 1); } + if (world.isRemote) { + player.addChatMessage( + new ChatComponentTranslation( + "chat.heavenly_ring_modify", + StatCollector.translateToLocal("item.heavenly_ring_" + SUFFIX + ".type." + stack.getItemDamage()))); + } + return super.onItemRightClick(stack, world, player); } @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister register) { for (int i = 0; i < RING_COUNT; ++i) { - itemIcons[i] = register.registerIcon(this.getIconString() + "." + i); wingIcons[i] = register.registerIcon(this.getIconString() + ".wing." + i); } - this.itemIcon = itemIcons[0]; - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIconFromDamage(int meta) { - return itemIcons[meta]; + super.registerIcons(register); } @Override public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean p_77624_4_) { tooltip.add( EnumChatFormatting.GRAY - + StatCollector.translateToLocal("item.heavenly_ring.type." + stack.getItemDamage())); + + StatCollector.translateToLocal("item.heavenly_ring_" + SUFFIX + ".type." + stack.getItemDamage())); + tooltip.add(StatCollector.translateToLocal("item.heavenly_ring.desc")); super.addInformation(stack, player, tooltip, p_77624_4_); } diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/recipe/RecipeLoader.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/recipe/RecipeLoader.java index 6c5c363a..d3da592f 100644 --- a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/recipe/RecipeLoader.java +++ b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/recipe/RecipeLoader.java @@ -4,6 +4,7 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; +import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; @@ -120,16 +121,74 @@ public static void run() { 'o', Blocks.obsidian); - // Heavenly Ring + // Heavenly Rings addShapedRecipe( - ModItems.HEAVENLY_RING, + ModItems.HEAVENLY_RING_FEATHER, + "#f#", + "f*f", + "ifi", + '#', + Blocks.glass, + 'f', + Items.feather, + '*', + Items.nether_star, + 'i', + ModItems.INVERTED_INGOT.newItemStack(1, OreDictionary.WILDCARD_VALUE)); + addShapedRecipe( + ModItems.HEAVENLY_RING_DRAGON, + "#b#", + "b*b", + "ibi", + '#', + Blocks.glass, + 'b', + Items.blaze_powder, + '*', + Items.nether_star, + 'i', + ModItems.INVERTED_INGOT.newItemStack(1, OreDictionary.WILDCARD_VALUE)); + addShapedRecipe( + ModItems.HEAVENLY_RING_FAIRY, + "#d#", + "p*p", + "idi", + '#', + Blocks.glass, + 'd', + Blocks.yellow_flower, + 'p', + new ItemStack(ItemBlock.getItemFromBlock(Blocks.red_flower), 1, 0), + '*', + Items.nether_star, + 'i', + ModItems.INVERTED_INGOT.newItemStack(1, OreDictionary.WILDCARD_VALUE)); + addShapedRecipe( + ModItems.HEAVENLY_RING_METAL, "#g#", - "g*g", + "t*t", "igi", '#', Blocks.glass, 'g', Items.gold_ingot, + 't', + Items.iron_ingot, + '*', + Items.nether_star, + 'i', + ModItems.INVERTED_INGOT.newItemStack(1, OreDictionary.WILDCARD_VALUE)); + addShapedRecipe( + ModItems.HEAVENLY_RING_MAGIC, + "#g#", + "r*r", + "igi", + '#', + Blocks.glass, + 'g', + Items.glowstone_dust, + 'r', + Items.redstone, '*', Items.nether_star, 'i', diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/renderers/HeavenlyRingRenderer.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/renderers/HeavenlyRingRenderer.java index 50a71f69..59c6d4d8 100644 --- a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/renderers/HeavenlyRingRenderer.java +++ b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/renderers/HeavenlyRingRenderer.java @@ -34,7 +34,7 @@ public static float getNextAngle(float curAngle, boolean isFlying) { return UIEUtils.lerp(curAngle, (float) ((Math.sin(time * 0.001 * speed) + 1) * max), 0.1F); } - public static void render(int meta, float angle) { + public static void render(ItemHeavenlyRing ring, int meta, float angle) { Tessellator t = Tessellator.instance; int boundTexIndex = GL11.glGetInteger(GL11.GL_TEXTURE_BINDING_2D); @@ -48,7 +48,7 @@ public static void render(int meta, float angle) { GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - IIcon icon = ItemHeavenlyRing.wingIcons[meta]; + IIcon icon = ring.wingIcons[meta]; // Derive scale float scaleX = icon.getIconWidth() / 16.0F; diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/mixins/early/minecraft/MixinModelBiped_Baubles.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/mixins/early/minecraft/MixinModelBiped_Baubles.java index a59aa979..9d278bf8 100644 --- a/src/main/java/com/fouristhenumber/utilitiesinexcess/mixins/early/minecraft/MixinModelBiped_Baubles.java +++ b/src/main/java/com/fouristhenumber/utilitiesinexcess/mixins/early/minecraft/MixinModelBiped_Baubles.java @@ -1,5 +1,7 @@ package com.fouristhenumber.utilitiesinexcess.mixins.early.minecraft; +import java.util.Objects; + import net.minecraft.client.model.ModelBiped; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -74,15 +76,16 @@ public class MixinModelBiped_Baubles { if (ring == null) { ring = UIEUtils.getBauble(player, ItemHeavenlyRing.class); } - // meta 4 is the invisible ring, no rendering - if (ring != null && ring.getItemDamage() != 4) { + if (ring != null) { final ItemStack finalRing = ring; uie$heavenlyRingWing = HeavenlyRingRenderer .getNextAngle(uie$heavenlyRingWing, player.capabilities.isFlying); - ModelPartRenderHelper.renderBipedPart( - p_78088_7_, - thisObject.bipedBody, - () -> { HeavenlyRingRenderer.render(finalRing.getItemDamage(), uie$heavenlyRingWing); }); + ModelPartRenderHelper.renderBipedPart(p_78088_7_, thisObject.bipedBody, () -> { + HeavenlyRingRenderer.render( + (ItemHeavenlyRing) Objects.requireNonNull(finalRing.getItem()), + finalRing.getItemDamage(), + uie$heavenlyRingWing); + }); } } } diff --git a/src/main/resources/assets/utilitiesinexcess/lang/en_US.lang b/src/main/resources/assets/utilitiesinexcess/lang/en_US.lang index daf202f4..734dbcdb 100644 --- a/src/main/resources/assets/utilitiesinexcess/lang/en_US.lang +++ b/src/main/resources/assets/utilitiesinexcess/lang/en_US.lang @@ -227,14 +227,60 @@ nei.infopage.uie.iron_spike.1=Iron spikes will kill enemies that walk on them, d nei.infopage.uie.gold_spike.1=Gold spikes will kill enemies that walk on them, dropping their experience and non-"player-only" loot. nei.infopage.uie.diamond_spike.1=Diamond spikes will kill enemies that walk on them, dropping experience and "player-only" loot. -item.heavenly_ring.name=Heavenly Ring -nei.infopage.uie.heavenly_ring.1=Grants the bearer the power of creative flight while in the inventory. -nei.infopage.uie.heavenly_ring.2=Grants the bearer the power of creative flight while equipped in a baubles slot. -item.heavenly_ring.type.0=Angelic -item.heavenly_ring.type.1=Demonic -item.heavenly_ring.type.2=Fae -item.heavenly_ring.type.3=Metallic -item.heavenly_ring.type.4=Invisible +item.heavenly_ring_feather.name=Heavenly Ring (Feathered) +item.heavenly_ring_dragon.name=Heavenly Ring (Draconic) +item.heavenly_ring_fairy.name=Heavenly Ring (Fairy) +item.heavenly_ring_metal.name=Heavenly Ring (Metallic) +item.heavenly_ring_magic.name=Heavenly Ring (Magical) +item.heavenly_ring.desc=Use in hand to cycle through different appearances. +nei.infopage.uie.heavenly_ring.1=Grants the bearer the power of creative flight while in the inventory. There are many different wing appearances for each type. Use the item in your hand to cycle between different appearances! +nei.infopage.uie.heavenly_ring.2=Grants the bearer the power of creative flight while equipped in a baubles slot. There are many different wing appearances for each type. Use the item in your hand to cycle between different appearances! + +item.heavenly_ring_feather.type.0=Chibi +item.heavenly_ring_feather.type.1=Angelic +item.heavenly_ring_feather.type.2=Storm +item.heavenly_ring_feather.type.3=Phoenix +item.heavenly_ring_feather.type.4=Swan +item.heavenly_ring_feather.type.5=Raven +item.heavenly_ring_feather.type.6=Falcon +item.heavenly_ring_feather.type.7=Macaw + +item.heavenly_ring_dragon.type.0=Red +item.heavenly_ring_dragon.type.1=Ebony +item.heavenly_ring_dragon.type.2=Golden +item.heavenly_ring_dragon.type.3=Leviathan +item.heavenly_ring_dragon.type.4=Green +item.heavenly_ring_dragon.type.5=Flower +item.heavenly_ring_dragon.type.6=Purple +item.heavenly_ring_dragon.type.7=Moon + +item.heavenly_ring_fairy.type.0=Rainbow +item.heavenly_ring_fairy.type.1=Pixie +item.heavenly_ring_fairy.type.2=Monarch +item.heavenly_ring_fairy.type.3=Lunamoth +item.heavenly_ring_fairy.type.4=Autumn +item.heavenly_ring_fairy.type.5=Blacklight +item.heavenly_ring_fairy.type.6=Jeweled Wasp +item.heavenly_ring_fairy.type.7=Leaf + +item.heavenly_ring_magic.type.0=Invisible +item.heavenly_ring_magic.type.1=Ice +item.heavenly_ring_magic.type.2=Fire +item.heavenly_ring_magic.type.3=Lightning +item.heavenly_ring_magic.type.4=End +item.heavenly_ring_magic.type.5=Plasma +item.heavenly_ring_magic.type.6=Crackling +item.heavenly_ring_magic.type.7=Jelly + +item.heavenly_ring_metal.type.0=Golden +item.heavenly_ring_metal.type.1=Silver +item.heavenly_ring_metal.type.2=Copper +item.heavenly_ring_metal.type.3=Glass +item.heavenly_ring_metal.type.4=Neonblade +item.heavenly_ring_metal.type.5=Nanotech +item.heavenly_ring_metal.type.6=Mayfly +item.heavenly_ring_metal.type.7=Steampunk +chat.heavenly_ring_modify=Ring appearance is now %s. item.watering_can_basic.name=Basic Watering Can item.watering_can_advanced.name=Advanced Watering Can diff --git a/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring.wing.0.png b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring.wing.0.png deleted file mode 100644 index 10f84099..00000000 Binary files a/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring.wing.0.png and /dev/null differ diff --git a/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring.wing.1.png b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring.wing.1.png deleted file mode 100644 index 8433404c..00000000 Binary files a/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring.wing.1.png and /dev/null differ diff --git a/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring.wing.2.png b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring.wing.2.png deleted file mode 100644 index 4b4a9acc..00000000 Binary files a/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring.wing.2.png and /dev/null differ diff --git a/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring.1.png b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_dragon.png similarity index 100% rename from src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring.1.png rename to src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_dragon.png diff --git a/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_dragon.wing.0.png b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_dragon.wing.0.png new file mode 100644 index 00000000..f6e0eddd Binary files /dev/null and b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_dragon.wing.0.png differ diff --git a/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_dragon.wing.1.png b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_dragon.wing.1.png new file mode 100644 index 00000000..43a6ca86 Binary files /dev/null and b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_dragon.wing.1.png differ diff --git a/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_dragon.wing.2.png b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_dragon.wing.2.png new file mode 100644 index 00000000..728bb743 Binary files /dev/null and b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_dragon.wing.2.png differ diff --git a/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_dragon.wing.3.png b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_dragon.wing.3.png new file mode 100644 index 00000000..dafb2bf5 Binary files /dev/null and b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_dragon.wing.3.png differ diff --git a/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_dragon.wing.4.png b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_dragon.wing.4.png new file mode 100644 index 00000000..c30f27d0 Binary files /dev/null and b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_dragon.wing.4.png differ diff --git a/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_dragon.wing.5.png b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_dragon.wing.5.png new file mode 100644 index 00000000..a340f913 Binary files /dev/null and b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_dragon.wing.5.png differ diff --git a/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_dragon.wing.6.png b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_dragon.wing.6.png new file mode 100644 index 00000000..4cdeedeb Binary files /dev/null and b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_dragon.wing.6.png differ diff --git a/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_dragon.wing.7.png b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_dragon.wing.7.png new file mode 100644 index 00000000..82a78760 Binary files /dev/null and b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_dragon.wing.7.png differ diff --git a/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring.2.png b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_fairy.png similarity index 100% rename from src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring.2.png rename to src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_fairy.png diff --git a/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_fairy.wing.0.png b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_fairy.wing.0.png new file mode 100644 index 00000000..0fc3f731 Binary files /dev/null and b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_fairy.wing.0.png differ diff --git a/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_fairy.wing.1.png b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_fairy.wing.1.png new file mode 100644 index 00000000..3623a18c Binary files /dev/null and b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_fairy.wing.1.png differ diff --git a/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_fairy.wing.2.png b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_fairy.wing.2.png new file mode 100644 index 00000000..907fbebe Binary files /dev/null and b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_fairy.wing.2.png differ diff --git a/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_fairy.wing.3.png b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_fairy.wing.3.png new file mode 100644 index 00000000..a3f1569e Binary files /dev/null and b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_fairy.wing.3.png differ diff --git a/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_fairy.wing.4.png b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_fairy.wing.4.png new file mode 100644 index 00000000..c39277de Binary files /dev/null and b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_fairy.wing.4.png differ diff --git a/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_fairy.wing.5.png b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_fairy.wing.5.png new file mode 100644 index 00000000..a62ec5f9 Binary files /dev/null and b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_fairy.wing.5.png differ diff --git a/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_fairy.wing.6.png b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_fairy.wing.6.png new file mode 100644 index 00000000..e3a997c3 Binary files /dev/null and b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_fairy.wing.6.png differ diff --git a/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_fairy.wing.7.png b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_fairy.wing.7.png new file mode 100644 index 00000000..01c0a428 Binary files /dev/null and b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_fairy.wing.7.png differ diff --git a/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring.0.png b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_feather.png similarity index 100% rename from src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring.0.png rename to src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_feather.png diff --git a/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_feather.wing.0.png b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_feather.wing.0.png new file mode 100644 index 00000000..3169c856 Binary files /dev/null and b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_feather.wing.0.png differ diff --git a/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_feather.wing.1.png b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_feather.wing.1.png new file mode 100644 index 00000000..c533e5fc Binary files /dev/null and b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_feather.wing.1.png differ diff --git a/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_feather.wing.2.png b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_feather.wing.2.png new file mode 100644 index 00000000..d0d91ff5 Binary files /dev/null and b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_feather.wing.2.png differ diff --git a/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_feather.wing.3.png b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_feather.wing.3.png new file mode 100644 index 00000000..62c85857 Binary files /dev/null and b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_feather.wing.3.png differ diff --git a/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_feather.wing.4.png b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_feather.wing.4.png new file mode 100644 index 00000000..1fe763a5 Binary files /dev/null and b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_feather.wing.4.png differ diff --git a/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_feather.wing.5.png b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_feather.wing.5.png new file mode 100644 index 00000000..2ab4b690 Binary files /dev/null and b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_feather.wing.5.png differ diff --git a/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_feather.wing.6.png b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_feather.wing.6.png new file mode 100644 index 00000000..db8cc8a5 Binary files /dev/null and b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_feather.wing.6.png differ diff --git a/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_feather.wing.7.png b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_feather.wing.7.png new file mode 100644 index 00000000..6a2b41be Binary files /dev/null and b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_feather.wing.7.png differ diff --git a/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring.4.png b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_magic.png similarity index 100% rename from src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring.4.png rename to src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_magic.png diff --git a/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_magic.wing.0.png b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_magic.wing.0.png new file mode 100644 index 00000000..36773ee0 Binary files /dev/null and b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_magic.wing.0.png differ diff --git a/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_magic.wing.1.png b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_magic.wing.1.png new file mode 100644 index 00000000..3c857d78 Binary files /dev/null and b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_magic.wing.1.png differ diff --git a/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_magic.wing.2.png b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_magic.wing.2.png new file mode 100644 index 00000000..4f4bd3c5 Binary files /dev/null and b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_magic.wing.2.png differ diff --git a/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_magic.wing.3.png b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_magic.wing.3.png new file mode 100644 index 00000000..c0c0b84b Binary files /dev/null and b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_magic.wing.3.png differ diff --git a/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_magic.wing.4.png b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_magic.wing.4.png new file mode 100644 index 00000000..a0838aeb Binary files /dev/null and b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_magic.wing.4.png differ diff --git a/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_magic.wing.5.png b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_magic.wing.5.png new file mode 100644 index 00000000..ad8d7f82 Binary files /dev/null and b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_magic.wing.5.png differ diff --git a/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_magic.wing.6.png b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_magic.wing.6.png new file mode 100644 index 00000000..b5768282 Binary files /dev/null and b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_magic.wing.6.png differ diff --git a/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_magic.wing.7.png b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_magic.wing.7.png new file mode 100644 index 00000000..4aba2116 Binary files /dev/null and b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_magic.wing.7.png differ diff --git a/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring.3.png b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_metal.png similarity index 100% rename from src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring.3.png rename to src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_metal.png diff --git a/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_metal.wing.0.png b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_metal.wing.0.png new file mode 100644 index 00000000..6eaeddd8 Binary files /dev/null and b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_metal.wing.0.png differ diff --git a/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_metal.wing.1.png b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_metal.wing.1.png new file mode 100644 index 00000000..5ccdda72 Binary files /dev/null and b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_metal.wing.1.png differ diff --git a/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_metal.wing.2.png b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_metal.wing.2.png new file mode 100644 index 00000000..ef80f24b Binary files /dev/null and b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_metal.wing.2.png differ diff --git a/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_metal.wing.3.png b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_metal.wing.3.png new file mode 100644 index 00000000..97b61cff Binary files /dev/null and b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_metal.wing.3.png differ diff --git a/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_metal.wing.4.png b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_metal.wing.4.png new file mode 100644 index 00000000..37e2706b Binary files /dev/null and b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_metal.wing.4.png differ diff --git a/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_metal.wing.5.png b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_metal.wing.5.png new file mode 100644 index 00000000..8952df56 Binary files /dev/null and b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_metal.wing.5.png differ diff --git a/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_metal.wing.6.png b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_metal.wing.6.png new file mode 100644 index 00000000..fd1342f2 Binary files /dev/null and b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_metal.wing.6.png differ diff --git a/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_metal.wing.7.png b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_metal.wing.7.png new file mode 100644 index 00000000..075e1a36 Binary files /dev/null and b/src/main/resources/assets/utilitiesinexcess/textures/items/heavenly_ring_metal.wing.7.png differ