diff --git a/src/main/java/fox/spiteful/avaritia/ClientProxy.java b/src/main/java/fox/spiteful/avaritia/ClientProxy.java index d6ad992..b375e35 100644 --- a/src/main/java/fox/spiteful/avaritia/ClientProxy.java +++ b/src/main/java/fox/spiteful/avaritia/ClientProxy.java @@ -33,6 +33,10 @@ public class ClientProxy extends CommonProxy { CosmicItemRenderer sparkly = new CosmicItemRenderer(); MinecraftForgeClient.registerItemRenderer(LudicrousItems.infinity_sword, sparkly); + MinecraftForgeClient.registerItemRenderer(LudicrousItems.infinity_helm, sparkly); + MinecraftForgeClient.registerItemRenderer(LudicrousItems.infinity_armor, sparkly); + MinecraftForgeClient.registerItemRenderer(LudicrousItems.infinity_pants, sparkly); + MinecraftForgeClient.registerItemRenderer(LudicrousItems.infinity_shoes, sparkly); CompatClient.comprettify(); diff --git a/src/main/java/fox/spiteful/avaritia/items/ItemArmorInfinity.java b/src/main/java/fox/spiteful/avaritia/items/ItemArmorInfinity.java index f4912c8..1d9e16f 100644 --- a/src/main/java/fox/spiteful/avaritia/items/ItemArmorInfinity.java +++ b/src/main/java/fox/spiteful/avaritia/items/ItemArmorInfinity.java @@ -2,10 +2,11 @@ package fox.spiteful.avaritia.items; import com.google.common.collect.Multimap; import fox.spiteful.avaritia.Avaritia; -import fox.spiteful.avaritia.Lumberjack; import fox.spiteful.avaritia.compat.Compat; +import fox.spiteful.avaritia.render.ICosmicRenderItem; import fox.spiteful.avaritia.render.ModelArmorInfinity; import net.minecraft.client.model.ModelBiped; +import net.minecraft.client.renderer.texture.IIconRegister; import fox.spiteful.avaritia.PotionHelper; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -19,10 +20,10 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.util.EnumHelper; -import org.apache.logging.log4j.Level; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -40,18 +41,22 @@ import java.util.List; @Optional.InterfaceList({ @Optional.Interface(iface = "thaumcraft.api.IGoggles", modid = "Thaumcraft"), @Optional.Interface(iface = "thaumcraft.api.nodes.IRevealer", modid = "Thaumcraft"), + @Optional.Interface(iface = "thaumcraft.api.IVisDiscountGear", modid = "Thaumcraft"), @Optional.Interface(iface = "vazkii.botania.api.item.IPhantomInkable", modid = "Botania") }) -public class ItemArmorInfinity extends ItemArmor implements IGoggles, IRevealer, IVisDiscountGear, IPhantomInkable { +public class ItemArmorInfinity extends ItemArmor implements ICosmicRenderItem, IGoggles, IRevealer, IVisDiscountGear, IPhantomInkable { public static final ArmorMaterial infinite_armor = EnumHelper.addArmorMaterial("infinity", 9999, new int[]{6, 16, 12, 6}, 1000); @SideOnly(Side.CLIENT) public static final ModelArmorInfinity armorModel = new ModelArmorInfinity(1.0f); @SideOnly(Side.CLIENT) public static final ModelArmorInfinity legModel = new ModelArmorInfinity(0.5f).setLegs(true); + public IIcon cosmicMask; + public final int slot; public ItemArmorInfinity(int slot){ super(infinite_armor, 0, slot); + this.slot = slot; setCreativeTab(Avaritia.tab); setUnlocalizedName("infinity_armor_" + slot); setTextureName("avaritia:infinity_armor_" + slot); @@ -60,13 +65,7 @@ public class ItemArmorInfinity extends ItemArmor implements IGoggles, IRevealer, @Override public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { - //if(slot == 2) - // return "avaritia:textures/models/infinity_pants.png"; - //else - if(Compat.botan && hasPhantomInk(stack)) - return "botania:textures/model/invisibleArmor.png"; - else - return "avaritia:textures/models/infinity_armor.png"; + return "avaritia:textures/models/infinity_armor.png"; } @Override @@ -74,7 +73,8 @@ public class ItemArmorInfinity extends ItemArmor implements IGoggles, IRevealer, super.setDamage(stack, 0); } - @Override + @SuppressWarnings("rawtypes") + @Override public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack) { if(armorType == 0){ @@ -123,7 +123,8 @@ public class ItemArmorInfinity extends ItemArmor implements IGoggles, IRevealer, return model; } - @Override + @SuppressWarnings({ "rawtypes", "unchecked" }) + @Override public Multimap getAttributeModifiers(ItemStack stack) { Multimap multimap = super.getAttributeModifiers(stack); @@ -154,7 +155,8 @@ public class ItemArmorInfinity extends ItemArmor implements IGoggles, IRevealer, return 20; } - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { + @SuppressWarnings({ "unchecked", "rawtypes" }) + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { if(Compat.thaumic) list.add(EnumChatFormatting.DARK_PURPLE + StatCollector.translateToLocal("tc.visdiscount") + ": " + this.getVisDiscount(stack, player, (Aspect)null) + "%"); if(Compat.botan) { @@ -180,4 +182,18 @@ public class ItemArmorInfinity extends ItemArmor implements IGoggles, IRevealer, tag.setBoolean("phantomInk", ink); } + @SideOnly(Side.CLIENT) + @Override + public void registerIcons(IIconRegister ir) { + super.registerIcons(ir); + + this.cosmicMask = ir.registerIcon("avaritia:infinity_armor_" + slot + "_mask"); + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getMaskTexture(ItemStack stack) { + return this.cosmicMask; + } + } diff --git a/src/main/java/fox/spiteful/avaritia/render/CosmicItemRenderer.java b/src/main/java/fox/spiteful/avaritia/render/CosmicItemRenderer.java index 3bb753a..e9d9b10 100644 --- a/src/main/java/fox/spiteful/avaritia/render/CosmicItemRenderer.java +++ b/src/main/java/fox/spiteful/avaritia/render/CosmicItemRenderer.java @@ -3,6 +3,8 @@ package fox.spiteful.avaritia.render; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; +import fox.spiteful.avaritia.Lumberjack; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.RenderHelper; diff --git a/src/main/java/fox/spiteful/avaritia/render/ModelArmorInfinity.java b/src/main/java/fox/spiteful/avaritia/render/ModelArmorInfinity.java index b833adb..6329c18 100644 --- a/src/main/java/fox/spiteful/avaritia/render/ModelArmorInfinity.java +++ b/src/main/java/fox/spiteful/avaritia/render/ModelArmorInfinity.java @@ -6,6 +6,7 @@ import java.util.Random; import org.lwjgl.opengl.GL11; import fox.spiteful.avaritia.Lumberjack; +import fox.spiteful.avaritia.items.ItemArmorInfinity; import fox.spiteful.avaritia.items.LudicrousItems; import net.minecraft.client.Minecraft; @@ -44,6 +45,10 @@ public class ModelArmorInfinity extends ModelBiped { private Overlay overlay; private Overlay invulnOverlay; private boolean invulnRender = true; + private boolean showHat; + private boolean showChest; + private boolean showLeg; + private boolean showFoot; private float expand; @@ -202,21 +207,44 @@ public class ModelArmorInfinity extends ModelBiped { public void update(EntityLivingBase entityLiving, ItemStack itemstack, int armorSlot) { this.currentSlot = armorSlot; - this.bipedHead.showModel = armorSlot == 0; - this.bipedHeadwear.showModel = armorSlot == 0; - this.bipedBody.showModel = armorSlot == 1 || armorSlot == 2; - this.bipedRightArm.showModel = armorSlot == 1; - this.bipedLeftArm.showModel = armorSlot == 1; - this.bipedRightLeg.showModel = armorSlot == 2 || armorSlot == 3; - this.bipedLeftLeg.showModel = armorSlot == 2 || armorSlot == 3; + this.invulnRender = false; - this.overlay.bipedHead.showModel = armorSlot == 0; - this.overlay.bipedHeadwear.showModel = armorSlot == 0; - this.overlay.bipedBody.showModel = armorSlot == 1 || armorSlot == 2; - this.overlay.bipedRightArm.showModel = armorSlot == 1; - this.overlay.bipedLeftArm.showModel = armorSlot == 1; - this.overlay.bipedRightLeg.showModel = armorSlot == 2 || armorSlot == 3; - this.overlay.bipedLeftLeg.showModel = armorSlot == 2 || armorSlot == 3; + ItemStack hat = entityLiving.getEquipmentInSlot(4); + ItemStack chest = entityLiving.getEquipmentInSlot(3); + ItemStack leg = entityLiving.getEquipmentInSlot(2); + ItemStack foot = entityLiving.getEquipmentInSlot(1); + + boolean hasHat = hat != null && hat.getItem() == LudicrousItems.infinity_helm && !((ItemArmorInfinity)(LudicrousItems.infinity_helm)).hasPhantomInk(hat); + boolean hasChest = chest != null && chest.getItem() == LudicrousItems.infinity_armor && !((ItemArmorInfinity)(LudicrousItems.infinity_armor)).hasPhantomInk(chest); + boolean hasLeg = leg != null && leg.getItem() == LudicrousItems.infinity_pants && !((ItemArmorInfinity)(LudicrousItems.infinity_pants)).hasPhantomInk(leg); + boolean hasFoot = foot != null && foot.getItem() == LudicrousItems.infinity_shoes && !((ItemArmorInfinity)(LudicrousItems.infinity_shoes)).hasPhantomInk(foot); + + if (armorSlot == 0) { + if (hasHat && hasChest && hasLeg && hasFoot) { + this.invulnRender = true; + } + } + + this.showHat = hasHat && armorSlot == 0; + this.showChest = hasChest && armorSlot == 1; + this.showLeg = hasLeg && armorSlot == 2; + this.showFoot = hasFoot && armorSlot == 3; + + this.bipedHead.showModel = showHat; + this.bipedHeadwear.showModel = showHat; + this.bipedBody.showModel = showChest || showLeg; + this.bipedRightArm.showModel = showChest; + this.bipedLeftArm.showModel = showChest; + this.bipedRightLeg.showModel = showLeg || showFoot; + this.bipedLeftLeg.showModel = showLeg || showFoot; + + this.overlay.bipedHead.showModel = showHat; + this.overlay.bipedHeadwear.showModel = showHat; + this.overlay.bipedBody.showModel = showChest || showLeg; + this.overlay.bipedRightArm.showModel = showChest; + this.overlay.bipedLeftArm.showModel = showChest; + this.overlay.bipedRightLeg.showModel = showLeg || showFoot; + this.overlay.bipedLeftLeg.showModel = showLeg || showFoot; this.bipedLeftWing.showModel = false; this.bipedRightWing.showModel = false; @@ -273,30 +301,13 @@ public class ModelArmorInfinity extends ModelBiped { } } - - // set effect - this.invulnRender = false; - if (armorSlot == 0) { - ItemStack hat = entityLiving.getEquipmentInSlot(4); - ItemStack chest = entityLiving.getEquipmentInSlot(3); - ItemStack leg = entityLiving.getEquipmentInSlot(2); - ItemStack foot = entityLiving.getEquipmentInSlot(1); - - boolean hasHat = hat != null && hat.getItem() == LudicrousItems.infinity_helm; - boolean hasChest = chest != null && chest.getItem() == LudicrousItems.infinity_armor; - boolean hasLeg = leg != null && leg.getItem() == LudicrousItems.infinity_pants; - boolean hasFoot = foot != null && foot.getItem() == LudicrousItems.infinity_shoes; - - if (hasHat && hasChest && hasLeg && hasFoot) { - this.invulnRender = true; - } - } + } @Override - public void setRotationAngles(float p_78087_1_, float p_78087_2_, float p_78087_3_, float p_78087_4_, float p_78087_5_, float p_78087_6_, Entity entity) + public void setRotationAngles(float f1, float f2, float f3, float f4, float f5, float f6, Entity entity) { - super.setRotationAngles(p_78087_1_, p_78087_2_, p_78087_3_, p_78087_4_, p_78087_5_, p_78087_6_, entity); + super.setRotationAngles(f1, f2, f3, f4, f5, f6, entity); if (RenderManager.instance.entityRenderMap.containsKey(entity.getClass())) { Render r = (Render) RenderManager.instance.entityRenderMap.get(entity.getClass()); @@ -304,8 +315,6 @@ public class ModelArmorInfinity extends ModelBiped { if (r instanceof RenderBiped) { ModelBiped m = ((RenderBiped) r).modelBipedMain; - //Lumberjack.info("Entity model: "+m); - copyBipedAngles(m, this); } } @@ -318,21 +327,21 @@ public class ModelArmorInfinity extends ModelBiped { this.bipedLeftArm.showModel = false; this.bipedRightLeg.showModel = false; this.bipedLeftLeg.showModel = false; - this.bipedHeadwear.showModel = this.currentSlot == 0 ? true : false; + this.bipedHeadwear.showModel = this.showHat ? true : false; } public void setGems() { this.bipedHead.showModel = false; this.bipedHeadwear.showModel = false; - this.bipedBody.showModel = this.legs ? false : (this.currentSlot == 1 ? true : false); - this.bipedRightArm.showModel = this.legs ? false : (this.currentSlot == 1 ? true : false); - this.bipedLeftArm.showModel = this.legs ? false : (this.currentSlot == 1 ? true : false); - this.bipedRightLeg.showModel = this.legs ? (this.currentSlot == 2 ? true : false) : false; - this.bipedLeftLeg.showModel = this.legs ? (this.currentSlot == 2 ? true : false) : false; + this.bipedBody.showModel = this.legs ? false : (this.showChest ? true : false); + this.bipedRightArm.showModel = this.legs ? false : (this.showChest ? true : false); + this.bipedLeftArm.showModel = this.legs ? false : (this.showChest ? true : false); + this.bipedRightLeg.showModel = this.legs ? (this.showLeg ? true : false) : false; + this.bipedLeftLeg.showModel = this.legs ? (this.showLeg ? true : false) : false; } public void setWings() { - this.bipedBody.showModel = this.legs ? false : (this.currentSlot == 1 ? true : false); + this.bipedBody.showModel = this.legs ? false : (this.showChest ? true : false); this.bipedLeftWing.showModel = true; this.bipedRightWing.showModel = true; this.bipedHeadwear.showModel = false; @@ -343,7 +352,7 @@ public class ModelArmorInfinity extends ModelBiped { this.bipedHeadwear.showModel = false; this.bipedHead.showModel = false; - this.overlay.bipedBody.showModel = this.legs ? false : (this.currentSlot == 1 ? true : false); + this.overlay.bipedBody.showModel = this.legs ? false : (this.showChest ? true : false); this.overlay.bipedLeftWing.showModel = true; this.overlay.bipedRightWing.showModel = true; this.overlay.bipedHead.showModel = false; @@ -461,9 +470,9 @@ public class ModelArmorInfinity extends ModelBiped { } @Override - public void setRotationAngles(float p_78087_1_, float p_78087_2_, float p_78087_3_, float p_78087_4_, float p_78087_5_, float p_78087_6_, Entity entity) + public void setRotationAngles(float f1, float f2, float f3, float f4, float f5, float f6, Entity entity) { - super.setRotationAngles(p_78087_1_, p_78087_2_, p_78087_3_, p_78087_4_, p_78087_5_, p_78087_6_, entity); + super.setRotationAngles(f1,f2,f3,f4,f5,f6, entity); if (RenderManager.instance.entityRenderMap.containsKey(entity.getClass())) { Render r = (Render) RenderManager.instance.entityRenderMap.get(entity.getClass()); diff --git a/src/main/java/fox/spiteful/avaritia/render/ShaderHelper.java b/src/main/java/fox/spiteful/avaritia/render/ShaderHelper.java index 2be14eb..d047332 100644 --- a/src/main/java/fox/spiteful/avaritia/render/ShaderHelper.java +++ b/src/main/java/fox/spiteful/avaritia/render/ShaderHelper.java @@ -113,7 +113,7 @@ public final class ShaderHelper { ARBShaderObjects.glCompileShaderARB(shader); if (ARBShaderObjects.glGetObjectParameteriARB(shader, ARBShaderObjects.GL_OBJECT_COMPILE_STATUS_ARB) == GL11.GL_FALSE) - throw new RuntimeException("Error creating shader: " + getLogInfo(shader)); + throw new RuntimeException("Error creating shader \""+filename+"\": " + getLogInfo(shader)); return shader; } diff --git a/src/main/resources/assets/avaritia/shader/cosmic.frag b/src/main/resources/assets/avaritia/shader/cosmic.frag index 64e771a..c03f1ab 100644 --- a/src/main/resources/assets/avaritia/shader/cosmic.frag +++ b/src/main/resources/assets/avaritia/shader/cosmic.frag @@ -1,3 +1,5 @@ +#version 130 + #define M_PI 3.1415926535897932384626433832795 const int cosmiccount = 10; @@ -94,13 +96,13 @@ void main (void) vec2 tex = vec2( u, v ); // tile position of the current uv - int tu = mod(floor(u*uvtiles),uvtiles); - int tv = mod(floor(v*uvtiles),uvtiles); + int tu = int(mod(floor(u*uvtiles),uvtiles)); + int tv = int(mod(floor(v*uvtiles),uvtiles)); // get pseudorandom variants int position = ((1777541 * tu) + (7649689 * tv) + (3612703 * (i+31)) + 1723609 ) ^ 50943779; - int symbol = mod(position, cosmicoutof); - int rotation = mod (pow(tu,tv) + tu + 3 + tv*i, 8); + int symbol = int(mod(position, cosmicoutof)); + int rotation = int(mod(pow(tu,float(tv)) + tu + 3 + tv*i, 8)); bool flip = false; if (rotation >= 4) { rotation -= 4; @@ -108,7 +110,7 @@ void main (void) } // if it's an icon, then add the colour! - if (symbol < cosmiccount) { + if (symbol >= 0 && symbol < cosmiccount) { vec2 cosmictex = vec2(1.0,1.0); vec4 tcol = vec4(1.0,0.0,0.0,1.0); diff --git a/src/main/resources/assets/avaritia/shader/cosmic.vert b/src/main/resources/assets/avaritia/shader/cosmic.vert index e6f95e3..9b319d5 100644 --- a/src/main/resources/assets/avaritia/shader/cosmic.vert +++ b/src/main/resources/assets/avaritia/shader/cosmic.vert @@ -1,8 +1,10 @@ +#version 120 + vec4 Ambient; vec4 Diffuse; vec4 Specular; -attribute short activelights; +attribute float activelights; varying vec3 position; diff --git a/src/main/resources/assets/avaritia/textures/items/infinity_armor_0.png b/src/main/resources/assets/avaritia/textures/items/infinity_armor_0.png index d99d543..1917d2c 100644 Binary files a/src/main/resources/assets/avaritia/textures/items/infinity_armor_0.png and b/src/main/resources/assets/avaritia/textures/items/infinity_armor_0.png differ diff --git a/src/main/resources/assets/avaritia/textures/items/infinity_armor_0_mask.png b/src/main/resources/assets/avaritia/textures/items/infinity_armor_0_mask.png new file mode 100644 index 0000000..47f7ced Binary files /dev/null and b/src/main/resources/assets/avaritia/textures/items/infinity_armor_0_mask.png differ diff --git a/src/main/resources/assets/avaritia/textures/items/infinity_armor_1.png b/src/main/resources/assets/avaritia/textures/items/infinity_armor_1.png index f0179a3..a597bfd 100644 Binary files a/src/main/resources/assets/avaritia/textures/items/infinity_armor_1.png and b/src/main/resources/assets/avaritia/textures/items/infinity_armor_1.png differ diff --git a/src/main/resources/assets/avaritia/textures/items/infinity_armor_1.png.mcmeta b/src/main/resources/assets/avaritia/textures/items/infinity_armor_1.png.mcmeta new file mode 100644 index 0000000..203da75 --- /dev/null +++ b/src/main/resources/assets/avaritia/textures/items/infinity_armor_1.png.mcmeta @@ -0,0 +1,37 @@ +{ + "animation": { + "frametime": 1, + "frames": [ + 0, + 0, + 0, + 1, + 1, + 1, + 2, + 2, + 2, + 3, + 3, + 4, + 4, + 5, + 6, + 7, + 8, + 7, + 6, + 5, + 4, + 4, + 3, + 3, + 2, + 2, + 2, + 1, + 1, + 1, + ] + } +} diff --git a/src/main/resources/assets/avaritia/textures/items/infinity_armor_1_mask.png b/src/main/resources/assets/avaritia/textures/items/infinity_armor_1_mask.png new file mode 100644 index 0000000..b9751d3 Binary files /dev/null and b/src/main/resources/assets/avaritia/textures/items/infinity_armor_1_mask.png differ diff --git a/src/main/resources/assets/avaritia/textures/items/infinity_armor_1_mask.png.mcmeta b/src/main/resources/assets/avaritia/textures/items/infinity_armor_1_mask.png.mcmeta new file mode 100644 index 0000000..203da75 --- /dev/null +++ b/src/main/resources/assets/avaritia/textures/items/infinity_armor_1_mask.png.mcmeta @@ -0,0 +1,37 @@ +{ + "animation": { + "frametime": 1, + "frames": [ + 0, + 0, + 0, + 1, + 1, + 1, + 2, + 2, + 2, + 3, + 3, + 4, + 4, + 5, + 6, + 7, + 8, + 7, + 6, + 5, + 4, + 4, + 3, + 3, + 2, + 2, + 2, + 1, + 1, + 1, + ] + } +} diff --git a/src/main/resources/assets/avaritia/textures/items/infinity_armor_2.png b/src/main/resources/assets/avaritia/textures/items/infinity_armor_2.png index 1eebaea..afa6328 100644 Binary files a/src/main/resources/assets/avaritia/textures/items/infinity_armor_2.png and b/src/main/resources/assets/avaritia/textures/items/infinity_armor_2.png differ diff --git a/src/main/resources/assets/avaritia/textures/items/infinity_armor_2.png.mcmeta b/src/main/resources/assets/avaritia/textures/items/infinity_armor_2.png.mcmeta new file mode 100644 index 0000000..203da75 --- /dev/null +++ b/src/main/resources/assets/avaritia/textures/items/infinity_armor_2.png.mcmeta @@ -0,0 +1,37 @@ +{ + "animation": { + "frametime": 1, + "frames": [ + 0, + 0, + 0, + 1, + 1, + 1, + 2, + 2, + 2, + 3, + 3, + 4, + 4, + 5, + 6, + 7, + 8, + 7, + 6, + 5, + 4, + 4, + 3, + 3, + 2, + 2, + 2, + 1, + 1, + 1, + ] + } +} diff --git a/src/main/resources/assets/avaritia/textures/items/infinity_armor_2_mask.png b/src/main/resources/assets/avaritia/textures/items/infinity_armor_2_mask.png new file mode 100644 index 0000000..5cc7254 Binary files /dev/null and b/src/main/resources/assets/avaritia/textures/items/infinity_armor_2_mask.png differ diff --git a/src/main/resources/assets/avaritia/textures/items/infinity_armor_2_mask.png.mcmeta b/src/main/resources/assets/avaritia/textures/items/infinity_armor_2_mask.png.mcmeta new file mode 100644 index 0000000..203da75 --- /dev/null +++ b/src/main/resources/assets/avaritia/textures/items/infinity_armor_2_mask.png.mcmeta @@ -0,0 +1,37 @@ +{ + "animation": { + "frametime": 1, + "frames": [ + 0, + 0, + 0, + 1, + 1, + 1, + 2, + 2, + 2, + 3, + 3, + 4, + 4, + 5, + 6, + 7, + 8, + 7, + 6, + 5, + 4, + 4, + 3, + 3, + 2, + 2, + 2, + 1, + 1, + 1, + ] + } +} diff --git a/src/main/resources/assets/avaritia/textures/items/infinity_armor_3.png b/src/main/resources/assets/avaritia/textures/items/infinity_armor_3.png index 8b15d0a..4b60853 100644 Binary files a/src/main/resources/assets/avaritia/textures/items/infinity_armor_3.png and b/src/main/resources/assets/avaritia/textures/items/infinity_armor_3.png differ diff --git a/src/main/resources/assets/avaritia/textures/items/infinity_armor_3_mask.png b/src/main/resources/assets/avaritia/textures/items/infinity_armor_3_mask.png new file mode 100644 index 0000000..5d97807 Binary files /dev/null and b/src/main/resources/assets/avaritia/textures/items/infinity_armor_3_mask.png differ diff --git a/src/main/resources/assets/avaritia/textures/items/infinity_armor_wingmask.png b/src/main/resources/assets/avaritia/textures/items/infinity_armor_wingmask.png index d5675cb..e06ccac 100644 Binary files a/src/main/resources/assets/avaritia/textures/items/infinity_armor_wingmask.png and b/src/main/resources/assets/avaritia/textures/items/infinity_armor_wingmask.png differ diff --git a/src/main/resources/assets/avaritia/textures/items/infinity_armor_wingmask.png.mcmeta b/src/main/resources/assets/avaritia/textures/items/infinity_armor_wingmask.png.mcmeta new file mode 100644 index 0000000..24f9c2f --- /dev/null +++ b/src/main/resources/assets/avaritia/textures/items/infinity_armor_wingmask.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +}