diff --git a/src/main/java/fox/spiteful/avaritia/Avaritia.java b/src/main/java/fox/spiteful/avaritia/Avaritia.java index 9808341..98d013e 100644 --- a/src/main/java/fox/spiteful/avaritia/Avaritia.java +++ b/src/main/java/fox/spiteful/avaritia/Avaritia.java @@ -15,6 +15,7 @@ import fox.spiteful.avaritia.blocks.LudicrousBlocks; import fox.spiteful.avaritia.compat.Compat; import fox.spiteful.avaritia.crafting.Grinder; import fox.spiteful.avaritia.crafting.Mincer; +import fox.spiteful.avaritia.entity.LudicrousEntities; import fox.spiteful.avaritia.gui.GooeyHandler; import fox.spiteful.avaritia.items.LudicrousItems; import net.minecraft.creativetab.CreativeTabs; @@ -51,6 +52,7 @@ public class Avaritia { instance = this; LudicrousItems.grind(); LudicrousBlocks.voxelize(); + LudicrousEntities.letLooseTheDogsOfWar(); Compat.census(); } diff --git a/src/main/java/fox/spiteful/avaritia/ClientProxy.java b/src/main/java/fox/spiteful/avaritia/ClientProxy.java index 3580633..11446a1 100644 --- a/src/main/java/fox/spiteful/avaritia/ClientProxy.java +++ b/src/main/java/fox/spiteful/avaritia/ClientProxy.java @@ -1,12 +1,16 @@ package fox.spiteful.avaritia; +import cpw.mods.fml.client.registry.RenderingRegistry; 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.items.LudicrousItems; import fox.spiteful.avaritia.render.CosmicItemRenderer; import fox.spiteful.avaritia.render.FancyHaloRenderer; import fox.spiteful.avaritia.render.LudicrousRenderEvents; import fox.spiteful.avaritia.render.ShaderHelper; +import net.minecraft.client.renderer.entity.RenderSnowball; import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.common.MinecraftForge; @@ -20,6 +24,9 @@ public class ClientProxy extends CommonProxy { MinecraftForgeClient.registerItemRenderer(LudicrousItems.singularity, shiny); MinecraftForgeClient.registerItemRenderer(LudicrousItems.endest_pearl, shiny); + RenderingRegistry.registerEntityRenderingHandler(EntityEndestPearl.class, new RenderSnowball(LudicrousItems.endest_pearl)); + RenderingRegistry.registerEntityRenderingHandler(EntityGapingVoid.class, new RenderSnowball(LudicrousItems.cosmic_meatballs)); + CosmicItemRenderer sparkly = new CosmicItemRenderer(); MinecraftForgeClient.registerItemRenderer(LudicrousItems.infinity_sword, sparkly); diff --git a/src/main/java/fox/spiteful/avaritia/entity/EntityEndestPearl.java b/src/main/java/fox/spiteful/avaritia/entity/EntityEndestPearl.java new file mode 100644 index 0000000..cc1f9f2 --- /dev/null +++ b/src/main/java/fox/spiteful/avaritia/entity/EntityEndestPearl.java @@ -0,0 +1,53 @@ +package fox.spiteful.avaritia.entity; + +import fox.spiteful.avaritia.Lumberjack; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.passive.EntityChicken; +import net.minecraft.entity.projectile.EntityThrowable; +import net.minecraft.util.DamageSource; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.World; + +public class EntityEndestPearl extends EntityThrowable { + + public EntityEndestPearl(World world, double x, double y, double z) { + super(world, x, y, z); + } + + public EntityEndestPearl(World world, EntityLivingBase ent) { + super(world, ent); + } + + public EntityEndestPearl(World world) { + super(world); + } + + @Override + protected void onImpact(MovingObjectPosition pos) { + if (pos.entityHit != null) + { + pos.entityHit.attackEntityFrom(DamageSource.causeThrownDamage(this, this.getThrower()), 0.0F); + } + + for (int i = 0; i < 32; ++i) + { + this.worldObj.spawnParticle("portal", this.posX, this.posY + this.rand.nextDouble() * 2.0D, this.posZ, this.rand.nextGaussian(), 0.0D, this.rand.nextGaussian()); + } + + if (!this.worldObj.isRemote) + { + //this.worldObj.createExplosion(this, pos.hitVec.xCoord, pos.hitVec.yCoord, pos.hitVec.zCoord, 4.0f, true); + + Entity ent = new EntityGapingVoid(this.worldObj); + //Entity ent = new EntityChicken(this.worldObj); + ent.setLocationAndAngles(this.posX, this.posY, this.posZ, this.rotationYaw, 0.0F); + this.worldObj.spawnEntityInWorld(ent); + + this.setDead(); + + Lumberjack.info("ded"); + } + } + +} diff --git a/src/main/java/fox/spiteful/avaritia/entity/EntityGapingVoid.java b/src/main/java/fox/spiteful/avaritia/entity/EntityGapingVoid.java new file mode 100644 index 0000000..b2a4947 --- /dev/null +++ b/src/main/java/fox/spiteful/avaritia/entity/EntityGapingVoid.java @@ -0,0 +1,53 @@ +package fox.spiteful.avaritia.entity; + +import fox.spiteful.avaritia.Lumberjack; +import net.minecraft.entity.Entity; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; + +public class EntityGapingVoid extends Entity { + + public EntityGapingVoid(World world) { + super(world); + this.isImmuneToFire = true; + } + + @Override + protected void entityInit() { + dataWatcher.addObject(12, 0); + dataWatcher.setObjectWatched(12); + Lumberjack.info("SPAWN"); + } + + @Override + public void onUpdate() { + super.onUpdate(); + + /*int age = this.getAge(); + + if (age >= 100) { + this.setDead(); + } else { + this.setAge(age+1); + }*/ + } + + + private void setAge(int age) { + dataWatcher.updateObject(12, age); + } + + private int getAge() { + return dataWatcher.getWatchableObjectInt(12); + } + + @Override + protected void readEntityFromNBT(NBTTagCompound tag) { + this.setAge(tag.getInteger("age")); + } + + @Override + protected void writeEntityToNBT(NBTTagCompound tag) { + tag.setInteger("age", this.getAge()); + } +} diff --git a/src/main/java/fox/spiteful/avaritia/entity/LudicrousEntities.java b/src/main/java/fox/spiteful/avaritia/entity/LudicrousEntities.java new file mode 100644 index 0000000..93f2909 --- /dev/null +++ b/src/main/java/fox/spiteful/avaritia/entity/LudicrousEntities.java @@ -0,0 +1,12 @@ +package fox.spiteful.avaritia.entity; + +import cpw.mods.fml.common.registry.EntityRegistry; +import fox.spiteful.avaritia.Avaritia; + +public class LudicrousEntities { + + public static void letLooseTheDogsOfWar() { + EntityRegistry.registerModEntity(EntityEndestPearl.class, "EndestPearl", 1, Avaritia.instance, 64, 10, true); + EntityRegistry.registerModEntity(EntityGapingVoid.class, "GapingVoid", 1, Avaritia.instance, 64, 10, false); + } +} diff --git a/src/main/java/fox/spiteful/avaritia/items/ItemEndestPearl.java b/src/main/java/fox/spiteful/avaritia/items/ItemEndestPearl.java index f92e274..ca58ae3 100644 --- a/src/main/java/fox/spiteful/avaritia/items/ItemEndestPearl.java +++ b/src/main/java/fox/spiteful/avaritia/items/ItemEndestPearl.java @@ -3,8 +3,8 @@ 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.entity.EntityEndestPearl; 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; @@ -26,20 +26,17 @@ public class ItemEndestPearl extends ItemEnderPearl implements IHaloRenderItem { { if (player.capabilities.isCreativeMode) { - return stack; + --stack.stackSize; } - else + + world.playSoundAtEntity(player, "random.bow", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F)); + + if (!world.isRemote) { - --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; + world.spawnEntityInWorld(new EntityEndestPearl(world, player)); } + + return stack; } @Override diff --git a/src/main/java/fox/spiteful/avaritia/render/ICosmicRenderItem.java b/src/main/java/fox/spiteful/avaritia/render/ICosmicRenderItem.java index 8915036..23d857a 100644 --- a/src/main/java/fox/spiteful/avaritia/render/ICosmicRenderItem.java +++ b/src/main/java/fox/spiteful/avaritia/render/ICosmicRenderItem.java @@ -1,9 +1,12 @@ 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 ICosmicRenderItem { + @SideOnly(Side.CLIENT) public IIcon getMaskTexture(ItemStack stack); }