diff --git a/src/main/java/fox/spiteful/avaritia/Avaritia.java b/src/main/java/fox/spiteful/avaritia/Avaritia.java index 2b8d91b..a264dc5 100644 --- a/src/main/java/fox/spiteful/avaritia/Avaritia.java +++ b/src/main/java/fox/spiteful/avaritia/Avaritia.java @@ -1,6 +1,7 @@ package fox.spiteful.avaritia; import cpw.mods.fml.common.Mod; +import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.Mod.Instance; import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.event.FMLInitializationEvent; @@ -17,6 +18,9 @@ public class Avaritia { @Instance public static Avaritia instance; + @SidedProxy(serverSide="fox.spiteful.avaritia.CommonProxy", clientSide="fox.spiteful.avaritia.ClientProxy") + public static CommonProxy proxy; + @EventHandler public void earlyGame(FMLPreInitializationEvent event){ instance = this; @@ -28,6 +32,7 @@ public class Avaritia { public void midGame(FMLInitializationEvent event){ Grinder.artsAndCrafts(); NetworkRegistry.INSTANCE.registerGuiHandler(instance, new GooeyHandler()); + proxy.makeThingsPretty(); } @EventHandler diff --git a/src/main/java/fox/spiteful/avaritia/ClientProxy.java b/src/main/java/fox/spiteful/avaritia/ClientProxy.java new file mode 100644 index 0000000..9046873 --- /dev/null +++ b/src/main/java/fox/spiteful/avaritia/ClientProxy.java @@ -0,0 +1,15 @@ +package fox.spiteful.avaritia; + +import fox.spiteful.avaritia.items.LudicrousItems; +import fox.spiteful.avaritia.pretties.FancyHaloRenderer; +import net.minecraftforge.client.MinecraftForgeClient; + +public class ClientProxy extends CommonProxy { + + @Override + public void makeThingsPretty() { + FancyHaloRenderer shiny = new FancyHaloRenderer(); + + MinecraftForgeClient.registerItemRenderer(LudicrousItems.resource, shiny); + } +} diff --git a/src/main/java/fox/spiteful/avaritia/CommonProxy.java b/src/main/java/fox/spiteful/avaritia/CommonProxy.java new file mode 100644 index 0000000..f62eb63 --- /dev/null +++ b/src/main/java/fox/spiteful/avaritia/CommonProxy.java @@ -0,0 +1,8 @@ +package fox.spiteful.avaritia; + +public class CommonProxy { + + public void makeThingsPretty() { + + } +} diff --git a/src/main/java/fox/spiteful/avaritia/blocks/BlockDireCrafting.java b/src/main/java/fox/spiteful/avaritia/blocks/BlockDireCrafting.java index 7aa0d29..5012f32 100644 --- a/src/main/java/fox/spiteful/avaritia/blocks/BlockDireCrafting.java +++ b/src/main/java/fox/spiteful/avaritia/blocks/BlockDireCrafting.java @@ -26,9 +26,9 @@ public class BlockDireCrafting extends Block { @Override public void registerBlockIcons (IIconRegister iconRegister) { - this.top = iconRegister.registerIcon("avaritia:dire_crafting_top"); - this.sides = iconRegister.registerIcon("avaritia:dire_crafting_side"); - this.bottom = iconRegister.registerIcon("avaritia:crystal_matrix_block"); + top = iconRegister.registerIcon("avaritia:dire_crafting_top"); + sides = iconRegister.registerIcon("avaritia:dire_crafting_side"); + bottom = iconRegister.registerIcon("avaritia:block_crystal_matrix"); } @Override diff --git a/src/main/java/fox/spiteful/avaritia/items/ItemResource.java b/src/main/java/fox/spiteful/avaritia/items/ItemResource.java index c2dee46..b46cfd7 100644 --- a/src/main/java/fox/spiteful/avaritia/items/ItemResource.java +++ b/src/main/java/fox/spiteful/avaritia/items/ItemResource.java @@ -17,6 +17,8 @@ public class ItemResource extends Item { @SideOnly(Side.CLIENT) public IIcon[] icons; + @SideOnly(Side.CLIENT) + public IIcon[] halo; public ItemResource(){ this.setHasSubtypes(true); @@ -31,6 +33,10 @@ public class ItemResource extends Item { for (int x = 0; x < types.length; x++) { icons[x] = ir.registerIcon("avaritia:" + "resource_" + types[x]); } + + halo = new IIcon[2]; + halo[0] = ir.registerIcon("avaritia:halo"); + halo[1] = ir.registerIcon("avaritia:halonoise"); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/fox/spiteful/avaritia/pretties/FancyHaloRenderer.java b/src/main/java/fox/spiteful/avaritia/pretties/FancyHaloRenderer.java new file mode 100644 index 0000000..bef89f6 --- /dev/null +++ b/src/main/java/fox/spiteful/avaritia/pretties/FancyHaloRenderer.java @@ -0,0 +1,97 @@ +package fox.spiteful.avaritia.pretties; + +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL12; + +import fox.spiteful.avaritia.items.ItemResource; +import fox.spiteful.avaritia.items.LudicrousItems; + +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.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraftforge.client.IItemRenderer; + +public class FancyHaloRenderer implements IItemRenderer { + + @Override + public boolean handleRenderType(ItemStack item, ItemRenderType type) { + int meta = item.getItemDamage(); + if (meta < 2) { return false; } + + switch(type) { + case INVENTORY: + return true; + default: + return false; + } + } + + @Override + public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { + return false; + } + + @Override + public void renderItem(ItemRenderType type, ItemStack item, Object... data) { + RenderItem r = RenderItem.getInstance(); + Minecraft mc = Minecraft.getMinecraft(); + Tessellator t = Tessellator.instance; + IIcon[] halos = ((ItemResource)LudicrousItems.resource).halo; + IIcon halo = halos[1]; + int spread = 8; + int meta = item.getItemDamage(); + + 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; + } + + switch(type) { + case ENTITY: + 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); + + t.startDrawingQuads(); + t.addVertexWithUV(0-spread, 0-spread, 0, halo.getMinU(), halo.getMinV()); + t.addVertexWithUV(0-spread, 16+spread, 0, halo.getMinU(), halo.getMaxV()); + t.addVertexWithUV(16+spread, 16+spread, 0, halo.getMaxU(), halo.getMaxV()); + t.addVertexWithUV(16+spread, 0-spread, 0, halo.getMaxU(), halo.getMinV()); + t.draw(); + + 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; + default: + break; + } + } +} diff --git a/src/main/resources/assets/avaritia/textures/blocks/block_crystal_matrix.png b/src/main/resources/assets/avaritia/textures/blocks/block_crystal_matrix.png index ef8454b..c80ba4b 100644 Binary files a/src/main/resources/assets/avaritia/textures/blocks/block_crystal_matrix.png and b/src/main/resources/assets/avaritia/textures/blocks/block_crystal_matrix.png differ diff --git a/src/main/resources/assets/avaritia/textures/blocks/block_crystal_matrix.png.mcmeta b/src/main/resources/assets/avaritia/textures/blocks/block_crystal_matrix.png.mcmeta index 4a61159..203da75 100644 --- a/src/main/resources/assets/avaritia/textures/blocks/block_crystal_matrix.png.mcmeta +++ b/src/main/resources/assets/avaritia/textures/blocks/block_crystal_matrix.png.mcmeta @@ -1,14 +1,37 @@ { "animation": { - "frametime": 3, + "frametime": 1, "frames": [ 0, - 0, 0, 0, 1, + 1, + 1, + 2, 2, - 1 + 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/blocks/block_neutronium.png b/src/main/resources/assets/avaritia/textures/blocks/block_neutronium.png index 873e74e..646b03b 100644 Binary files a/src/main/resources/assets/avaritia/textures/blocks/block_neutronium.png and b/src/main/resources/assets/avaritia/textures/blocks/block_neutronium.png differ diff --git a/src/main/resources/assets/avaritia/textures/blocks/dire_crafting_side.png b/src/main/resources/assets/avaritia/textures/blocks/dire_crafting_side.png index 7c55134..6bc2a9e 100644 Binary files a/src/main/resources/assets/avaritia/textures/blocks/dire_crafting_side.png and b/src/main/resources/assets/avaritia/textures/blocks/dire_crafting_side.png differ diff --git a/src/main/resources/assets/avaritia/textures/blocks/dire_crafting_side.png.mcmeta b/src/main/resources/assets/avaritia/textures/blocks/dire_crafting_side.png.mcmeta index 4a61159..6900c44 100644 --- a/src/main/resources/assets/avaritia/textures/blocks/dire_crafting_side.png.mcmeta +++ b/src/main/resources/assets/avaritia/textures/blocks/dire_crafting_side.png.mcmeta @@ -1,14 +1,35 @@ { "animation": { - "frametime": 3, + "frametime": 1, "frames": [ 0, - 0, 0, 0, 1, + 1, + 1, + 2, 2, - 1 + 2, + 3, + 3, + 4, + 4, + 5, + 6, + 7, + 6, + 5, + 4, + 4, + 3, + 3, + 2, + 2, + 2, + 1, + 1, + 1, ] } } diff --git a/src/main/resources/assets/avaritia/textures/blocks/dire_crafting_top.png b/src/main/resources/assets/avaritia/textures/blocks/dire_crafting_top.png index 92fbf15..c222063 100644 Binary files a/src/main/resources/assets/avaritia/textures/blocks/dire_crafting_top.png and b/src/main/resources/assets/avaritia/textures/blocks/dire_crafting_top.png differ diff --git a/src/main/resources/assets/avaritia/textures/items/halo.png b/src/main/resources/assets/avaritia/textures/items/halo.png new file mode 100644 index 0000000..5c6f1c5 Binary files /dev/null and b/src/main/resources/assets/avaritia/textures/items/halo.png differ diff --git a/src/main/resources/assets/avaritia/textures/items/halonoise.png b/src/main/resources/assets/avaritia/textures/items/halonoise.png new file mode 100644 index 0000000..ab44181 Binary files /dev/null and b/src/main/resources/assets/avaritia/textures/items/halonoise.png differ diff --git a/src/main/resources/assets/avaritia/textures/items/halonoise.png.mcmeta b/src/main/resources/assets/avaritia/textures/items/halonoise.png.mcmeta new file mode 100644 index 0000000..24f9c2f --- /dev/null +++ b/src/main/resources/assets/avaritia/textures/items/halonoise.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +}