diff --git a/src/main/java/fox/spiteful/avaritia/ClientProxy.java b/src/main/java/fox/spiteful/avaritia/ClientProxy.java index d9c077a..309e678 100644 --- a/src/main/java/fox/spiteful/avaritia/ClientProxy.java +++ b/src/main/java/fox/spiteful/avaritia/ClientProxy.java @@ -5,12 +5,15 @@ import cpw.mods.fml.common.FMLCommonHandler; import fox.spiteful.avaritia.compat.CompatClient; import fox.spiteful.avaritia.entity.EntityEndestPearl; 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.CosmicItemRenderer; import fox.spiteful.avaritia.render.FancyHaloRenderer; import fox.spiteful.avaritia.render.FracturedOreRenderer; import fox.spiteful.avaritia.render.LudicrousRenderEvents; import fox.spiteful.avaritia.render.RenderGapingVoid; +import fox.spiteful.avaritia.render.RenderHeavenArrow; import fox.spiteful.avaritia.render.ShaderHelper; import net.minecraft.client.renderer.entity.RenderSnowball; import net.minecraftforge.client.MinecraftForgeClient; @@ -36,6 +39,10 @@ public class ClientProxy extends CommonProxy { RenderingRegistry.registerEntityRenderingHandler(EntityEndestPearl.class, new RenderSnowball(LudicrousItems.endest_pearl)); RenderingRegistry.registerEntityRenderingHandler(EntityGapingVoid.class, new RenderGapingVoid()); + RenderHeavenArrow arrowrender = new RenderHeavenArrow(); + RenderingRegistry.registerEntityRenderingHandler(EntityHeavenArrow.class, arrowrender); + RenderingRegistry.registerEntityRenderingHandler(EntityHeavenSubArrow.class, arrowrender); + CosmicItemRenderer sparkly = new CosmicItemRenderer(); MinecraftForgeClient.registerItemRenderer(LudicrousItems.infinity_sword, sparkly); diff --git a/src/main/java/fox/spiteful/avaritia/entity/EntityHeavenArrow.java b/src/main/java/fox/spiteful/avaritia/entity/EntityHeavenArrow.java new file mode 100644 index 0000000..9dbe18e --- /dev/null +++ b/src/main/java/fox/spiteful/avaritia/entity/EntityHeavenArrow.java @@ -0,0 +1,129 @@ +package fox.spiteful.avaritia.entity; + +import java.lang.reflect.Field; +import java.util.Random; + +import org.apache.logging.log4j.Level; + +import cpw.mods.fml.relauncher.ReflectionHelper; +import fox.spiteful.avaritia.Lumberjack; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.projectile.EntityArrow; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; + +public class EntityHeavenArrow extends EntityArrow { + public static Field inGroundField; + public static Field ticksInGroundField; + static { + try { + inGroundField = ReflectionHelper.findField(EntityArrow.class, "inGround", "field_70254_i"); + ticksInGroundField = ReflectionHelper.findField(EntityArrow.class, "ticksInGround", "field_70252_j"); + } + catch(Exception e){ + Lumberjack.log(Level.ERROR, e); + } + } + + public boolean impacted = false; + public Random randy = new Random(); + + public EntityHeavenArrow(World world, double x, double y, double z) { + super(world, x, y, z); + } + + public EntityHeavenArrow(World world, EntityLivingBase entity, EntityLivingBase entity2, float something, float otherthing) { + super(world, entity, entity2, something, otherthing); + } + + public EntityHeavenArrow(World world, EntityLivingBase entity, float something) { + super(world, entity, something); + + } + + public EntityHeavenArrow(World world) { + super(world); + } + + @Override + public void onUpdate() { + this.rotationPitch = 0; + this.rotationYaw = 0; + super.onUpdate(); + if (!this.impacted) { + try { + if (inGroundField.getBoolean(this)) { + this.impacted = true; + } + } catch (Exception e) { + e.printStackTrace(); + } + + if (this.impacted) { + if (!this.worldObj.isRemote) { + this.barrage(); + } + } + } + + if (getInGround(this) && getTicksInGround(this) >= 100) { + this.setDead(); + } + } + + @Override + public void writeEntityToNBT(NBTTagCompound tag) + { + super.writeEntityToNBT(tag); + tag.setBoolean("impacted", this.impacted); + } + + /** + * (abstract) Protected helper method to read subclass entity data from NBT. + */ + public void readEntityFromNBT(NBTTagCompound tag) + { + super.readEntityFromNBT(tag); + this.impacted = tag.getBoolean("impacted"); + } + + public static boolean getInGround(EntityArrow arrow) { + try { + return inGroundField.getBoolean(arrow); + } catch (Exception e) { + return false; + } + } + + public static int getTicksInGround(EntityArrow arrow) { + try { + return ticksInGroundField.getInt(arrow); + } catch (Exception e) { + return 0; + } + } + + public void barrage() { + for (int i=0; i<10; i++) { + double angle = randy.nextDouble() * 2 * Math.PI; + double dist = randy.nextGaussian()*0.5; + + double x = Math.sin(angle) * dist + this.posX; + double z = Math.cos(angle) * dist + this.posZ; + double y = this.posY + 25.0; + + double dangle = randy.nextDouble() * 2 * Math.PI; + double ddist = randy.nextDouble()*0.35; + double dx = Math.sin(dangle) * ddist; + double dz = Math.cos(dangle) * ddist; + + EntityArrow arrow = new EntityHeavenSubArrow(this.worldObj, x,y,z); + arrow.shootingEntity = this.shootingEntity; + arrow.setVelocity(dx, -(randy.nextDouble()*1.85 + 0.15), dz); + arrow.setDamage(this.getDamage()); + arrow.setIsCritical(true); + + this.worldObj.spawnEntityInWorld(arrow); + } + } +} diff --git a/src/main/java/fox/spiteful/avaritia/entity/EntityHeavenSubArrow.java b/src/main/java/fox/spiteful/avaritia/entity/EntityHeavenSubArrow.java new file mode 100644 index 0000000..8af7a6b --- /dev/null +++ b/src/main/java/fox/spiteful/avaritia/entity/EntityHeavenSubArrow.java @@ -0,0 +1,35 @@ +package fox.spiteful.avaritia.entity; + +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.projectile.EntityArrow; +import net.minecraft.world.World; + +public class EntityHeavenSubArrow extends EntityArrow { + public EntityHeavenSubArrow(World world, double x, double y, double z) { + super(world, x, y, z); + } + + public EntityHeavenSubArrow(World world, EntityLivingBase entity, EntityLivingBase entity2, float something, float otherthing) { + super(world, entity, entity2, something, otherthing); + } + + public EntityHeavenSubArrow(World world, EntityLivingBase entity, float something) { + super(world, entity, something); + + } + + public EntityHeavenSubArrow(World world) { + super(world); + } + + @Override + public void onUpdate() { + this.rotationPitch = 0; + this.rotationYaw = 0; + super.onUpdate(); + + if (EntityHeavenArrow.getInGround(this) && EntityHeavenArrow.getTicksInGround(this) >= 20) { + this.setDead(); + } + } +} diff --git a/src/main/java/fox/spiteful/avaritia/entity/LudicrousEntities.java b/src/main/java/fox/spiteful/avaritia/entity/LudicrousEntities.java index 5225899..7d4222a 100644 --- a/src/main/java/fox/spiteful/avaritia/entity/LudicrousEntities.java +++ b/src/main/java/fox/spiteful/avaritia/entity/LudicrousEntities.java @@ -8,5 +8,7 @@ public class LudicrousEntities { public static void letLooseTheDogsOfWar() { EntityRegistry.registerModEntity(EntityEndestPearl.class, "EndestPearl", 1, Avaritia.instance, 64, 10, true); EntityRegistry.registerModEntity(EntityGapingVoid.class, "GapingVoid", 2, Avaritia.instance, 256, 10, false); + EntityRegistry.registerModEntity(EntityHeavenArrow.class, "HeavenArrow", 3, Avaritia.instance, 32, 1, true); + EntityRegistry.registerModEntity(EntityHeavenSubArrow.class, "HeavenSubArrow", 4, Avaritia.instance, 32, 2, true); } } diff --git a/src/main/java/fox/spiteful/avaritia/items/LudicrousItems.java b/src/main/java/fox/spiteful/avaritia/items/LudicrousItems.java index da3c36e..0d13f92 100644 --- a/src/main/java/fox/spiteful/avaritia/items/LudicrousItems.java +++ b/src/main/java/fox/spiteful/avaritia/items/LudicrousItems.java @@ -2,6 +2,7 @@ package fox.spiteful.avaritia.items; import cpw.mods.fml.common.registry.GameRegistry; import fox.spiteful.avaritia.Avaritia; +import fox.spiteful.avaritia.items.tools.ItemBowInfinity; import fox.spiteful.avaritia.items.tools.ItemPickaxeInfinity; import fox.spiteful.avaritia.items.tools.ItemSwordInfinity; import fox.spiteful.avaritia.items.tools.ItemSwordSkulls; @@ -29,6 +30,7 @@ public class LudicrousItems { public static Item endest_pearl; public static Item fractured_ore; public static Item matter_cluster; + public static Item infinity_bow; public static Item infinity_helm; public static Item infinity_armor; @@ -71,6 +73,8 @@ public class LudicrousItems { 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"); MinecraftForge.EVENT_BUS.register(new ItemArmorInfinity.abilityHandler()); } diff --git a/src/main/java/fox/spiteful/avaritia/items/tools/ItemBowInfinity.java b/src/main/java/fox/spiteful/avaritia/items/tools/ItemBowInfinity.java new file mode 100644 index 0000000..cddb175 --- /dev/null +++ b/src/main/java/fox/spiteful/avaritia/items/tools/ItemBowInfinity.java @@ -0,0 +1,210 @@ +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.entity.EntityHeavenArrow; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.enchantment.Enchantment; +import net.minecraft.enchantment.EnchantmentHelper; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.projectile.EntityArrow; +import net.minecraft.init.Items; +import net.minecraft.item.EnumAction; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; +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) + private IIcon[] iconArray; + + public ItemBowInfinity() + { + this.maxStackSize = 1; + this.setMaxDamage(9999); + this.setUnlocalizedName("infinity_bow"); + this.setTextureName("avaritia:infinity_bow"); + this.setCreativeTab(Avaritia.tab); + } + + @Override + public void setDamage(ItemStack stack, int damage){ + super.setDamage(stack, 0); + } + + @Override + public void onPlayerStoppedUsing(ItemStack stack, World world, EntityPlayer player, int useCount) + { + //this.fire(stack, world, player, useCount); + } + + @Override + public void onUsingTick(ItemStack stack, EntityPlayer player, int count) + { + if (count == 1) { + this.fire(stack, player.worldObj, player, 0); + } + } + + public void fire(ItemStack stack, World world, EntityPlayer player, int useCount) + { + int max = this.getMaxItemUseDuration(stack); + float maxf = (float)max; + int j = max - useCount; + + /*ArrowLooseEvent event = new ArrowLooseEvent(player, stack, j); + MinecraftForge.EVENT_BUS.post(event); + if (event.isCanceled()) + { + return; + } + j = event.charge;*/ + + boolean flag = true;//player.capabilities.isCreativeMode || EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, stack) > 0; + + if (flag || player.inventory.hasItem(Items.arrow)) + { + float f = j / maxf; + f = (f * f + f * 2.0F) / 3.0F; + + if (f < 0.1) + { + return; + } + + if (f > 1.0) + { + f = 1.0F; + } + + EntityArrow entityarrow = new EntityHeavenArrow(world, player, f * 2.0F); + entityarrow.setDamage(20.0); + + + if (f == 1.0F) + { + entityarrow.setIsCritical(true); + } + + int k = EnchantmentHelper.getEnchantmentLevel(Enchantment.power.effectId, stack); + + if (k > 0) + { + entityarrow.setDamage(entityarrow.getDamage() + k * 1 + 1); + } + + int l = EnchantmentHelper.getEnchantmentLevel(Enchantment.punch.effectId, stack); + + if (l > 0) + { + entityarrow.setKnockbackStrength(l); + } + + if (EnchantmentHelper.getEnchantmentLevel(Enchantment.flame.effectId, stack) > 0) + { + entityarrow.setFire(100); + } + + stack.damageItem(1, player); + world.playSoundAtEntity(player, "random.bow", 1.0F, 1.0F / (itemRand.nextFloat() * 0.4F + 1.2F) + f * 0.5F); + + if (flag) + { + entityarrow.canBePickedUp = 2; + } + else + { + player.inventory.consumeInventoryItem(Items.arrow); + } + + if (!world.isRemote) + { + world.spawnEntityInWorld(entityarrow); + } + } + } + + @Override + public ItemStack onEaten(ItemStack stack, World world, EntityPlayer player) + { + return stack; + } + + @Override + public int getMaxItemUseDuration(ItemStack stack) + { + return 13; + } + + @Override + public EnumAction getItemUseAction(ItemStack stack) + { + return EnumAction.bow; + } + + @Override + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) + { + ArrowNockEvent event = new ArrowNockEvent(player, stack); + MinecraftForge.EVENT_BUS.post(event); + if (event.isCanceled()) + { + return event.result; + } + + player.setItemInUse(stack, this.getMaxItemUseDuration(stack)); + + return stack; + } + + @Override + public int getItemEnchantability() + { + return 1; + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister ir) + { + int pullframes = 3; + this.itemIcon = ir.registerIcon(this.getIconString() + "_standby"); + this.iconArray = new IIcon[pullframes]; + + for (int i = 0; i < pullframes; ++i) + { + this.iconArray[i] = ir.registerIcon(this.getIconString() + "_pulling_"+i); + } + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) + { + if (usingItem != null) + { + int max = stack.getMaxItemUseDuration(); + int pull = max - useRemaining; + if (pull >= (max * 2) / 3.0) + { + return this.iconArray[2]; + } + + if (pull > max / 3.0) + { + return this.iconArray[1]; + } + + if (pull > 0) + { + return this.iconArray[0]; + } + } + return getIcon(stack, renderPass); + } +} diff --git a/src/main/java/fox/spiteful/avaritia/render/RenderHeavenArrow.java b/src/main/java/fox/spiteful/avaritia/render/RenderHeavenArrow.java new file mode 100644 index 0000000..651e1ee --- /dev/null +++ b/src/main/java/fox/spiteful/avaritia/render/RenderHeavenArrow.java @@ -0,0 +1,95 @@ +package fox.spiteful.avaritia.render; + +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL12; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.EntityRenderer; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.entity.RenderArrow; +import net.minecraft.entity.projectile.EntityArrow; +import net.minecraft.util.MathHelper; +import net.minecraft.util.ResourceLocation; + +public class RenderHeavenArrow extends RenderArrow { + + private static final ResourceLocation tex = new ResourceLocation("avaritia", "textures/entity/heavenarrow.png"); + + @Override + public void doRender(EntityArrow p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_) + { + EntityRenderer er = Minecraft.getMinecraft().entityRenderer; + er.disableLightmap(0.0); + GL11.glDisable(GL11.GL_LIGHTING); + + //super.doRender(p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_); + + this.bindEntityTexture(p_76986_1_); + GL11.glPushMatrix(); + GL11.glTranslatef((float)p_76986_2_, (float)p_76986_4_, (float)p_76986_6_); + GL11.glRotatef(p_76986_1_.prevRotationYaw + (p_76986_1_.rotationYaw - p_76986_1_.prevRotationYaw) * p_76986_9_ - 90.0F, 0.0F, 1.0F, 0.0F); + GL11.glRotatef(p_76986_1_.prevRotationPitch + (p_76986_1_.rotationPitch - p_76986_1_.prevRotationPitch) * p_76986_9_, 0.0F, 0.0F, 1.0F); + Tessellator tessellator = Tessellator.instance; + byte b0 = 0; + float f2 = 0.0F; + float f3 = 0.5F; + float f4 = (float)(0 + b0 * 10) / 32.0F; + float f5 = (float)(5 + b0 * 10) / 32.0F; + float f6 = 0.0F; + float f7 = 0.15625F; + float f8 = (float)(5 + b0 * 10) / 32.0F; + float f9 = (float)(10 + b0 * 10) / 32.0F; + float f10 = 0.05625F; + GL11.glEnable(GL12.GL_RESCALE_NORMAL); + float f11 = (float)p_76986_1_.arrowShake - p_76986_9_; + + if (f11 > 0.0F) + { + float f12 = -MathHelper.sin(f11 * 3.0F) * f11; + GL11.glRotatef(f12, 0.0F, 0.0F, 1.0F); + } + + GL11.glRotatef(45.0F, 1.0F, 0.0F, 0.0F); + GL11.glScalef(f10, f10, f10); + GL11.glTranslatef(-4.0F, 0.0F, 0.0F); + GL11.glNormal3f(f10, 0.0F, 0.0F); + tessellator.startDrawingQuads(); + tessellator.addVertexWithUV(-7.0D, -2.0D, -2.0D, (double)f6, (double)f8); + tessellator.addVertexWithUV(-7.0D, -2.0D, 2.0D, (double)f7, (double)f8); + tessellator.addVertexWithUV(-7.0D, 2.0D, 2.0D, (double)f7, (double)f9); + tessellator.addVertexWithUV(-7.0D, 2.0D, -2.0D, (double)f6, (double)f9); + tessellator.draw(); + GL11.glNormal3f(-f10, 0.0F, 0.0F); + tessellator.startDrawingQuads(); + tessellator.addVertexWithUV(-7.0D, 2.0D, -2.0D, (double)f6, (double)f8); + tessellator.addVertexWithUV(-7.0D, 2.0D, 2.0D, (double)f7, (double)f8); + tessellator.addVertexWithUV(-7.0D, -2.0D, 2.0D, (double)f7, (double)f9); + tessellator.addVertexWithUV(-7.0D, -2.0D, -2.0D, (double)f6, (double)f9); + tessellator.draw(); + + for (int i = 0; i < 4; ++i) + { + GL11.glRotatef(90.0F, 1.0F, 0.0F, 0.0F); + GL11.glNormal3f(0.0F, 0.0F, f10); + tessellator.startDrawingQuads(); + tessellator.addVertexWithUV(-8.0D, -2.0D, 0.0D, (double)f2, (double)f4); + tessellator.addVertexWithUV(8.0D, -2.0D, 0.0D, (double)f3, (double)f4); + tessellator.addVertexWithUV(8.0D, 2.0D, 0.0D, (double)f3, (double)f5); + tessellator.addVertexWithUV(-8.0D, 2.0D, 0.0D, (double)f2, (double)f5); + tessellator.draw(); + } + + GL11.glDisable(GL12.GL_RESCALE_NORMAL); + GL11.glPopMatrix(); + + + GL11.glEnable(GL11.GL_LIGHTING); + er.enableLightmap(0.0); + } + + @Override + protected ResourceLocation getEntityTexture(EntityArrow p_110775_1_) + { + return tex; + } +} diff --git a/src/main/resources/assets/avaritia/lang/en_US.lang b/src/main/resources/assets/avaritia/lang/en_US.lang index a3d7a7c..c5cf10a 100644 --- a/src/main/resources/assets/avaritia/lang/en_US.lang +++ b/src/main/resources/assets/avaritia/lang/en_US.lang @@ -34,6 +34,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.infinity_bow.name=Longbow of the Heavens # # Blocks tile.compressed_workbench.name=Compressed Crafting Table diff --git a/src/main/resources/assets/avaritia/textures/entity/heavenarrow.png b/src/main/resources/assets/avaritia/textures/entity/heavenarrow.png new file mode 100644 index 0000000..1aca17f Binary files /dev/null and b/src/main/resources/assets/avaritia/textures/entity/heavenarrow.png differ diff --git a/src/main/resources/assets/avaritia/textures/items/infinity_bow_pulling_0.png b/src/main/resources/assets/avaritia/textures/items/infinity_bow_pulling_0.png new file mode 100644 index 0000000..0d1e6ed Binary files /dev/null and b/src/main/resources/assets/avaritia/textures/items/infinity_bow_pulling_0.png differ diff --git a/src/main/resources/assets/avaritia/textures/items/infinity_bow_pulling_1.png b/src/main/resources/assets/avaritia/textures/items/infinity_bow_pulling_1.png new file mode 100644 index 0000000..962fe26 Binary files /dev/null and b/src/main/resources/assets/avaritia/textures/items/infinity_bow_pulling_1.png differ diff --git a/src/main/resources/assets/avaritia/textures/items/infinity_bow_pulling_2.png b/src/main/resources/assets/avaritia/textures/items/infinity_bow_pulling_2.png new file mode 100644 index 0000000..be348fa Binary files /dev/null and b/src/main/resources/assets/avaritia/textures/items/infinity_bow_pulling_2.png differ diff --git a/src/main/resources/assets/avaritia/textures/items/infinity_bow_standby.png b/src/main/resources/assets/avaritia/textures/items/infinity_bow_standby.png new file mode 100644 index 0000000..328303d Binary files /dev/null and b/src/main/resources/assets/avaritia/textures/items/infinity_bow_standby.png differ