diff --git a/src/main/java/fox/spiteful/avaritia/ClientProxy.java b/src/main/java/fox/spiteful/avaritia/ClientProxy.java index a928080..515e81e 100644 --- a/src/main/java/fox/spiteful/avaritia/ClientProxy.java +++ b/src/main/java/fox/spiteful/avaritia/ClientProxy.java @@ -13,6 +13,7 @@ import fox.spiteful.avaritia.render.CosmicItemRenderer; import fox.spiteful.avaritia.render.FancyHaloRenderer; import fox.spiteful.avaritia.render.FracturedOreRenderer; import fox.spiteful.avaritia.render.LudicrousRenderEvents; +import fox.spiteful.avaritia.render.MorvInABoxRenderer; import fox.spiteful.avaritia.render.RenderGapingVoid; import fox.spiteful.avaritia.render.RenderHeavenArrow; import fox.spiteful.avaritia.render.ShaderHelper; @@ -57,6 +58,8 @@ public class ClientProxy extends CommonProxy { MinecraftForgeClient.registerItemRenderer(LudicrousItems.fractured_ore, new FracturedOreRenderer()); + MinecraftForgeClient.registerItemRenderer(LudicrousItems.morv_in_a_box, new MorvInABoxRenderer()); + CompatClient.comprettify(); LudicrousRenderEvents fancyevents = new LudicrousRenderEvents(); diff --git a/src/main/java/fox/spiteful/avaritia/items/ItemMorvInABox.java b/src/main/java/fox/spiteful/avaritia/items/ItemMorvInABox.java new file mode 100644 index 0000000..2b9ab7f --- /dev/null +++ b/src/main/java/fox/spiteful/avaritia/items/ItemMorvInABox.java @@ -0,0 +1,40 @@ +package fox.spiteful.avaritia.items; + +import java.util.List; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +import fox.spiteful.avaritia.Avaritia; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.IIcon; +import net.minecraft.util.StatCollector; + +public class ItemMorvInABox extends Item { + + public IIcon nameoverlay; + + public ItemMorvInABox() { + this.setUnlocalizedName("morvinabox"); + this.setCreativeTab(Avaritia.tab); + this.setTextureName("avaritia:morvinabox"); + } + + @SuppressWarnings({ "unchecked", "rawtypes" }) + @Override + public void addInformation(ItemStack item, EntityPlayer player, List tooltip, boolean wut) { + tooltip.add(StatCollector.translateToLocal("tooltip.morvinabox.desc")); + tooltip.add(EnumChatFormatting.DARK_GRAY +""+ EnumChatFormatting.ITALIC + StatCollector.translateToLocal("tooltip.morvinabox.subdesc")); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister ir) { + super.registerIcons(ir); + this.nameoverlay = ir.registerIcon("avaritia:morvinabox2"); + } +} diff --git a/src/main/java/fox/spiteful/avaritia/items/LudicrousItems.java b/src/main/java/fox/spiteful/avaritia/items/LudicrousItems.java index a16048e..d5c21e0 100644 --- a/src/main/java/fox/spiteful/avaritia/items/LudicrousItems.java +++ b/src/main/java/fox/spiteful/avaritia/items/LudicrousItems.java @@ -26,6 +26,7 @@ public class LudicrousItems { public static Item endest_pearl; public static Item fractured_ore; public static Item matter_cluster; + public static Item morv_in_a_box; public static Item infinity_pickaxe; public static Item infinity_sword; @@ -52,38 +53,23 @@ public class LudicrousItems { if(Config.craftingOnly) return; - singularity = new ItemSingularity(); - GameRegistry.registerItem(singularity, "Singularity"); - infinity_pickaxe = new ItemPickaxeInfinity(); - GameRegistry.registerItem(infinity_pickaxe, "Infinity_Pickaxe"); - infinity_sword = new ItemSwordInfinity(); - GameRegistry.registerItem(infinity_sword, "Infinity_Sword"); - skull_sword = new ItemSwordSkulls(); - GameRegistry.registerItem(skull_sword, "Skull_Sword"); - ultimate_stew = new ItemFood(20,20.0f,false).setPotionEffect(Potion.regeneration.getId(), 300, 1, 1.0f).setTextureName("avaritia:stew").setUnlocalizedName("avaritia_stew").setCreativeTab(Avaritia.tab); - GameRegistry.registerItem(ultimate_stew, "Ultimate_Stew"); - cosmic_meatballs = new ItemFood(20,20.0f,false).setPotionEffect(Potion.damageBoost.getId(), 300, 1, 1.0f).setTextureName("avaritia:meatballs").setUnlocalizedName("avaritia_meatballs").setCreativeTab(Avaritia.tab); - GameRegistry.registerItem(cosmic_meatballs, "Cosmic_Meatballs"); - endest_pearl = new ItemEndestPearl(); - GameRegistry.registerItem(endest_pearl, "Endest_Pearl"); - infinity_helm = new ItemArmorInfinity(0); - GameRegistry.registerItem(infinity_helm, "Infinity_Helm"); - infinity_armor = new ItemArmorInfinity(1); - GameRegistry.registerItem(infinity_armor, "Infinity_Chest"); - infinity_pants = new ItemArmorInfinity(2); - GameRegistry.registerItem(infinity_pants, "Infinity_Pants"); - infinity_shoes = new ItemArmorInfinity(3); - GameRegistry.registerItem(infinity_shoes, "Infinity_Shoes"); - fractured_ore = new ItemFracturedOre(); - GameRegistry.registerItem(fractured_ore, "Fractured_Ore"); - matter_cluster = new ItemMatterCluster(); - GameRegistry.registerItem(matter_cluster, "Matter_Cluster"); - infinity_bow = new ItemBowInfinity(); - GameRegistry.registerItem(infinity_bow, "Infinity_Bow"); - infinity_shovel = new ItemShovelInfinity(); - GameRegistry.registerItem(infinity_shovel, "Infinity_Shovel"); - infinity_axe = new ItemAxeInfinity(); - GameRegistry.registerItem(infinity_axe, "Infinity_Axe"); + singularity = register(new ItemSingularity(), "Singularity"); + infinity_pickaxe = register(new ItemPickaxeInfinity(), "Infinity_Pickaxe"); + infinity_sword = register(new ItemSwordInfinity(), "Infinity_Sword"); + skull_sword = register(new ItemSwordSkulls(), "Skull_Sword"); + ultimate_stew = register(new ItemFood(20,20.0f,false).setPotionEffect(Potion.regeneration.getId(), 300, 1, 1.0f).setTextureName("avaritia:stew").setUnlocalizedName("avaritia_stew").setCreativeTab(Avaritia.tab), "Ultimate_Stew"); + cosmic_meatballs = register(new ItemFood(20,20.0f,false).setPotionEffect(Potion.damageBoost.getId(), 300, 1, 1.0f).setTextureName("avaritia:meatballs").setUnlocalizedName("avaritia_meatballs").setCreativeTab(Avaritia.tab), "Cosmic_Meatballs"); + endest_pearl = register(new ItemEndestPearl(), "Endest_Pearl"); + infinity_helm = register(new ItemArmorInfinity(0), "Infinity_Helm"); + infinity_armor = register(new ItemArmorInfinity(1), "Infinity_Chest"); + infinity_pants = register(new ItemArmorInfinity(2), "Infinity_Pants"); + infinity_shoes = register(new ItemArmorInfinity(3), "Infinity_Shoes"); + fractured_ore = register(new ItemFracturedOre(), "Fractured_Ore"); + matter_cluster = register(new ItemMatterCluster(), "Matter_Cluster"); + infinity_bow = register(new ItemBowInfinity(), "Infinity_Bow"); + infinity_shovel = register(new ItemShovelInfinity(), "Infinity_Shovel"); + infinity_axe = register(new ItemAxeInfinity(), "Infinity_Axe"); + morv_in_a_box = register(new ItemMorvInABox(), "MorvInABox"); MinecraftForge.EVENT_BUS.register(new ItemArmorInfinity.abilityHandler()); } @@ -98,4 +84,9 @@ public class LudicrousItems { else return false; } + + public static Item register(Item item, String name) { + GameRegistry.registerItem(item, name); + return item; + } } diff --git a/src/main/java/fox/spiteful/avaritia/render/MorvInABoxRenderer.java b/src/main/java/fox/spiteful/avaritia/render/MorvInABoxRenderer.java new file mode 100644 index 0000000..f000a0f --- /dev/null +++ b/src/main/java/fox/spiteful/avaritia/render/MorvInABoxRenderer.java @@ -0,0 +1,271 @@ +package fox.spiteful.avaritia.render; + +import java.util.Map; +import java.util.UUID; + +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL12; + +import com.google.common.collect.Iterables; +import com.mojang.authlib.GameProfile; +import com.mojang.authlib.minecraft.MinecraftProfileTexture; +import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type; +import com.mojang.authlib.properties.Property; + +import fox.spiteful.avaritia.Lumberjack; +import fox.spiteful.avaritia.items.ItemMorvInABox; +import fox.spiteful.avaritia.items.LudicrousItems; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.ItemRenderer; +import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.entity.RenderItem; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.client.resources.SkinManager; +import net.minecraft.client.resources.SkinManager.SkinAvailableCallback; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTUtil; +import net.minecraft.server.MinecraftServer; +import net.minecraft.util.IIcon; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StringUtils; +import net.minecraftforge.client.IItemRenderer; +import net.minecraftforge.client.IItemRenderer.ItemRendererHelper; + +public class MorvInABoxRenderer implements IItemRenderer { + private static GameProfile morvy;// = new GameProfile(UUID.fromString(), "Morvelaira"); + private static ResourceLocation skin = null; + + public MorvInABoxRenderer() { + NBTTagCompound morvytag = new NBTTagCompound(); + morvytag.setString("Id", "67b0b9d7-c003-4b12-8ee1-f233424a219c"); + morvy = new GameProfile(null, "Morvelaira"); + } + + @Override + public boolean handleRenderType(ItemStack item, ItemRenderType type) { + return true; + } + + @Override + public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { + return helper == ItemRendererHelper.ENTITY_ROTATION || helper == ItemRendererHelper.ENTITY_BOBBING; + } + + @Override + public void renderItem(ItemRenderType type, ItemStack item, Object... data) { + this.getMorvy(); + Minecraft mc = Minecraft.getMinecraft(); + switch(type) { + case ENTITY : { + GL11.glPushMatrix(); + GL11.glTranslatef(-0.5F, 0F, 0F); + if(item.isOnItemFrame()) + GL11.glTranslatef(0F, -0.3F, 0.01F); + render(item, null); + GL11.glPopMatrix(); + + break; + } + case EQUIPPED : { + render(item, data[1] instanceof EntityPlayer ? (EntityPlayer) data[1] : null); + break; + } + case EQUIPPED_FIRST_PERSON : { + render(item, data[1] instanceof EntityPlayer ? (EntityPlayer) data[1] : null); + break; + } + case INVENTORY: { + GL11.glPushMatrix(); + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + RenderHelper.enableGUIStandardItemLighting(); + + GL11.glDisable(GL11.GL_ALPHA_TEST); + GL11.glDisable(GL11.GL_DEPTH_TEST); + + RenderItem r = RenderItem.getInstance(); + r.renderItemIntoGUI(mc.fontRenderer, mc.getTextureManager(), item, 0, 0, true); + + GL11.glEnable(GL11.GL_ALPHA_TEST); + GL11.glEnable(GL12.GL_RESCALE_NORMAL); + GL11.glEnable(GL11.GL_DEPTH_TEST); + + r.renderWithColor = true; + + Tessellator t = Tessellator.instance; + + if (skin != null) { + GL11.glPushMatrix(); + GL11.glScaled(0.4, 0.4, 1.0); + GL11.glTranslated(16, 10, 0); + GL11.glRotated(20, 0, 0, 1); + + mc.getTextureManager().bindTexture(skin); + + float minu = 8/64.0f; + float maxu = 16/64.0f; + float minv = 8/32.0f; + float maxv = 16/32.0f; + + t.startDrawingQuads(); + t.addVertexWithUV(0, 0, 0, minu, minv); + t.addVertexWithUV(0, 16, 0, minu, maxv); + t.addVertexWithUV(16, 16, 0, maxu, maxv); + t.addVertexWithUV(16, 0, 0, maxu, minv); + t.draw(); + + minu = 40/64.0f; + maxu = 48/64.0f; + minv = 8/32.0f; + maxv = 16/32.0f; + + t.startDrawingQuads(); + t.addVertexWithUV(-1, -1, 0, minu, minv); + t.addVertexWithUV(-1, 17, 0, minu, maxv); + t.addVertexWithUV(17, 17, 0, maxu, maxv); + t.addVertexWithUV(17, -1, 0, maxu, minv); + t.draw(); + + mc.getTextureManager().bindTexture(TextureMap.locationItemsTexture); + + GL11.glPopMatrix(); + } + + IIcon icon = ((ItemMorvInABox)(LudicrousItems.morv_in_a_box)).nameoverlay; + + GL11.glColor4d(1, 1, 1, 1); + + float minu = icon.getMinU(); + float maxu = icon.getMaxU(); + float minv = icon.getMinV(); + float maxv = icon.getMaxV(); + + + + t.startDrawingQuads(); + t.addVertexWithUV(0, 0, 0, minu, minv); + t.addVertexWithUV(0, 16, 0, minu, maxv); + t.addVertexWithUV(16, 16, 0, maxu, maxv); + t.addVertexWithUV(16, 0, 0, maxu, minv); + t.draw(); + + GL11.glDisable(GL11.GL_BLEND); + GL11.glPopMatrix(); + break; + } + default : break; + } + } + + public void render(ItemStack item, EntityPlayer player) { + GL11.glPushMatrix(); + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GL11.glColor4f(1F, 1F, 1F, 1F); + //ItemRenderer.renderItemIn2D(Tessellator.instance, f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), scale); + + IIcon icon = item.getItem().getIcon(item, 0); + + float f = icon.getMinU(); + float f1 = icon.getMaxU(); + float f2 = icon.getMinV(); + float f3 = icon.getMaxV(); + + ItemRenderer.renderItemIn2D(Tessellator.instance, f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1.0f/16.0f); + + if (skin != null) { + Minecraft mc = Minecraft.getMinecraft(); + GL11.glPushMatrix(); + GL11.glScaled(0.4, 0.4, 1.0); + GL11.glTranslated(15.0/16.0, 10.0/16.0, 0.0001); + GL11.glRotated(20, 0, 0, 1); + + //GL11.glDisable(GL11.GL_DEPTH_TEST); + //GL11.glDepthFunc(GL11.GL_EQUAL); + + mc.getTextureManager().bindTexture(skin); + + f = 8/64.0f; + f1 = 16/64.0f; + f2 = 8/32.0f; + f3 = 16/32.0f; + + ItemRenderer.renderItemIn2D(Tessellator.instance, f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1.0025f/16.0f); + + f = 40/64.0f; + f1 = 48/64.0f; + f2 = 8/32.0f; + f3 = 16/32.0f; + + GL11.glTranslated(-.35/16.0, -.35/16.0, 0.0002); + GL11.glScaled(17/16.0, 17/16.0, 1.0); + + + ItemRenderer.renderItemIn2D(Tessellator.instance, f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1.006f/16.0f); + + mc.getTextureManager().bindTexture(TextureMap.locationItemsTexture); + + //GL11.glDepthFunc(GL11.GL_LEQUAL); + //GL11.glEnable(GL11.GL_DEPTH_TEST); + + GL11.glPopMatrix(); + } + + icon = ((ItemMorvInABox)(LudicrousItems.morv_in_a_box)).nameoverlay; + + f = icon.getMinU(); + f1 = icon.getMaxU(); + f2 = icon.getMinV(); + f3 = icon.getMaxV(); + + GL11.glPushMatrix(); + + GL11.glTranslated(0, 0, 0.0004); + + ItemRenderer.renderItemIn2D(Tessellator.instance, f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1.008f/16.0f); + + GL11.glPopMatrix(); + + GL11.glDisable(GL11.GL_BLEND); + GL11.glPopMatrix(); + + GL11.glColor4f(1F, 1F, 1F, 1F); + } + + @SuppressWarnings("rawtypes") + public void getMorvy() { + if (!morvy.isComplete() || !morvy.getProperties().containsKey("textures")) + { + GameProfile gameprofile = MinecraftServer.getServer().func_152358_ax().func_152655_a(morvy.getName()); + + if (gameprofile != null) + { + Property property = (Property)Iterables.getFirst(gameprofile.getProperties().get("textures"), (Object)null); + + if (property == null) + { + gameprofile = MinecraftServer.getServer().func_147130_as().fillProfileProperties(gameprofile, true); + } + } + morvy = gameprofile; + } + + if (skin == null) { + //Lumberjack.info("2"); + Minecraft minecraft = Minecraft.getMinecraft(); + Map map = minecraft.func_152342_ad().func_152788_a(morvy); + //Map map = minecraft.func_152342_ad().func_152788_a(Minecraft.getMinecraft().thePlayer.getGameProfile()); + //Lumberjack.info(map); + + if (map.containsKey(Type.SKIN)) + { + //Lumberjack.info("3"); + skin = minecraft.func_152342_ad().func_152792_a((MinecraftProfileTexture)map.get(Type.SKIN), Type.SKIN); + } + } + } +} diff --git a/src/main/resources/assets/avaritia/lang/en_US.lang b/src/main/resources/assets/avaritia/lang/en_US.lang index 56d7d56..aa4a4ef 100644 --- a/src/main/resources/assets/avaritia/lang/en_US.lang +++ b/src/main/resources/assets/avaritia/lang/en_US.lang @@ -37,6 +37,7 @@ item.avaritia_fracturedore.name=Unknown Fractured Ore item.avaritia_fracturedore.prefix=Fractured item.avaritia_mattercluster.name=Matter Cluster item.avaritia_mattercluster.full.name=Critical Matter Cluster +item.morvinabox.name=Morv-In-A-Box # # Blocks tile.compressed_workbench.name=Compressed Crafting Table @@ -63,6 +64,8 @@ tooltip.skullfire_sword.desc=Beheads skeletons and scorches them black. tooltip.matter_cluster.desc=Use to deconstruct. tooltip.matter_cluster.desc2=Hold SHIFT for contents. tooltip.matter_cluster.counter=items +tooltip.morvinabox.desc=Instant housing +tooltip.morvinabox.subdesc=In Canada, Morvy comes in bags. # # Achievements achievement.avaritia:crystal_matrix=The First Seal diff --git a/src/main/resources/assets/avaritia/textures/items/morvinabox.png b/src/main/resources/assets/avaritia/textures/items/morvinabox.png new file mode 100644 index 0000000..671d8e1 Binary files /dev/null and b/src/main/resources/assets/avaritia/textures/items/morvinabox.png differ diff --git a/src/main/resources/assets/avaritia/textures/items/morvinabox2.png b/src/main/resources/assets/avaritia/textures/items/morvinabox2.png new file mode 100644 index 0000000..7f562f3 Binary files /dev/null and b/src/main/resources/assets/avaritia/textures/items/morvinabox2.png differ