diff --git a/src/main/java/fox/spiteful/avaritia/ClientProxy.java b/src/main/java/fox/spiteful/avaritia/ClientProxy.java index bb161c8..c14484c 100644 --- a/src/main/java/fox/spiteful/avaritia/ClientProxy.java +++ b/src/main/java/fox/spiteful/avaritia/ClientProxy.java @@ -11,5 +11,6 @@ public class ClientProxy extends CommonProxy { FancyHaloRenderer shiny = new FancyHaloRenderer(); MinecraftForgeClient.registerItemRenderer(LudicrousItems.resource, shiny); + MinecraftForgeClient.registerItemRenderer(LudicrousItems.singularity, shiny); } } diff --git a/src/main/java/fox/spiteful/avaritia/items/ItemSingularity.java b/src/main/java/fox/spiteful/avaritia/items/ItemSingularity.java index eb33375..3f24769 100644 --- a/src/main/java/fox/spiteful/avaritia/items/ItemSingularity.java +++ b/src/main/java/fox/spiteful/avaritia/items/ItemSingularity.java @@ -2,9 +2,11 @@ package fox.spiteful.avaritia.items; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import java.util.List; @@ -12,7 +14,10 @@ import java.util.List; public class ItemSingularity extends Item { public static final String[] types = new String[]{"iron", "gold", "lapis"}; - public static final int[] colors = new int[]{0x7F7F7F, 0xFFFF00, 0x0000FF}; + public static final int[] colors = new int[]{0xEFEFEF, 0xeaee57, 0x5a82e2}; + public static final int[] colors2 = new int[]{0x7F7F7F, 0xdba213, 0x224baf}; + public static IIcon background; + public static IIcon foreground; public ItemSingularity(){ this.setHasSubtypes(true); @@ -24,7 +29,9 @@ public class ItemSingularity extends Item { @SideOnly(Side.CLIENT) @Override public int getColorFromItemStack(ItemStack itemstack, int renderpass) { - return colors[itemstack.getItemDamage() % colors.length]; + //System.out.println(foreground); + return renderpass == 0 ? colors2[itemstack.getItemDamage() % colors.length] : colors[itemstack.getItemDamage() % colors2.length]; + //return 0xFFFFFF; } @Override @@ -40,4 +47,25 @@ public class ItemSingularity extends Item { list.add(new ItemStack(item, 1, j)); } } + + @SideOnly(Side.CLIENT) + @Override + public void registerIcons(IIconRegister ir) { + foreground = ir.registerIcon("avaritia:singularity"); + background = ir.registerIcon("avaritia:singularity2"); + } + + @Override + public IIcon getIcon(ItemStack stack, int pass) + { + if (pass == 0) { return background; } + return foreground; + } + + @SideOnly(Side.CLIENT) + @Override + public boolean requiresMultipleRenderPasses() + { + return true; + } } diff --git a/src/main/java/fox/spiteful/avaritia/render/FancyHaloRenderer.java b/src/main/java/fox/spiteful/avaritia/render/FancyHaloRenderer.java index 4bd2c5a..dc9980e 100644 --- a/src/main/java/fox/spiteful/avaritia/render/FancyHaloRenderer.java +++ b/src/main/java/fox/spiteful/avaritia/render/FancyHaloRenderer.java @@ -1,5 +1,7 @@ package fox.spiteful.avaritia.render; +import java.util.Random; + import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; @@ -10,16 +12,26 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.RenderItem; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraftforge.client.IItemRenderer; public class FancyHaloRenderer implements IItemRenderer { + public Random rand = new Random(); + @Override public boolean handleRenderType(ItemStack item, ItemRenderType type) { int meta = item.getItemDamage(); - if (meta < 2 || meta > 4) { return false; } + Item itype = item.getItem(); + if (itype == LudicrousItems.resource) { + if (meta < 2) { return false; } + } else if (itype == LudicrousItems.singularity) { + + } else { + return false; + } switch(type) { case INVENTORY: @@ -43,23 +55,34 @@ public class FancyHaloRenderer implements IItemRenderer { IIcon halo = halos[1]; int spread = 8; int meta = item.getItemDamage(); + Item itype = item.getItem(); - switch(meta) { - case 2: - GL11.glColor4d(1.0, 1.0, 1.0, 0.2); - spread = 8; - break; - case 3: - GL11.glColor4d(1.0, 1.0, 1.0, 0.3); - spread = 8; - break; - case 4: - GL11.glColor4d(1.0, 1.0, 1.0, 0.6); - spread = 8; - break; - default: - GL11.glColor4d(1.0, 1.0, 1.0, 1.0); - spread = 5; + if (itype == LudicrousItems.resource) { + switch(meta) { + case 2: + GL11.glColor4d(1.0, 1.0, 1.0, 0.2); + spread = 8; + break; + case 3: + GL11.glColor4d(1.0, 1.0, 1.0, 0.3); + spread = 8; + break; + case 4: + GL11.glColor4d(1.0, 1.0, 1.0, 0.6); + spread = 8; + break; + case 5: + case 6: + GL11.glColor4d(0, 0, 0, 1.0); + spread = 10; + break; + default: + GL11.glColor4d(1.0, 1.0, 1.0, 1.0); + spread = 5; + } + } else if (itype == LudicrousItems.singularity) { + GL11.glColor4d(0, 0, 0, 1.0); + spread = 4; } switch(type) { @@ -81,12 +104,37 @@ public class FancyHaloRenderer implements IItemRenderer { t.addVertexWithUV(16+spread, 0-spread, 0, halo.getMaxU(), halo.getMinV()); t.draw(); - GL11.glEnable(GL11.GL_ALPHA_TEST); + if (itype == LudicrousItems.resource && (meta == 5 || meta == 6)) { + GL11.glPushMatrix(); + double xs = (rand.nextGaussian() * 0.15) + 0.95; + double ox = (1-xs)/2.0; + GL11.glEnable(GL11.GL_BLEND); + GL11.glTranslated(ox*16.0, ox*16.0, 1.0); + GL11.glScaled(xs, xs, 1.0); + + //GL11.glColor4d(1.0, 1.0, 1.0, 0.3); + + IIcon icon = item.getItem().getIcon(item, 0); + + t.startDrawingQuads(); + t.setColorRGBA_F(1.0f, 1.0f, 1.0f, 0.6f); + t.addVertexWithUV(0-ox, 0-ox, 0, icon.getMinU(), icon.getMinV()); + t.addVertexWithUV(0-ox, 16+ox, 0, icon.getMinU(), icon.getMaxV()); + t.addVertexWithUV(16+ox, 16+ox, 0, icon.getMaxU(), icon.getMaxV()); + t.addVertexWithUV(16+ox, 0-ox, 0, icon.getMaxU(), icon.getMinV()); + t.draw(); + + GL11.glPopMatrix(); + } + 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.renderItemIntoGUI(mc.fontRenderer, mc.getTextureManager(), item, 0, 0, true); + r.renderWithColor = true; + GL11.glDisable(GL11.GL_BLEND); GL11.glPopMatrix(); break; diff --git a/src/main/resources/assets/avaritia/textures/items/infinity_pickaxe.png b/src/main/resources/assets/avaritia/textures/items/infinity_pickaxe.png index 759d5c8..f611067 100644 Binary files a/src/main/resources/assets/avaritia/textures/items/infinity_pickaxe.png and b/src/main/resources/assets/avaritia/textures/items/infinity_pickaxe.png differ diff --git a/src/main/resources/assets/avaritia/textures/items/infinity_pickaxe.png.mcmeta b/src/main/resources/assets/avaritia/textures/items/infinity_pickaxe.png.mcmeta new file mode 100644 index 0000000..203da75 --- /dev/null +++ b/src/main/resources/assets/avaritia/textures/items/infinity_pickaxe.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/resource_infinity_catalyst.png b/src/main/resources/assets/avaritia/textures/items/resource_infinity_catalyst.png index 0640ceb..bc0b207 100644 Binary files a/src/main/resources/assets/avaritia/textures/items/resource_infinity_catalyst.png and b/src/main/resources/assets/avaritia/textures/items/resource_infinity_catalyst.png differ diff --git a/src/main/resources/assets/avaritia/textures/items/resource_infinity_catalyst.png.mcmeta b/src/main/resources/assets/avaritia/textures/items/resource_infinity_catalyst.png.mcmeta new file mode 100644 index 0000000..203da75 --- /dev/null +++ b/src/main/resources/assets/avaritia/textures/items/resource_infinity_catalyst.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/resource_infinity_ingot.png b/src/main/resources/assets/avaritia/textures/items/resource_infinity_ingot.png index 9b94897..94480d8 100644 Binary files a/src/main/resources/assets/avaritia/textures/items/resource_infinity_ingot.png and b/src/main/resources/assets/avaritia/textures/items/resource_infinity_ingot.png differ diff --git a/src/main/resources/assets/avaritia/textures/items/resource_infinity_ingot.png.mcmeta b/src/main/resources/assets/avaritia/textures/items/resource_infinity_ingot.png.mcmeta new file mode 100644 index 0000000..203da75 --- /dev/null +++ b/src/main/resources/assets/avaritia/textures/items/resource_infinity_ingot.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/singularity.png b/src/main/resources/assets/avaritia/textures/items/singularity.png index a50c291..8829d4d 100644 Binary files a/src/main/resources/assets/avaritia/textures/items/singularity.png and b/src/main/resources/assets/avaritia/textures/items/singularity.png differ diff --git a/src/main/resources/assets/avaritia/textures/items/singularity.png.mcmeta b/src/main/resources/assets/avaritia/textures/items/singularity.png.mcmeta new file mode 100644 index 0000000..24f9c2f --- /dev/null +++ b/src/main/resources/assets/avaritia/textures/items/singularity.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} diff --git a/src/main/resources/assets/avaritia/textures/items/singularity2.png b/src/main/resources/assets/avaritia/textures/items/singularity2.png new file mode 100644 index 0000000..3934f8e Binary files /dev/null and b/src/main/resources/assets/avaritia/textures/items/singularity2.png differ diff --git a/src/main/resources/assets/avaritia/textures/items/singularity2.png.mcmeta b/src/main/resources/assets/avaritia/textures/items/singularity2.png.mcmeta new file mode 100644 index 0000000..0645f48 --- /dev/null +++ b/src/main/resources/assets/avaritia/textures/items/singularity2.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +}