Bow pretties, cosmic improvements, SHOVEL

This commit is contained in:
Alex Spinks committed 2015-08-13 22:55:54 +01:00
1 parent fb7992270e
commit ad0814c03f
25 files changed
+420 -20

No files matched your search

@@ -8,6 +8,7 @@ import fox.spiteful.avaritia.entity.EntityGapingVoid;
import fox.spiteful.avaritia.entity.EntityHeavenArrow;
import fox.spiteful.avaritia.entity.EntityHeavenSubArrow;
import fox.spiteful.avaritia.items.LudicrousItems;
import fox.spiteful.avaritia.render.CosmicBowRenderer;
import fox.spiteful.avaritia.render.CosmicItemRenderer;
import fox.spiteful.avaritia.render.FancyHaloRenderer;
import fox.spiteful.avaritia.render.FracturedOreRenderer;
@@ -52,6 +53,8 @@ public class ClientProxy extends CommonProxy {
MinecraftForgeClient.registerItemRenderer(LudicrousItems.infinity_shoes, sparkly);
MinecraftForgeClient.registerItemRenderer(LudicrousItems.matter_cluster, sparkly);
MinecraftForgeClient.registerItemRenderer(LudicrousItems.infinity_bow, new CosmicBowRenderer());
MinecraftForgeClient.registerItemRenderer(LudicrousItems.fractured_ore, new FracturedOreRenderer());
CompatClient.comprettify();
@@ -198,13 +198,13 @@ public class ItemArmorInfinity extends ItemArmor implements ICosmicRenderItem, I
@Override
@SideOnly(Side.CLIENT)
public IIcon getMaskTexture(ItemStack stack) {
public IIcon getMaskTexture(ItemStack stack, EntityPlayer player) {
return this.cosmicMask;
}
@Override
@SideOnly(Side.CLIENT)
public float getMaskMultiplier(ItemStack stack) {
public float getMaskMultiplier(ItemStack stack, EntityPlayer player) {
return 1.0f;
}
@@ -256,7 +256,7 @@ public class ItemMatterCluster extends Item implements ICosmicRenderItem {
@Override
@SideOnly(Side.CLIENT)
public IIcon getMaskTexture(ItemStack stack) {
public IIcon getMaskTexture(ItemStack stack, EntityPlayer player) {
int count = getClusterSize(stack);
if (count == capacity) {
return cosmicIconFull;
@@ -266,7 +266,7 @@ public class ItemMatterCluster extends Item implements ICosmicRenderItem {
@Override
@SideOnly(Side.CLIENT)
public float getMaskMultiplier(ItemStack stack) {
public float getMaskMultiplier(ItemStack stack, EntityPlayer player) {
int count = getClusterSize(stack);
return count / (float)capacity;
}
@@ -3,7 +3,10 @@ package fox.spiteful.avaritia.items.tools;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import fox.spiteful.avaritia.Avaritia;
import fox.spiteful.avaritia.Lumberjack;
import fox.spiteful.avaritia.entity.EntityHeavenArrow;
import fox.spiteful.avaritia.render.CosmicBowRenderer;
import fox.spiteful.avaritia.render.ICosmicRenderItem;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.enchantment.Enchantment;
import net.minecraft.enchantment.EnchantmentHelper;
@@ -19,9 +22,10 @@ import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.entity.player.ArrowLooseEvent;
import net.minecraftforge.event.entity.player.ArrowNockEvent;
public class ItemBowInfinity extends Item {
@SideOnly(Side.CLIENT)
public class ItemBowInfinity extends Item implements ICosmicRenderItem {
private IIcon[] iconArray;
private IIcon[] maskArray;
private IIcon idleMask;
public ItemBowInfinity()
{
@@ -174,11 +178,14 @@ public class ItemBowInfinity extends Item {
{
int pullframes = 3;
this.itemIcon = ir.registerIcon(this.getIconString() + "_standby");
this.idleMask = ir.registerIcon(this.getIconString() + "_standby_mask");
this.iconArray = new IIcon[pullframes];
this.maskArray = new IIcon[pullframes];
for (int i = 0; i < pullframes; ++i)
{
this.iconArray[i] = ir.registerIcon(this.getIconString() + "_pulling_"+i);
this.maskArray[i] = ir.registerIcon(this.getIconString() + "_pulling_mask_"+i);
}
}
@@ -207,4 +214,40 @@ public class ItemBowInfinity extends Item {
}
return getIcon(stack, renderPass);
}
@Override
@SideOnly(Side.CLIENT)
public IIcon getIcon(ItemStack stack, int pass) {
return super.getIcon(stack, pass);
}
@Override
@SideOnly(Side.CLIENT)
public boolean isFull3D()
{
return true;
}
@Override
@SideOnly(Side.CLIENT)
public IIcon getMaskTexture(ItemStack stack, EntityPlayer player) {
int frame = -1;
if (player != null) {
int bframe = CosmicBowRenderer.getBowFrame(player);
frame = bframe != 0 ? bframe : -1;
}
//Lumberjack.info(frame);
if (frame == -1) {
return this.idleMask;
}
return maskArray[frame];
}
@Override
@SideOnly(Side.CLIENT)
public float getMaskMultiplier(ItemStack stack, EntityPlayer player) {
return 1.0f;
}
}
@@ -104,13 +104,13 @@ public class ItemSwordInfinity extends ItemSword implements ICosmicRenderItem {
@Override
@SideOnly(Side.CLIENT)
public IIcon getMaskTexture(ItemStack stack) {
public IIcon getMaskTexture(ItemStack stack, EntityPlayer player) {
return cosmicMask;
}
@Override
@SideOnly(Side.CLIENT)
public float getMaskMultiplier(ItemStack stack) {
public float getMaskMultiplier(ItemStack stack, EntityPlayer player) {
return 1.0f;
}
@@ -0,0 +1,50 @@
package fox.spiteful.avaritia.render;
import org.lwjgl.opengl.GL11;
import cpw.mods.fml.relauncher.ReflectionHelper;
import fox.spiteful.avaritia.Lumberjack;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraftforge.client.IItemRenderer;
public class CosmicBowRenderer extends CosmicItemRenderer implements IItemRenderer {
private static String[] iiuObf = new String[] { "itemInUse", "field_71074_e", "f" };
private static String[] iiucObf = new String[] { "itemInUseCount", "field_71072_f", "g" };
@Override
public void renderItem(ItemRenderType type, ItemStack stack, Object... data) {
if (type == ItemRenderType.EQUIPPED) {
GL11.glPushMatrix();
GL11.glTranslatef(0.2F, -0.3F, 0.15F);
super.renderItem(type, stack, data);
GL11.glPopMatrix();
} else {
super.renderItem(type, stack, data);
}
}
public static int getBowFrame(EntityPlayer player) {
ItemStack inuse = ReflectionHelper.getPrivateValue(EntityPlayer.class, player, iiuObf);
int time = ReflectionHelper.getPrivateValue(EntityPlayer.class, player, iiucObf);
if (inuse != null) {
int max = inuse.getMaxItemUseDuration();
double pull = (max - time) / (double)max;
return Math.max(0, (int)Math.ceil(pull*3.0)-1);
}
return 0;
}
@Override
public IIcon getStackIcon(ItemStack stack, int pass, EntityPlayer player) {
Item item = stack.getItem();
ItemStack inuse = ReflectionHelper.getPrivateValue(EntityPlayer.class, player, iiuObf);
int time = ReflectionHelper.getPrivateValue(EntityPlayer.class, player, iiucObf);
return item.getIcon(stack, pass, player, inuse, time);
}
}
@@ -12,6 +12,7 @@ import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.entity.RenderItem;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.util.MathHelper;
@@ -41,17 +42,17 @@ public class CosmicItemRenderer implements IItemRenderer {
GL11.glTranslatef(-0.5F, 0F, 0F);
if(item.isOnItemFrame())
GL11.glTranslatef(0F, -0.3F, 0.01F);
render(item);
render(item, null);
GL11.glPopMatrix();
break;
}
case EQUIPPED : {
render(item);
render(item, data[1] instanceof EntityPlayer ? (EntityPlayer) data[1] : null);
break;
}
case EQUIPPED_FIRST_PERSON : {
render(item);
render(item, data[1] instanceof EntityPlayer ? (EntityPlayer) data[1] : null);
break;
}
case INVENTORY: {
@@ -76,11 +77,11 @@ public class CosmicItemRenderer implements IItemRenderer {
ICosmicRenderItem icri = (ICosmicRenderItem)(item.getItem());
CosmicRenderShenanigans.cosmicOpacity = icri.getMaskMultiplier(item);
CosmicRenderShenanigans.cosmicOpacity = icri.getMaskMultiplier(item, null);
CosmicRenderShenanigans.inventoryRender = true;
CosmicRenderShenanigans.useShader();
IIcon cosmicicon = icri.getMaskTexture(item);
IIcon cosmicicon = icri.getMaskTexture(item, null);
GL11.glColor4d(1, 1, 1, 1);
@@ -118,8 +119,8 @@ public class CosmicItemRenderer implements IItemRenderer {
//Lumberjack.log(Level.INFO, light+"");
}
public void render(ItemStack item) {
public void render(ItemStack item, EntityPlayer player) {
int passes = 1;
if (item.getItem().requiresMultipleRenderPasses())
{
@@ -141,7 +142,7 @@ public class CosmicItemRenderer implements IItemRenderer {
for (int i = 0; i < passes; i++)
{
icon = item.getItem().getIcon(item, i);
icon = this.getStackIcon(item, i, player);
//Lumberjack.log(Level.INFO, "icon "+i+": "+icon);
@@ -160,11 +161,12 @@ public class CosmicItemRenderer implements IItemRenderer {
if (item.getItem() instanceof ICosmicRenderItem) {
GL11.glDisable(GL11.GL_ALPHA_TEST);
GL11.glDepthFunc(GL11.GL_EQUAL);
ICosmicRenderItem icri = (ICosmicRenderItem)(item.getItem());
CosmicRenderShenanigans.cosmicOpacity = icri.getMaskMultiplier(item);
CosmicRenderShenanigans.cosmicOpacity = icri.getMaskMultiplier(item, player);
CosmicRenderShenanigans.useShader();
IIcon cosmicicon = icri.getMaskTexture(item);
IIcon cosmicicon = icri.getMaskTexture(item, player);
float minu = cosmicicon.getMinU();
float maxu = cosmicicon.getMaxU();
@@ -172,6 +174,7 @@ public class CosmicItemRenderer implements IItemRenderer {
float maxv = cosmicicon.getMaxV();
ItemRenderer.renderItemIn2D(Tessellator.instance, maxu, minv, minu, maxv, cosmicicon.getIconWidth(), cosmicicon.getIconHeight(), scale);
CosmicRenderShenanigans.releaseShader();
GL11.glDepthFunc(GL11.GL_LEQUAL);
GL11.glEnable(GL11.GL_ALPHA_TEST);
}
@@ -214,4 +217,8 @@ public class CosmicItemRenderer implements IItemRenderer {
}
}
}
public IIcon getStackIcon(ItemStack stack, int pass, EntityPlayer player) {
return stack.getItem().getIcon(stack, pass);
}
}
@@ -2,14 +2,15 @@ package fox.spiteful.avaritia.render;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
public interface ICosmicRenderItem {
@SideOnly(Side.CLIENT)
public IIcon getMaskTexture(ItemStack stack);
public IIcon getMaskTexture(ItemStack stack, EntityPlayer player);
@SideOnly(Side.CLIENT)
public float getMaskMultiplier(ItemStack stack);
public float getMaskMultiplier(ItemStack stack, EntityPlayer player);
}