From 00306fcc07231e39ad27957c8e61fac5bdd20d00 Mon Sep 17 00:00:00 2001 From: Alex Spinks Date: Sat, 18 Jul 2015 20:36:51 +0100 Subject: [PATCH] Record breaking ender puns --- .../java/fox/spiteful/avaritia/Avaritia.java | 1 + .../fox/spiteful/avaritia/ClientProxy.java | 1 + .../fox/spiteful/avaritia/compat/Compat.java | 15 +++ .../spiteful/avaritia/crafting/Grinder.java | 35 ++++++- .../avaritia/items/ItemEndestPearl.java | 80 ++++++++++++++++ .../spiteful/avaritia/items/ItemResource.java | 79 ++++++++++++--- .../avaritia/items/ItemSingularity.java | 36 ++++++- .../avaritia/items/LudicrousItems.java | 9 +- .../avaritia/render/CosmicItemRenderer.java | 12 --- .../avaritia/render/FancyHaloRenderer.java | 90 ++++++++---------- .../avaritia/render/IHaloRenderItem.java | 20 ++++ .../render/LudicrousRenderEvents.java | 4 - .../resources/assets/avaritia/lang/en_US.lang | 10 +- .../avaritia/textures/items/endestpearl.png | Bin 0 -> 3985 bytes .../textures/items/endestpearl.png.mcmeta | 28 ++++++ .../items/resource_record_fragment.png | Bin 0 -> 3095 bytes 16 files changed, 330 insertions(+), 90 deletions(-) create mode 100644 src/main/java/fox/spiteful/avaritia/items/ItemEndestPearl.java create mode 100644 src/main/java/fox/spiteful/avaritia/render/IHaloRenderItem.java create mode 100644 src/main/resources/assets/avaritia/textures/items/endestpearl.png create mode 100644 src/main/resources/assets/avaritia/textures/items/endestpearl.png.mcmeta create mode 100644 src/main/resources/assets/avaritia/textures/items/resource_record_fragment.png diff --git a/src/main/java/fox/spiteful/avaritia/Avaritia.java b/src/main/java/fox/spiteful/avaritia/Avaritia.java index 4e489e6..9808341 100644 --- a/src/main/java/fox/spiteful/avaritia/Avaritia.java +++ b/src/main/java/fox/spiteful/avaritia/Avaritia.java @@ -66,6 +66,7 @@ public class Avaritia { public void endGame(FMLPostInitializationEvent event){ Compat.compatify(); Mincer.countThoseCalories(); + Grinder.lastMinuteChanges(); Achievements.achieve(); } } \ No newline at end of file diff --git a/src/main/java/fox/spiteful/avaritia/ClientProxy.java b/src/main/java/fox/spiteful/avaritia/ClientProxy.java index 9ffa98f..3580633 100644 --- a/src/main/java/fox/spiteful/avaritia/ClientProxy.java +++ b/src/main/java/fox/spiteful/avaritia/ClientProxy.java @@ -18,6 +18,7 @@ public class ClientProxy extends CommonProxy { MinecraftForgeClient.registerItemRenderer(LudicrousItems.resource, shiny); MinecraftForgeClient.registerItemRenderer(LudicrousItems.singularity, shiny); + MinecraftForgeClient.registerItemRenderer(LudicrousItems.endest_pearl, shiny); CosmicItemRenderer sparkly = new CosmicItemRenderer(); diff --git a/src/main/java/fox/spiteful/avaritia/compat/Compat.java b/src/main/java/fox/spiteful/avaritia/compat/Compat.java index 329342a..39fa026 100644 --- a/src/main/java/fox/spiteful/avaritia/compat/Compat.java +++ b/src/main/java/fox/spiteful/avaritia/compat/Compat.java @@ -27,6 +27,7 @@ public class Compat { public static boolean bigReactors = false; public static boolean ticon = false; public static boolean pe = false; + public static boolean mfr = false; public static void census(){ nei = Loader.isModLoaded("NotEnoughItems"); @@ -42,6 +43,7 @@ public class Compat { bigReactors = Loader.isModLoaded("BigReactors"); ticon = Loader.isModLoaded("TConstruct"); pe = Loader.isModLoaded("ProjectE"); + mfr = Loader.isModLoaded("MineFactoryReloaded"); } public static void compatify(){ @@ -219,6 +221,19 @@ public class Compat { pe = false; } } + + if(mfr){ + try { + Item ponk = getItem("MineFactoryReloaded", "mfr.pinkslime"); + ItemStack pank = new ItemStack(ponk, 1, 1); + Grinder.catalyst.getInput().add(pank); + } + catch (Throwable e){ + Lumberjack.log(Level.INFO, "Avaritia walked into the laser drill."); + e.printStackTrace(); + mfr = false; + } + } } public static Block getBlock(String mod, String block) throws ItemNotFoundException { diff --git a/src/main/java/fox/spiteful/avaritia/crafting/Grinder.java b/src/main/java/fox/spiteful/avaritia/crafting/Grinder.java index 38868c0..a8ec3df 100644 --- a/src/main/java/fox/spiteful/avaritia/crafting/Grinder.java +++ b/src/main/java/fox/spiteful/avaritia/crafting/Grinder.java @@ -2,11 +2,14 @@ package fox.spiteful.avaritia.crafting; import cpw.mods.fml.common.registry.GameRegistry; import fox.spiteful.avaritia.blocks.LudicrousBlocks; +import fox.spiteful.avaritia.compat.Compat; import fox.spiteful.avaritia.items.LudicrousItems; import net.minecraft.enchantment.Enchantment; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.CraftingManager; +import net.minecraft.item.crafting.IRecipe; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapelessOreRecipe; @@ -61,7 +64,7 @@ public class Grinder { new ItemStack(LudicrousItems.singularity, 1, 0), new ItemStack(LudicrousItems.singularity, 1, 1), new ItemStack(LudicrousItems.singularity, 1, 2), new ItemStack(LudicrousItems.singularity, 1, 3), new ItemStack(LudicrousItems.singularity, 1, 4), new ItemStack(LudicrousItems.ultimate_stew), - new ItemStack(LudicrousItems.cosmic_meatballs)}); + new ItemStack(LudicrousItems.cosmic_meatballs), new ItemStack(LudicrousItems.endest_pearl)}); ItemStack result = new ItemStack(LudicrousItems.infinity_pickaxe, 1); result.addEnchantment(Enchantment.fortune, 10); @@ -134,5 +137,35 @@ public class Grinder { if(!OreDictionary.getOres("blockPlatinum").isEmpty()){ catalyst.getInput().add(OreDictionary.getOres("blockPlatinum")); } + + ExtremeCraftingManager.getInstance().addExtremeShapedOreRecipe(new ItemStack(LudicrousItems.endest_pearl), new Object[]{ + " EEE ", + " EEPPPEE ", + " EPPPPPE ", + "EPPPNPPPE", + "EPPNSNPPE", + "EPPPNPPPE", + " EPPPPPE ", + " EEPPPEE ", + " EEE ", + 'E', new ItemStack(Blocks.end_stone), + 'P', new ItemStack(Items.ender_pearl), + 'S', new ItemStack(Items.nether_star), + 'N', new ItemStack(LudicrousItems.resource, 1, 4)}); + } + + public static void lastMinuteChanges(){ + if (Compat.mfr) { + catalyst.getInput().add(OreDictionary.getOres("record")); + } else { + catalyst.getInput().add(new ItemStack(LudicrousItems.resource, 1, 7)); + IRecipe smashysmashy; + //if (Compat.botan) { + // smashysmashy = new ShapelessOreRecipe(new ItemStack(LudicrousItems.resource, 4, 7), "record"); + //} else { + smashysmashy = new ShapelessOreRecipe(new ItemStack(LudicrousItems.resource, 8, 7), "record"); + //} + GameRegistry.addRecipe(smashysmashy); + } } } diff --git a/src/main/java/fox/spiteful/avaritia/items/ItemEndestPearl.java b/src/main/java/fox/spiteful/avaritia/items/ItemEndestPearl.java new file mode 100644 index 0000000..f92e274 --- /dev/null +++ b/src/main/java/fox/spiteful/avaritia/items/ItemEndestPearl.java @@ -0,0 +1,80 @@ +package fox.spiteful.avaritia.items; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import fox.spiteful.avaritia.Avaritia; +import fox.spiteful.avaritia.render.IHaloRenderItem; +import net.minecraft.entity.item.EntityEnderPearl; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.EnumRarity; +import net.minecraft.item.ItemEnderPearl; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; + +public class ItemEndestPearl extends ItemEnderPearl implements IHaloRenderItem { + + public ItemEndestPearl() { + this.setUnlocalizedName("avaritia_endest_pearl"); + this.setTextureName("avaritia:endestpearl"); + this.maxStackSize = 16; + this.setCreativeTab(Avaritia.tab); + } + + @Override + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) + { + if (player.capabilities.isCreativeMode) + { + return stack; + } + else + { + --stack.stackSize; + world.playSoundAtEntity(player, "random.bow", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F)); + + if (!world.isRemote) + { + world.spawnEntityInWorld(new EntityEnderPearl(world, player)); + } + + return stack; + } + } + + @Override + public EnumRarity getRarity(ItemStack stack) + { + return EnumRarity.uncommon; + } + + @Override + @SideOnly(Side.CLIENT) + public boolean drawHalo(ItemStack stack) { + return true; + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getHaloTexture(ItemStack stack) { + return ((ItemResource)LudicrousItems.resource).halo[0]; + } + + @Override + @SideOnly(Side.CLIENT) + public int getHaloSize(ItemStack stack) { + return 4; + } + + @Override + @SideOnly(Side.CLIENT) + public boolean drawPulseEffect(ItemStack stack) { + return true; + } + + @Override + @SideOnly(Side.CLIENT) + public int getHaloColour(ItemStack stack) { + return 0xFF000000; + } +} diff --git a/src/main/java/fox/spiteful/avaritia/items/ItemResource.java b/src/main/java/fox/spiteful/avaritia/items/ItemResource.java index 2201c07..c0c94a5 100644 --- a/src/main/java/fox/spiteful/avaritia/items/ItemResource.java +++ b/src/main/java/fox/spiteful/avaritia/items/ItemResource.java @@ -1,12 +1,14 @@ package fox.spiteful.avaritia.items; import fox.spiteful.avaritia.Avaritia; +import fox.spiteful.avaritia.render.IHaloRenderItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import cpw.mods.fml.relauncher.Side; @@ -15,10 +17,10 @@ import net.minecraft.util.StatCollector; import java.util.List; -public class ItemResource extends Item { +public class ItemResource extends Item implements IHaloRenderItem { private static final String[] types = new String[]{"diamond_lattice", "crystal_matrix_ingot", "neutron_pile", - "neutron_nugget", "neutronium_ingot", "infinity_catalyst", "infinity_ingot"}; + "neutron_nugget", "neutronium_ingot", "infinity_catalyst", "infinity_ingot", "record_fragment"}; @SideOnly(Side.CLIENT) public IIcon[] icons; @@ -45,20 +47,14 @@ public class ItemResource extends Item { halo[1] = ir.registerIcon("avaritia:halonoise"); } - @Override + @SuppressWarnings({ "unchecked", "rawtypes" }) + @Override public void addInformation(ItemStack item, EntityPlayer player, List tooltip, boolean wut) { - switch(item.getItemDamage()) { - case 1: - tooltip.add(StatCollector.translateToLocal("tooltip.crystal_matrix.desc")); - break; - case 2: - tooltip.add(StatCollector.translateToLocal("tooltip.neutron_pile.desc")); - break; - case 4: - tooltip.add(StatCollector.translateToLocal("tooltip.neutronium.desc")); - break; - } + int meta = item.getItemDamage(); + if (meta != 0) { + tooltip.add(EnumChatFormatting.DARK_GRAY +""+ EnumChatFormatting.ITALIC + StatCollector.translateToLocal("tooltip."+types[meta]+".desc")); + } } @SideOnly(Side.CLIENT) @@ -72,7 +68,8 @@ public class ItemResource extends Item { return super.getUnlocalizedName() + "." + types[i]; } - @SideOnly(Side.CLIENT) + @SuppressWarnings({ "unchecked", "rawtypes" }) + @SideOnly(Side.CLIENT) @Override public void getSubItems(Item item, CreativeTabs tab, List list) { for (int j = 0; j < types.length; ++j) { @@ -99,4 +96,56 @@ public class ItemResource extends Item { return EnumRarity.common; } } + + @Override + @SideOnly(Side.CLIENT) + public boolean drawHalo(ItemStack stack) { + int meta = stack.getItemDamage(); + return (meta >= 2 && meta <= 6); + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getHaloTexture(ItemStack stack) { + int meta = stack.getItemDamage(); + if (meta == 2 || meta == 3 || meta == 4) { + return halo[1]; + } + return halo[0]; + } + + @Override + @SideOnly(Side.CLIENT) + public int getHaloSize(ItemStack stack) { + int meta = stack.getItemDamage(); + switch(meta) { + case 5: + case 6: + return 10; + } + return 8; + } + + @Override + @SideOnly(Side.CLIENT) + public boolean drawPulseEffect(ItemStack stack) { + int meta = stack.getItemDamage(); + return meta == 5 || meta == 6; + } + + @Override + @SideOnly(Side.CLIENT) + public int getHaloColour(ItemStack stack) { + int meta = stack.getItemDamage(); + if (meta == 2) { + return 0x33FFFFFF; + } + if (meta == 3) { + return 0x4DFFFFFF; + } + if (meta == 4) { + return 0x99FFFFFF; + } + return 0xFF000000; + } } diff --git a/src/main/java/fox/spiteful/avaritia/items/ItemSingularity.java b/src/main/java/fox/spiteful/avaritia/items/ItemSingularity.java index 9ae1f04..fee1ae3 100644 --- a/src/main/java/fox/spiteful/avaritia/items/ItemSingularity.java +++ b/src/main/java/fox/spiteful/avaritia/items/ItemSingularity.java @@ -3,6 +3,7 @@ package fox.spiteful.avaritia.items; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import fox.spiteful.avaritia.Avaritia; +import fox.spiteful.avaritia.render.IHaloRenderItem; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; @@ -13,7 +14,7 @@ import net.minecraft.util.MathHelper; import java.util.List; -public class ItemSingularity extends Item { +public class ItemSingularity extends Item implements IHaloRenderItem { public static final String[] types = new String[]{"iron", "gold", "lapis", "redstone", "quartz", "copper", "tin", "lead", "silver"}; @@ -46,7 +47,8 @@ public class ItemSingularity extends Item { return "item.singularity_" + types[i]; } - @SideOnly(Side.CLIENT) + @SuppressWarnings({ "unchecked", "rawtypes" }) + @SideOnly(Side.CLIENT) @Override public void getSubItems(Item item, CreativeTabs tab, List list) { for (int j = 0; j < types.length; ++j) { @@ -80,4 +82,34 @@ public class ItemSingularity extends Item { { return EnumRarity.uncommon; } + + @Override + @SideOnly(Side.CLIENT) + public boolean drawHalo(ItemStack stack) { + return true; + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getHaloTexture(ItemStack stack) { + return ((ItemResource)LudicrousItems.resource).halo[0]; + } + + @Override + @SideOnly(Side.CLIENT) + public int getHaloSize(ItemStack stack) { + return 4; + } + + @Override + @SideOnly(Side.CLIENT) + public boolean drawPulseEffect(ItemStack stack) { + return false; + } + + @Override + @SideOnly(Side.CLIENT) + public int getHaloColour(ItemStack stack) { + return 0xFF000000; + } } diff --git a/src/main/java/fox/spiteful/avaritia/items/LudicrousItems.java b/src/main/java/fox/spiteful/avaritia/items/LudicrousItems.java index 5721555..d05ac1c 100644 --- a/src/main/java/fox/spiteful/avaritia/items/LudicrousItems.java +++ b/src/main/java/fox/spiteful/avaritia/items/LudicrousItems.java @@ -22,12 +22,14 @@ public class LudicrousItems { public static Item infinity_pickaxe; public static Item infinity_sword; public static Item skull_sword; + public static Item ultimate_stew; + public static Item cosmic_meatballs; + public static Item endest_pearl; public static Item akashic_record; public static Item armok_orb; - public static Item ultimate_stew; - public static Item cosmic_meatballs; + public static EnumRarity cosmic = EnumHelper.addRarity("COSMIC", EnumChatFormatting.RED, "Cosmic"); @@ -42,10 +44,11 @@ public class LudicrousItems { 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"); } } diff --git a/src/main/java/fox/spiteful/avaritia/render/CosmicItemRenderer.java b/src/main/java/fox/spiteful/avaritia/render/CosmicItemRenderer.java index 944804a..977a60f 100644 --- a/src/main/java/fox/spiteful/avaritia/render/CosmicItemRenderer.java +++ b/src/main/java/fox/spiteful/avaritia/render/CosmicItemRenderer.java @@ -1,21 +1,11 @@ package fox.spiteful.avaritia.render; -import java.nio.FloatBuffer; - -import org.apache.logging.log4j.Level; -import org.lwjgl.BufferUtils; import org.lwjgl.opengl.ARBShaderObjects; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import org.lwjgl.opengl.GL13; - -import scala.actors.threadpool.Arrays; import cpw.mods.fml.relauncher.ReflectionHelper; -import fox.spiteful.avaritia.Lumberjack; -import fox.spiteful.avaritia.items.LudicrousItems; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.EntityRenderer; import net.minecraft.client.renderer.ItemRenderer; @@ -27,7 +17,6 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; -import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.IItemRenderer; public class CosmicItemRenderer implements IItemRenderer { @@ -174,7 +163,6 @@ public class CosmicItemRenderer implements IItemRenderer { } public void render(ItemStack item) { - int dmg = item.getItemDamage(); int passes = 1; if (item.getItem().requiresMultipleRenderPasses()) { diff --git a/src/main/java/fox/spiteful/avaritia/render/FancyHaloRenderer.java b/src/main/java/fox/spiteful/avaritia/render/FancyHaloRenderer.java index dc9980e..6167ea1 100644 --- a/src/main/java/fox/spiteful/avaritia/render/FancyHaloRenderer.java +++ b/src/main/java/fox/spiteful/avaritia/render/FancyHaloRenderer.java @@ -5,9 +5,6 @@ import java.util.Random; 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; @@ -23,14 +20,13 @@ public class FancyHaloRenderer implements IItemRenderer { @Override public boolean handleRenderType(ItemStack item, ItemRenderType type) { - int meta = item.getItemDamage(); Item itype = item.getItem(); - if (itype == LudicrousItems.resource) { - if (meta < 2) { return false; } - } else if (itype == LudicrousItems.singularity) { + if (itype instanceof IHaloRenderItem) { + IHaloRenderItem ihri = (IHaloRenderItem)itype; - } else { - return false; + if (!(ihri.drawHalo(item) || ihri.drawPulseEffect(item))) { + return false; + } } switch(type) { @@ -48,42 +44,28 @@ public class FancyHaloRenderer implements IItemRenderer { @Override public void renderItem(ItemRenderType type, ItemStack item, Object... data) { + boolean renderHalo = false; + boolean renderPulse = false; + + int spread = 0; + IIcon halo = null; + int haloColour = 0; + + Item itype = item.getItem(); + if (itype instanceof IHaloRenderItem) { + IHaloRenderItem ihri = (IHaloRenderItem)itype; + + spread = ihri.getHaloSize(item); + halo = ihri.getHaloTexture(item); + haloColour = ihri.getHaloColour(item); + + renderHalo = ihri.drawHalo(item); + renderPulse = ihri.drawPulseEffect(item); + } + 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(); - Item itype = item.getItem(); - - 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) { case ENTITY: @@ -97,14 +79,22 @@ public class FancyHaloRenderer implements IItemRenderer { 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(); + if (renderHalo) { + float ca = (float)(haloColour >> 24 & 255) / 255.0F; + float cr = (float)(haloColour >> 16 & 255) / 255.0F; + float cg = (float)(haloColour >> 8 & 255) / 255.0F; + float cb = (float)(haloColour & 255) / 255.0F; + GL11.glColor4f(cr, cg, cb, ca); + + 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(); + } - if (itype == LudicrousItems.resource && (meta == 5 || meta == 6)) { + if (renderPulse) { GL11.glPushMatrix(); double xs = (rand.nextGaussian() * 0.15) + 0.95; double ox = (1-xs)/2.0; @@ -112,8 +102,6 @@ public class FancyHaloRenderer implements IItemRenderer { 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(); diff --git a/src/main/java/fox/spiteful/avaritia/render/IHaloRenderItem.java b/src/main/java/fox/spiteful/avaritia/render/IHaloRenderItem.java new file mode 100644 index 0000000..7f9319e --- /dev/null +++ b/src/main/java/fox/spiteful/avaritia/render/IHaloRenderItem.java @@ -0,0 +1,20 @@ +package fox.spiteful.avaritia.render; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; + +public interface IHaloRenderItem { + + @SideOnly(Side.CLIENT) + public boolean drawHalo(ItemStack stack); + @SideOnly(Side.CLIENT) + public IIcon getHaloTexture(ItemStack stack); + @SideOnly(Side.CLIENT) + public int getHaloSize(ItemStack stack); + @SideOnly(Side.CLIENT) + public boolean drawPulseEffect(ItemStack stack); + @SideOnly(Side.CLIENT) + public int getHaloColour(ItemStack stack); +} diff --git a/src/main/java/fox/spiteful/avaritia/render/LudicrousRenderEvents.java b/src/main/java/fox/spiteful/avaritia/render/LudicrousRenderEvents.java index 2fde994..8c142cb 100644 --- a/src/main/java/fox/spiteful/avaritia/render/LudicrousRenderEvents.java +++ b/src/main/java/fox/spiteful/avaritia/render/LudicrousRenderEvents.java @@ -2,15 +2,11 @@ package fox.spiteful.avaritia.render; import java.nio.FloatBuffer; -import org.apache.logging.log4j.Level; import org.lwjgl.BufferUtils; -import scala.actors.threadpool.Arrays; - import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent.Phase; import cpw.mods.fml.common.gameevent.TickEvent.RenderTickEvent; -import fox.spiteful.avaritia.Lumberjack; import net.minecraft.util.IIcon; import net.minecraftforge.client.event.TextureStitchEvent; diff --git a/src/main/resources/assets/avaritia/lang/en_US.lang b/src/main/resources/assets/avaritia/lang/en_US.lang index d211ea4..2769ff2 100644 --- a/src/main/resources/assets/avaritia/lang/en_US.lang +++ b/src/main/resources/assets/avaritia/lang/en_US.lang @@ -7,6 +7,7 @@ item.avaritia_resource.neutron_nugget.name=Neutronium Nugget item.avaritia_resource.neutronium_ingot.name=Neutronium Ingot item.avaritia_resource.infinity_catalyst.name=Infinity Catalyst item.avaritia_resource.infinity_ingot.name=Infinity Ingot +item.avaritia_resource.record_fragment.name=Record Fragment item.singularity_iron.name=Iron Singularity item.singularity_gold.name=Golden Singularity item.singularity_lapis.name=Lapis Singularity @@ -23,6 +24,7 @@ item.akashic_record.name=Akashic Records item.orb_armok.name=Blood Orb of Armok item.avaritia_stew.name=Ultimate Stew item.avaritia_meatballs.name=Cosmic Meatballs +item.avaritia_endest_pearl.name=Endest Pearl # # Blocks tile.compressed_workbench.name=Compressed Crafting Table @@ -37,9 +39,13 @@ tile.infinitato.name=Infinitato # # Tooltips tooltip.armok.desc=Stores unlimited Life Essence while held -tooltip.crystal_matrix.desc=This isn't even its final form. +tooltip.crystal_matrix_ingot.desc=This isn't even its final form. tooltip.neutron_pile.desc=Try not to think about it. -tooltip.neutronium.desc=The dense heart of a star in convenient ingot form. +tooltip.neutron_nugget.desc=About 35.6 million metric tons. +tooltip.neutronium_ingot.desc=The dense heart of a star in convenient ingot form. +tooltip.infinity_catalyst.desc=One is all and all is one. +tooltip.infinity_ingot.desc=The fury of the universe in the palm of your hand. +tooltip.record_fragment.desc=One likes to believe in the freedom of music~ # # Achievements achievement.avaritia:crystal_matrix=The Beginning of the End diff --git a/src/main/resources/assets/avaritia/textures/items/endestpearl.png b/src/main/resources/assets/avaritia/textures/items/endestpearl.png new file mode 100644 index 0000000000000000000000000000000000000000..a083790f48f3895ddeefc9f74f9850489343f59e GIT binary patch literal 3985 zcmV;C4{q>@P)KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z000EMNklF7{KxW6-o$&m9EwKwghH~!?8$_treDOyT-XhJ^*uZE;3xA z*$Zm$B`O&kvx?EV_=?LmqYlTG#es2gY9bl92!R9yv#SJ`#&r2Dw~*~tK;-R@w|)}IuwV_^Ga zq1+j-V}9;8geShv)K!@bI=dNkcGKHtXNNh8NhEv3%(s&y*GspDo-NFX6^`Id~{rd|jjb=jHrA@L-&`&eJV(xtZ_^ z`9D_Btk=@pW=CU9Mq^E8<;FL~X8>;=up~7w57NRy1MuLheAWU3#a}+S2hDmdEJ-CT zER?lC0z;f9m>ob#Uq2iQbk+WQz)Ld&^B_tS5ts+j;J*j!em;N=$f+#$>48Vqai&nXaY3S_ zMa)8bz9(Cm#44VEdNEqU^WHNGbc}0Z%`N z#@^|_2Rc)HU>>Xh|2){L9-=jGH&&MiLEnDi)dP>DiP^kXA~RAYuJ*X7Q!F0k{CQEH zs8cMWPO-?|U-rnxElb5Ck(B*5A$lshH|DYeumXv9ik9PL)IJ739NQ#bbe? zu_n{oW*>e}aya?5vY14Ms391O%Y)bv4@Q>!zC6&m960CN>!jr&J;=_XQm>`d<-w%$ zzx(IGUI@^GMJW^ob^7lC1)Cms50s)^V?W|pW3X-W+k&IkW8Uv=_w~T6)6!&3_TPg! z5SRy6e?2g{JV<1SL5GtQkJJODXqPbmRm?gqbG%q^uL);?vMwi_{*6cH!H5I>(&TpG zp*;93I|r3sOAW!O^jhBc*MrjgcrYrFGBUR*<>hsR-uwrZR>N5!J4y&@ZlL7*Q{-+s r`j8$tYRB|o%m5++-|dvK&i^|A!gZMM&@OSf00000NkvXXu0mjfKy`rc literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/avaritia/textures/items/endestpearl.png.mcmeta b/src/main/resources/assets/avaritia/textures/items/endestpearl.png.mcmeta new file mode 100644 index 0000000..ae3d1dc --- /dev/null +++ b/src/main/resources/assets/avaritia/textures/items/endestpearl.png.mcmeta @@ -0,0 +1,28 @@ +{ + "animation": { + "frametime": 1, + "frames": [ + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 2, + 2, + 3, + 4, + 4, + 3, + 3, + 2, + 1, + 1 + ] + } +} diff --git a/src/main/resources/assets/avaritia/textures/items/resource_record_fragment.png b/src/main/resources/assets/avaritia/textures/items/resource_record_fragment.png new file mode 100644 index 0000000000000000000000000000000000000000..08d984105d04c84ff8e52fe3af25266cd323b7f0 GIT binary patch literal 3095 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 literal 0 HcmV?d00001