From bda9d5056d5cf9b5b544af40a1f1afa5d5e7b061 Mon Sep 17 00:00:00 2001 From: John Yorke Date: Tue, 15 Nov 2016 21:06:13 -0400 Subject: [PATCH] New focus, texture improvements, text improvements, katana inscription rework, and bug fixes --- build.properties | 2 +- .../java/taintedmagic/client/ClientProxy.java | 48 +-- .../renderer/RenderEntityHomingShard.java | 89 ++++++ ...bble.java => RenderEntityTaintBubble.java} | 6 +- .../java/taintedmagic/common/CommonProxy.java | 4 - .../taintedmagic/common/TaintedMagic.java | 7 +- .../common/entities/EntityHomingShard.java | 182 +++++++++++ .../handler/TaintedMagicEventHandler.java | 2 +- .../common/helper/TaintedMagicHelper.java | 2 + .../taintedmagic/common/helper/Vector3.java | 297 ------------------ .../common/items/tools/ItemKatana.java | 78 ++--- .../items/tools/ItemPrimordialEdge.java | 2 +- .../wand/{ => foci}/ItemFocusEldritch.java | 4 +- .../wand/{ => foci}/ItemFocusMageMace.java | 4 +- .../wand/{ => foci}/ItemFocusMeteorology.java | 23 +- .../items/wand/{ => foci}/ItemFocusTaint.java | 6 +- .../{ => foci}/ItemFocusTaintedBlast.java | 7 +- .../items/wand/{ => foci}/ItemFocusTime.java | 17 +- .../items/wand/foci/ItemFocusVisShard.java | 116 +++++++ .../taintedmagic/common/lib/LibStrings.java | 2 +- .../common/network/PacketHandler.java | 2 +- ...romClient.java => PacketKatanaAttack.java} | 18 +- .../common/registry/ItemRegistry.java | 17 +- .../common/registry/ModEntityRegistry.java | 2 + .../registry/OreDictionaryRegistry.java | 1 + .../RecipeRegistry.java} | 55 ++-- .../common/registry/ResearchRegistry.java | 15 +- .../assets/taintedmagic/lang/en_US.lang | 25 +- .../resources/assets/taintedmagic/sounds.json | 3 +- .../assets/taintedmagic/sounds/shard.ogg | Bin 0 -> 6658 bytes .../textures/blocks/BlockShadowmetal.png | Bin 188 -> 303 bytes .../textures/foci/IconPersistant.png | Bin 0 -> 2194 bytes .../textures/items/ItemCrystalDagger.png | Bin 886 -> 892 bytes .../textures/items/ItemFocusMageMace.png | Bin 810 -> 801 bytes .../textures/items/ItemFocusMeteorology.png | Bin 10976 -> 6448 bytes .../textures/items/ItemFocusTaint.png | Bin 11068 -> 5451 bytes .../textures/items/ItemFocusVisShard.png | Bin 0 -> 5473 bytes .../items/ItemFocusVisShard.png.mcmeta | 3 + .../textures/items/ItemMaterial2.png | Bin 437 -> 427 bytes .../textures/items/ItemMaterial4.png | Bin 794 -> 731 bytes .../textures/items/ItemMaterial6.png | Bin 740 -> 694 bytes .../textures/items/ItemMaterial8.png | Bin 673 -> 661 bytes .../textures/items/ItemWandCap0.png | Bin 436 -> 569 bytes .../textures/misc/IconINSCRIPTIONFIRE.png | Bin 1167 -> 3034 bytes .../textures/misc/IconINSCRIPTIONTAINT.png | Bin 1233 -> 2798 bytes .../textures/misc/IconINSCRIPTIONUNDEAD.png | Bin 0 -> 3114 bytes .../textures/misc/IconINSCRIPTIONWIND.png | Bin 1308 -> 0 bytes src/main/resources/mcmod.info | 2 +- version.txt | 2 +- 49 files changed, 553 insertions(+), 490 deletions(-) create mode 100644 src/main/java/taintedmagic/client/renderer/RenderEntityHomingShard.java rename src/main/java/taintedmagic/client/renderer/{RenderTaintBubble.java => RenderEntityTaintBubble.java} (94%) create mode 100644 src/main/java/taintedmagic/common/entities/EntityHomingShard.java delete mode 100644 src/main/java/taintedmagic/common/helper/Vector3.java rename src/main/java/taintedmagic/common/items/wand/{ => foci}/ItemFocusEldritch.java (98%) rename src/main/java/taintedmagic/common/items/wand/{ => foci}/ItemFocusMageMace.java (97%) rename src/main/java/taintedmagic/common/items/wand/{ => foci}/ItemFocusMeteorology.java (80%) rename src/main/java/taintedmagic/common/items/wand/{ => foci}/ItemFocusTaint.java (96%) rename src/main/java/taintedmagic/common/items/wand/{ => foci}/ItemFocusTaintedBlast.java (96%) rename src/main/java/taintedmagic/common/items/wand/{ => foci}/ItemFocusTime.java (89%) create mode 100644 src/main/java/taintedmagic/common/items/wand/foci/ItemFocusVisShard.java rename src/main/java/taintedmagic/common/network/{PacketAttackEntityFromClient.java => PacketKatanaAttack.java} (71%) rename src/main/java/taintedmagic/common/{lib/LibRecipes.java => registry/RecipeRegistry.java} (95%) create mode 100644 src/main/resources/assets/taintedmagic/sounds/shard.ogg create mode 100644 src/main/resources/assets/taintedmagic/textures/foci/IconPersistant.png create mode 100644 src/main/resources/assets/taintedmagic/textures/items/ItemFocusVisShard.png create mode 100644 src/main/resources/assets/taintedmagic/textures/items/ItemFocusVisShard.png.mcmeta create mode 100644 src/main/resources/assets/taintedmagic/textures/misc/IconINSCRIPTIONUNDEAD.png delete mode 100644 src/main/resources/assets/taintedmagic/textures/misc/IconINSCRIPTIONWIND.png diff --git a/build.properties b/build.properties index 0c4df2b..58940f1 100644 --- a/build.properties +++ b/build.properties @@ -1,3 +1,3 @@ -mod_version=r7.5 +mod_version=r7.6 mod_name=Tainted-Magic minecraft_version=1.7.10 \ No newline at end of file diff --git a/src/main/java/taintedmagic/client/ClientProxy.java b/src/main/java/taintedmagic/client/ClientProxy.java index 13e8ae5..dbb6545 100644 --- a/src/main/java/taintedmagic/client/ClientProxy.java +++ b/src/main/java/taintedmagic/client/ClientProxy.java @@ -9,17 +9,19 @@ import net.minecraft.world.World; import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.common.MinecraftForge; import taintedmagic.client.handler.HUDHandler; +import taintedmagic.client.renderer.RenderEntityHomingShard; +import taintedmagic.client.renderer.RenderEntityTaintBubble; import taintedmagic.client.renderer.RenderItemKatana; -import taintedmagic.client.renderer.RenderTaintBubble; import taintedmagic.common.CommonProxy; import taintedmagic.common.entities.EntityEldritchOrbAttack; +import taintedmagic.common.entities.EntityHomingShard; import taintedmagic.common.entities.EntityTaintBubble; import taintedmagic.common.helper.TaintedMagicHelper; -import taintedmagic.common.helper.Vector3; import taintedmagic.common.registry.ItemRegistry; import thaumcraft.client.fx.ParticleEngine; import thaumcraft.client.fx.particles.FXWisp; import thaumcraft.client.renderers.entity.RenderEldritchOrb; +import thaumcraft.codechicken.lib.vec.Vector3; import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.relauncher.ReflectionHelper; @@ -29,8 +31,9 @@ public class ClientProxy extends CommonProxy public void initRenders () { // Entities - RenderingRegistry.registerEntityRenderingHandler(EntityTaintBubble.class, new RenderTaintBubble()); + RenderingRegistry.registerEntityRenderingHandler(EntityTaintBubble.class, new RenderEntityTaintBubble()); RenderingRegistry.registerEntityRenderingHandler(EntityEldritchOrbAttack.class, new RenderEldritchOrb()); + RenderingRegistry.registerEntityRenderingHandler(EntityHomingShard.class, new RenderEntityHomingShard()); // Items MinecraftForgeClient.registerItemRenderer(ItemRegistry.ItemKatana, new RenderItemKatana()); @@ -79,43 +82,4 @@ public class ClientProxy extends CommonProxy } } } - - @Override - public void spawnWindParticles (World w) - { - EntityPlayer p = getClientPlayer(); - Random r = new Random(); - - for (int i = 1; i < 200; i++) - { - double xp = (-Math.random() * 2.0F) + (Math.random() * 2.0F); - double zp = (-Math.random() * 2.0F) + (Math.random() * 2.0F); - double yp = (-Math.random() * 2.0F) + (Math.random() * 2.0F); - double off = Math.random() * 0.1; - - float red = (0.8F + p.worldObj.rand.nextFloat() * 0.5F); - float green = (0.8F + p.worldObj.rand.nextFloat() * 0.5F); - float blue = (0.6F + p.worldObj.rand.nextFloat() * 0.5F); - - FXWisp ef = new FXWisp(w, p.posX + xp + off, p.posY + yp + off, p.posZ + zp + off, 0.5F + ((float) Math.random() * 0.25F), red, green, blue); - ef.setGravity(0.0F); - ef.shrink = true; - ef.noClip = true; - - int age = 30 + r.nextInt(50); - - try - { - ReflectionHelper.setPrivateValue(EntityFX.class, ef, age, "particleMaxAge"); - } - catch (Exception e) - { - e.printStackTrace(); - } - Vector3 movement = TaintedMagicHelper.getDistanceBetween(ef, p); - ef.addVelocity(movement.x * 0.5, movement.y * 0.5, movement.z * 0.5); - - ParticleEngine.instance.addEffect(w, ef); - } - } } diff --git a/src/main/java/taintedmagic/client/renderer/RenderEntityHomingShard.java b/src/main/java/taintedmagic/client/renderer/RenderEntityHomingShard.java new file mode 100644 index 0000000..e27b655 --- /dev/null +++ b/src/main/java/taintedmagic/client/renderer/RenderEntityHomingShard.java @@ -0,0 +1,89 @@ +package taintedmagic.client.renderer; + +import java.util.Random; + +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.entity.Render; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.entity.Entity; +import net.minecraft.util.ResourceLocation; + +import org.lwjgl.opengl.GL11; + +import taintedmagic.common.entities.EntityHomingShard; +import thaumcraft.client.fx.ParticleEngine; + +/** + * this class is based off of RenderHomingShard.class created by as + * part of Thaumcraft 5 + */ +public class RenderEntityHomingShard extends Render +{ + public RenderEntityHomingShard () + { + super(); + this.shadowSize = 0.0F; + } + + public void renderEntityAt (EntityHomingShard e, double x, double y, double z, float fq, float pt) + { + Tessellator t = Tessellator.instance; + + GL11.glPushMatrix(); + GL11.glDepthMask(false); + GL11.glEnable(3042); + GL11.glBlendFunc(770, 771); + + bindTexture(ParticleEngine.particleTexture); + + float f2 = (8 + e.ticksExisted % 8) / 16.0F; + float f3 = f2 + 0.0625F; + float f4 = 0.25F; + float f5 = f4 + 0.0625F; + + float f6 = 1.0F; + float f7 = 0.5F; + float f8 = 0.5F; + + GL11.glColor4f(0.405F, 0.075F, 0.525F, 1.0F); + + GL11.glPushMatrix(); + GL11.glTranslated(x, y, z); + GL11.glRotatef(180.0F - this.renderManager.playerViewY, 0.0F, 1.0F, 0.0F); + GL11.glRotatef(-this.renderManager.playerViewX, 1.0F, 0.0F, 0.0F); + GL11.glScalef(0.4F + 0.1F * e.getStrength(), 0.4F + 0.1F * e.getStrength(), 0.4F + 0.1F * e.getStrength()); + + t.startDrawingQuads(); + + t.setColorRGBA_F(0.405F, 0.075F, 0.525F, 1.0F); + t.setNormal(0.0F, 1.0F, 0.0F); + t.setBrightness(240); + + t.addVertexWithUV(-f7, -f8, 0.0D, f2, f5); + t.addVertexWithUV(f6 - f7, -f8, 0.0D, f3, f5); + t.addVertexWithUV(f6 - f7, 1.0F - f8, 0.0D, f3, f4); + t.addVertexWithUV(-f7, 1.0F - f8, 0.0D, f2, f4); + + t.draw(); + + GL11.glPopMatrix(); + + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GL11.glBlendFunc(770, 771); + GL11.glDisable(3042); + GL11.glDisable(32826); + + GL11.glDepthMask(true); + GL11.glPopMatrix(); + } + + public void doRender (Entity e, double x, double y, double z, float f, float pt) + { + renderEntityAt((EntityHomingShard) e, x, y, z, f, pt); + } + + protected ResourceLocation getEntityTexture (Entity e) + { + return TextureMap.locationBlocksTexture; + } +} diff --git a/src/main/java/taintedmagic/client/renderer/RenderTaintBubble.java b/src/main/java/taintedmagic/client/renderer/RenderEntityTaintBubble.java similarity index 94% rename from src/main/java/taintedmagic/client/renderer/RenderTaintBubble.java rename to src/main/java/taintedmagic/client/renderer/RenderEntityTaintBubble.java index d62ebc9..fb2a56c 100644 --- a/src/main/java/taintedmagic/client/renderer/RenderTaintBubble.java +++ b/src/main/java/taintedmagic/client/renderer/RenderEntityTaintBubble.java @@ -12,12 +12,12 @@ import org.lwjgl.opengl.GL11; import taintedmagic.common.entities.EntityTaintBubble; -public class RenderTaintBubble extends Render +public class RenderEntityTaintBubble extends Render { private static final ResourceLocation texture = new ResourceLocation("taintedmagic:textures/entities/EntityTaintBubble.png"); private Random random = new Random(); - public RenderTaintBubble () + public RenderEntityTaintBubble () { this.shadowSize = 0.0F; } @@ -47,7 +47,7 @@ public class RenderTaintBubble extends Render float f7 = 0.5F; float f8 = 0.5F; - float s = 0.5F; + float s = 0.25F; GL11.glScalef(s, s, s); diff --git a/src/main/java/taintedmagic/common/CommonProxy.java b/src/main/java/taintedmagic/common/CommonProxy.java index 3ebcbc9..ab98b55 100644 --- a/src/main/java/taintedmagic/common/CommonProxy.java +++ b/src/main/java/taintedmagic/common/CommonProxy.java @@ -30,8 +30,4 @@ public class CommonProxy public void spawnShockwaveParticles (World w) { } - - public void spawnWindParticles (World w) - { - } } diff --git a/src/main/java/taintedmagic/common/TaintedMagic.java b/src/main/java/taintedmagic/common/TaintedMagic.java index a20a968..379f944 100644 --- a/src/main/java/taintedmagic/common/TaintedMagic.java +++ b/src/main/java/taintedmagic/common/TaintedMagic.java @@ -18,13 +18,13 @@ import taintedmagic.common.handler.ConfigHandler; import taintedmagic.common.handler.TaintedMagicEventHandler; import taintedmagic.common.handler.UpdateHandler; import taintedmagic.common.lib.LibCreativeTab; -import taintedmagic.common.lib.LibRecipes; import taintedmagic.common.lib.LibStrings; import taintedmagic.common.network.PacketHandler; import taintedmagic.common.registry.BlockRegistry; import taintedmagic.common.registry.ItemRegistry; import taintedmagic.common.registry.ModEntityRegistry; import taintedmagic.common.registry.OreDictionaryRegistry; +import taintedmagic.common.registry.RecipeRegistry; import taintedmagic.common.registry.ResearchRegistry; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; @@ -68,7 +68,9 @@ public class TaintedMagic ItemRegistry.init(); BlockRegistry.init(); ModEntityRegistry.init(); - LibRecipes.init(); + RecipeRegistry.init(); + + OreDictionaryRegistry.init(); if (configHandler.useUpdateHandler) UpdateHandler.init(); } @@ -94,7 +96,6 @@ public class TaintedMagic log.info("Almost done... Post-initializing Tainted Magic!"); ResearchRegistry.initResearch(); - OreDictionaryRegistry.init(); log.info("Phew! Tainted Magic has finished loading, enjoy!"); } diff --git a/src/main/java/taintedmagic/common/entities/EntityHomingShard.java b/src/main/java/taintedmagic/common/entities/EntityHomingShard.java new file mode 100644 index 0000000..1be24eb --- /dev/null +++ b/src/main/java/taintedmagic/common/entities/EntityHomingShard.java @@ -0,0 +1,182 @@ +package taintedmagic.common.entities; + +import io.netty.buffer.ByteBuf; + +import java.util.ArrayList; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.projectile.EntityThrowable; +import net.minecraft.util.DamageSource; +import net.minecraft.util.MathHelper; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.Vec3; +import net.minecraft.world.World; +import thaumcraft.common.Thaumcraft; +import thaumcraft.common.lib.utils.EntityUtils; +import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +/** + * this class is based off of EntityHomingShard.class created by as + * part of Thaumcraft 5 + */ +public class EntityHomingShard extends EntityThrowable implements IEntityAdditionalSpawnData +{ + Class tClass = null; + boolean persistant = false; + + int targetID = 0; + EntityLivingBase target; + + public EntityHomingShard (World w) + { + super(w); + } + + public EntityHomingShard (World w, EntityLivingBase p, EntityLivingBase t, int strength, boolean b) + { + super(w, p); + this.target = t; + this.tClass = t.getClass(); + this.persistant = b; + setStrength(strength); + Vec3 v = p.getLookVec(); + setLocationAndAngles(p.posX + v.xCoord / 2.0D, p.posY + p.getEyeHeight() + v.yCoord / 2.0D, p.posZ + v.zCoord / 2.0D, p.rotationYaw, p.rotationPitch); + float f = 0.5F; + float ry = p.rotationYaw + (this.rand.nextFloat() - this.rand.nextFloat()) * 60.0F; + float rp = p.rotationPitch + (this.rand.nextFloat() - this.rand.nextFloat()) * 60.0F; + this.motionX = (-MathHelper.sin(ry / 180.0F * (float) Math.PI) * MathHelper.cos(rp / 180.0F * (float) Math.PI) * f); + this.motionZ = (MathHelper.cos(ry / 180.0F * (float) Math.PI) * MathHelper.cos(rp / 180.0F * (float) Math.PI) * f); + this.motionY = (-MathHelper.sin(rp / 180.0F * (float) Math.PI) * f); + } + + @Override + public void entityInit () + { + super.entityInit(); + this.dataWatcher.addObject(17, (byte) 0); + } + + public void setStrength (int str) + { + this.dataWatcher.updateObject(17, Byte.valueOf((byte) str)); + } + + public int getStrength () + { + return this.dataWatcher.getWatchableObjectByte(17); + } + + @Override + protected float getGravityVelocity () + { + return 0.0F; + } + + @Override + public void writeSpawnData (ByteBuf buf) + { + int id = -1; + if (this.target != null) id = this.target.getEntityId(); + buf.writeInt(id); + } + + @Override + public void readSpawnData (ByteBuf buf) + { + int id = buf.readInt(); + try + { + if (id >= 0) this.target = ((EntityLivingBase) this.worldObj.getEntityByID(id)); + } + catch (Exception e) + { + } + } + + @Override + protected void onImpact (MovingObjectPosition mop) + { + if (!this.worldObj.isRemote && mop.typeOfHit == MovingObjectPosition.MovingObjectType.ENTITY && (getThrower() == null || (getThrower() != null && mop.entityHit != getThrower()))) + { + mop.entityHit.attackEntityFrom(DamageSource.causeIndirectMagicDamage(this, getThrower()), 2.0F + getStrength() * 0.5F); + this.worldObj.playSoundAtEntity(this, "thaumcraft:zap", 1.0F, 1.0F + (this.rand.nextFloat() - this.rand.nextFloat()) * 0.2F); + this.worldObj.setEntityState(this, (byte) 16); + setDead(); + } + + if (mop.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK && this.worldObj.getBlock(mop.blockX, mop.blockY, mop.blockZ).isOpaqueCube()) + { + this.motionZ *= -0.5D; + this.motionX *= -0.5D; + this.motionY *= -0.5D; + } + } + + @Override + @SideOnly (Side.CLIENT) + public void handleHealthUpdate (byte b) + { + if (b == 16) Thaumcraft.proxy.burst(worldObj, this.posX, this.posY, this.posZ, 0.3F); + else super.handleHealthUpdate(b); + } + + @Override + public void onUpdate () + { + double motion = Math.abs(this.motionX) + Math.abs(this.motionY) + Math.abs(this.motionZ); + if (motion > 0.0D && this.worldObj.isRemote) Thaumcraft.proxy.sparkle((float) this.posX + (this.worldObj.rand.nextFloat() - this.worldObj.rand.nextFloat()) * 0.25F, (float) this.posY + (this.worldObj.rand.nextFloat() - this.worldObj.rand.nextFloat()) * 0.25F, (float) this.posZ + (this.worldObj.rand.nextFloat() - this.worldObj.rand.nextFloat()) * 0.25F, 0.5F, 0, 0.0F); + + super.onUpdate(); + + if (!this.worldObj.isRemote) + { + if (this.persistant && (this.target == null || this.target.isDead || this.target.getDistanceSqToEntity(this) > 1250.0D)) + { + ArrayList ents = EntityUtils.getEntitiesInRange(this.worldObj, this.posX, this.posY, this.posZ, this, this.tClass, 16.0D); + + for (Entity e : ents) + { + if (e instanceof EntityLivingBase && !e.isDead && (getThrower() == null || e.getEntityId() != getThrower().getEntityId())) + { + this.target = ((EntityLivingBase) e); + break; + } + } + } + if (this.target == null || this.target.isDead) + { + this.worldObj.setEntityState(this, (byte) 16); + setDead(); + } + } + + if (this.ticksExisted > 300) + { + this.worldObj.setEntityState(this, (byte) 16); + setDead(); + } + + if (this.ticksExisted % 20 == 0 && this.target != null && !this.target.isDead) + { + double d = getDistanceToEntity(this.target); + double dx = this.target.posX - this.posX; + double dy = this.target.boundingBox.minY + this.target.height * 0.6D - this.posY; + double dz = this.target.posZ - this.posZ; + dx /= d; + dy /= d; + dz /= d; + + this.motionX = dx; + this.motionY = dy; + this.motionZ = dz; + + this.worldObj.playSoundAtEntity(this, "taintedmagic:shard", 0.1F, 2.0F * this.worldObj.rand.nextFloat()); + } + this.motionX *= 0.85D; + this.motionY *= 0.85D; + this.motionZ *= 0.85D; + } +} diff --git a/src/main/java/taintedmagic/common/handler/TaintedMagicEventHandler.java b/src/main/java/taintedmagic/common/handler/TaintedMagicEventHandler.java index a25748b..0e3becf 100644 --- a/src/main/java/taintedmagic/common/handler/TaintedMagicEventHandler.java +++ b/src/main/java/taintedmagic/common/handler/TaintedMagicEventHandler.java @@ -23,7 +23,7 @@ import net.minecraftforge.event.entity.living.LivingDropsEvent; import net.minecraftforge.event.entity.living.LivingEvent; import net.minecraftforge.event.entity.player.ItemTooltipEvent; import taintedmagic.api.IBloodlust; -import taintedmagic.common.items.wand.ItemFocusMageMace; +import taintedmagic.common.items.wand.foci.ItemFocusMageMace; import taintedmagic.common.registry.ItemRegistry; import thaumcraft.api.ThaumcraftApiHelper; import thaumcraft.api.aspects.Aspect; diff --git a/src/main/java/taintedmagic/common/helper/TaintedMagicHelper.java b/src/main/java/taintedmagic/common/helper/TaintedMagicHelper.java index cac9119..e8da81c 100644 --- a/src/main/java/taintedmagic/common/helper/TaintedMagicHelper.java +++ b/src/main/java/taintedmagic/common/helper/TaintedMagicHelper.java @@ -3,9 +3,11 @@ package taintedmagic.common.helper; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.Vec3; import taintedmagic.api.IBloodlust; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; +import thaumcraft.codechicken.lib.vec.Vector3; public class TaintedMagicHelper { diff --git a/src/main/java/taintedmagic/common/helper/Vector3.java b/src/main/java/taintedmagic/common/helper/Vector3.java deleted file mode 100644 index 7f12830..0000000 --- a/src/main/java/taintedmagic/common/helper/Vector3.java +++ /dev/null @@ -1,297 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the the Tainted Magic mod. - **/ -package taintedmagic.common.helper; - -import java.math.BigDecimal; -import java.math.MathContext; -import java.math.RoundingMode; - -import net.minecraft.entity.Entity; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.Vec3; - -import org.lwjgl.opengl.GL11; -import org.lwjgl.util.vector.Vector3f; -import org.lwjgl.util.vector.Vector4f; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -public class Vector3 -{ - public static Vector3 zero = new Vector3(); - public static Vector3 one = new Vector3(1, 1, 1); - public static Vector3 center = new Vector3(0.5, 0.5, 0.5); - - public double x; - public double y; - public double z; - - public Vector3() { - } - - public Vector3(double d, double d1, double d2) { - x = d; - y = d1; - z = d2; - } - - public Vector3(Vector3 vec) { - x = vec.x; - y = vec.y; - z = vec.z; - } - - public Vector3(Vec3 vec) { - x = vec.xCoord; - y = vec.yCoord; - z = vec.zCoord; - } - - public Vector3 copy() { - return new Vector3(this); - } - - public static Vector3 fromEntity(Entity e) { - return new Vector3(e.posX, e.posY, e.posZ); - } - - public static Vector3 fromEntityCenter(Entity e) { - return new Vector3(e.posX, e.posY - e.yOffset + e.height / 2, e.posZ); - } - - public static Vector3 fromTileEntity(TileEntity e) { - return new Vector3(e.xCoord, e.yCoord, e.zCoord); - } - - public static Vector3 fromTileEntityCenter(TileEntity e) { - return new Vector3(e.xCoord + 0.5, e.yCoord + 0.5, e.zCoord + 0.5); - } - - public Vector3 set(double d, double d1, double d2) { - x = d; - y = d1; - z = d2; - return this; - } - - public Vector3 set(Vector3 vec) { - x = vec.x; - y = vec.y; - z = vec.z; - return this; - } - - public double dotProduct(Vector3 vec) { - double d = vec.x * x + vec.y * y + vec.z * z; - - if(d > 1 && d < 1.00001) - d = 1; - else if(d < -1 && d > -1.00001) - d = -1; - return d; - } - - public double dotProduct(double d, double d1, double d2) { - return d * x + d1 * y + d2 * z; - } - - public Vector3 crossProduct(Vector3 vec) { - double d = y * vec.z - z * vec.y; - double d1 = z * vec.x - x * vec.z; - double d2 = x * vec.y - y * vec.x; - x = d; - y = d1; - z = d2; - return this; - } - - public Vector3 add(double d, double d1, double d2) { - x += d; - y += d1; - z += d2; - return this; - } - - public Vector3 add(Vector3 vec) { - x += vec.x; - y += vec.y; - z += vec.z; - return this; - } - - public Vector3 add(double d) { - return add(d, d, d); - } - - public Vector3 sub(Vector3 vec) { - return subtract(vec); - } - - public Vector3 subtract(Vector3 vec) { - x -= vec.x; - y -= vec.y; - z -= vec.z; - return this; - } - - public Vector3 negate(Vector3 vec) { - x = -x; - y = -y; - z = -z; - return this; - } - - public Vector3 multiply(double d) { - x *= d; - y *= d; - z *= d; - return this; - } - - public Vector3 multiply(Vector3 f) { - x *= f.x; - y *= f.y; - z *= f.z; - return this; - } - - public Vector3 multiply(double fx, double fy, double fz) { - x *= fx; - y *= fy; - z *= fz; - return this; - } - - public double mag() { - return Math.sqrt(x * x + y * y + z * z); - } - - public double magSquared() { - return x * x + y * y + z * z; - } - - public Vector3 normalize() { - double d = mag(); - if(d != 0) - multiply(1 / d); - - return this; - } - - @Override - public String toString() { - MathContext cont = new MathContext(4, RoundingMode.HALF_UP); - return "Vector3(" + new BigDecimal(x, cont) + ", " +new BigDecimal(y, cont) + ", " + new BigDecimal(z, cont) + ")"; - } - - public Vector3 perpendicular() { - if(z == 0) - return zCrossProduct(); - return xCrossProduct(); - } - - public Vector3 xCrossProduct() { - double d = z; - double d1 = -y; - x = 0; - y = d; - z = d1; - return this; - } - - public Vector3 zCrossProduct() { - double d = y; - - double d1 = -x; - x = d; - y = d1; - z = 0; - return this; - } - - public Vector3 yCrossProduct() { - double d = -z; - double d1 = x; - x = d; - y = 0; - z = d1; - return this; - } - - public Vec3 toVec3D() { - return Vec3.createVectorHelper(x, y, z); - } - - public double angle(Vector3 vec) { - return Math.acos(copy().normalize().dotProduct(vec.copy().normalize())); - } - - public boolean isInside(AxisAlignedBB aabb) { - return x >= aabb.minX && y >= aabb.maxY && z >= aabb.minZ && x < aabb.maxX && y < aabb.maxY && z < aabb.maxZ; - } - - public boolean isZero() { - return x == 0 && y == 0 && z == 0; - } - - public boolean isAxial() { - return x == 0 ? y == 0 || z == 0 : y == 0 && z == 0; - } - - @SideOnly(Side.CLIENT) - public Vector3f vector3f() { - return new Vector3f((float)x, (float)y, (float)z); - } - - @SideOnly(Side.CLIENT) - public Vector4f vector4f() { - return new Vector4f((float)x, (float)y, (float)z, 1); - } - - @SideOnly(Side.CLIENT) - public void glVertex() { - GL11.glVertex3d(x, y, z); - } - - public Vector3 negate() { - x = -x; - y = -y; - z = -z; - return this; - } - - public double scalarProject(Vector3 b) { - double l = b.mag(); - return l == 0 ? 0 : dotProduct(b)/l; - } - - public Vector3 project(Vector3 b) { - double l = b.magSquared(); - if(l == 0) { - set(0, 0, 0); - return this; - } - - double m = dotProduct(b)/l; - set(b).multiply(m); - return this; - } - -/* public Vector3 rotate(double angle, Vector3 axis) { - Quat.aroundAxis(axis.copy().normalize(), angle).rotate(this); - return this; - } -*/ - @Override - public boolean equals(Object o) { - if(!(o instanceof Vector3)) - return false; - - Vector3 v = (Vector3)o; - return x == v.x && y == v.y && z == v.z; - } -} \ No newline at end of file diff --git a/src/main/java/taintedmagic/common/items/tools/ItemKatana.java b/src/main/java/taintedmagic/common/items/tools/ItemKatana.java index e9ec580..77ee04d 100644 --- a/src/main/java/taintedmagic/common/items/tools/ItemKatana.java +++ b/src/main/java/taintedmagic/common/items/tools/ItemKatana.java @@ -1,6 +1,7 @@ package taintedmagic.common.items.tools; import java.util.List; +import java.util.Random; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; @@ -8,7 +9,6 @@ import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.Tessellator; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; @@ -19,7 +19,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.MathHelper; @@ -37,16 +36,12 @@ import taintedmagic.client.model.ModelKatana; import taintedmagic.client.model.ModelSaya; import taintedmagic.common.TaintedMagic; import taintedmagic.common.entities.EntityTaintBubble; -import taintedmagic.common.helper.TaintedMagicHelper; -import taintedmagic.common.helper.Vector3; -import taintedmagic.common.network.PacketAttackEntityFromClient; +import taintedmagic.common.network.PacketKatanaAttack; import taintedmagic.common.network.PacketHandler; import thaumcraft.api.IRepairable; import thaumcraft.api.IWarpingGear; -import thaumcraft.api.wands.FocusUpgradeType; -import thaumcraft.common.Thaumcraft; import thaumcraft.common.config.Config; -import thaumcraft.common.entities.projectile.EntityEmber; +import thaumcraft.common.entities.projectile.EntityExplosiveOrb; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -123,7 +118,7 @@ public class ItemKatana extends Item implements IWarpingGear, IRepairable } case 2 : { - e.attackEntityFrom(new DamageSource("wind").setMagicDamage().setDamageBypassesArmor(), getAttackDamage(s)); + e.attackEntityFrom(DamageSource.wither.setMagicDamage().setDamageBypassesArmor(), getAttackDamage(s)); try { @@ -234,36 +229,38 @@ public class ItemKatana extends Item implements IWarpingGear, IRepairable public void onPlayerStoppedUsing (ItemStack s, World w, EntityPlayer p, int i) { super.onPlayerStoppedUsing(s, w, p, i); + Random r = new Random(); - if (!hasAnyInscription(s) || castType(p) == 0 || p.isSneaking()) + if (!hasAnyInscription(s) || !isFullyCharged(p) || p.isSneaking() || getInscription(s) == 2) { + boolean leech = (getInscription(s) == 2 && isFullyCharged(p)); + boolean b = false; + if (w.isRemote) { MovingObjectPosition mop = Minecraft.getMinecraft().objectMouseOver; float mul = Math.min(1.0F + (float) this.ticksInUse / 40.0F, 2.0F); - if (mop.entityHit != null) PacketHandler.INSTANCE.sendToServer(new PacketAttackEntityFromClient(mop.entityHit, p, this.getAttackDamage(s) * mul)); - + if (mop.entityHit != null) + { + PacketHandler.INSTANCE.sendToServer(new PacketKatanaAttack(mop.entityHit, p, this.getAttackDamage(s) * mul, leech)); + } p.swingItem(); } - p.worldObj.playSoundAtEntity(p, "thaumcraft:swing", 0.5F + (float) Math.random(), 0.5F + (float) Math.random()); + p.worldObj.playSoundAtEntity(p, ("thaumcraft:swing"), 0.5F + (float) Math.random(), 0.5F + (float) Math.random()); } - else if (hasAnyInscription(s) && castType(p) == 1 && !p.isSneaking()) + else if (hasAnyInscription(s) && isFullyCharged(p) && !p.isSneaking()) { switch (getInscription(s)) { case 0 : { - for (int a = 0; a < 50; a++) - { - EntityEmber proj = new EntityEmber(w, p, 5.0F); - proj.posX += proj.motionX; - proj.posY += proj.motionY; - proj.posZ += proj.motionZ; - proj.damage = 10.0F; - w.spawnEntityInWorld(proj); - p.swingItem(); - } + EntityExplosiveOrb proj = new EntityExplosiveOrb(w, p); + proj.posX += proj.motionX; + proj.posY += proj.motionY; + proj.posZ += proj.motionZ; + if (!w.isRemote) w.spawnEntityInWorld(proj); + p.swingItem(); break; } case 1 : @@ -274,45 +271,24 @@ public class ItemKatana extends Item implements IWarpingGear, IRepairable proj.posX += proj.motionX; proj.posY += proj.motionY; proj.posZ += proj.motionZ; - proj.damage = 10.0F; - w.spawnEntityInWorld(proj); + proj.damage = getAttackDamage(s) * 0.2F; + if (!w.isRemote) w.spawnEntityInWorld(proj); p.swingItem(); } break; } - case 2 : - { - List ents = w.getEntitiesWithinAABB(EntityLivingBase.class, AxisAlignedBB.getBoundingBox(p.posX, p.posY, p.posZ, p.posX + 1, p.posY + 1, p.posZ + 1).expand(5.0D, 5.0D, 5.0D)); - if (ents != null && ents.size() > 0) - { - for (int a = 0; a < ents.size(); a++) - { - EntityLivingBase e = ents.get(a); - - if (e != p && e.isEntityAlive() && !e.isEntityInvulnerable()) - { - double dist = TaintedMagicHelper.getDistanceTo(e.posX, e.posY, e.posZ, p); - if (dist < 2.0D) e.attackEntityFrom(DamageSource.causePlayerDamage(p).setMagicDamage(), 5.0F); - Vector3 movement = TaintedMagicHelper.getDistanceBetween(e, p); - e.addVelocity(movement.x * 3, 0.8, movement.z * 3); - } - } - } - p.worldObj.playSoundAtEntity(p, "taintedmagic:shockwave", 5.0F, 1.0F * (float) Math.random()); - TaintedMagic.proxy.spawnWindParticles(p.worldObj); - p.swingItem(); + default : break; } - } } } - public int castType (EntityPlayer p) + private boolean isFullyCharged (EntityPlayer p) { float f = Math.min((float) this.ticksInUse / 15.0F, 2.0F); - if (f == 2.0F) return 1; - else return 0; + if (f == 2.0F) return true; + else return false; } @SideOnly (Side.CLIENT) diff --git a/src/main/java/taintedmagic/common/items/tools/ItemPrimordialEdge.java b/src/main/java/taintedmagic/common/items/tools/ItemPrimordialEdge.java index 4f840c5..e592198 100644 --- a/src/main/java/taintedmagic/common/items/tools/ItemPrimordialEdge.java +++ b/src/main/java/taintedmagic/common/items/tools/ItemPrimordialEdge.java @@ -39,7 +39,7 @@ public class ItemPrimordialEdge extends ItemSword implements IWarpingGear, IRepa public EnumRarity getRarity (ItemStack s) { - return EnumRarity.epic; + return TaintedMagic.rarityCreation; } public boolean hitEntity (ItemStack s, EntityLivingBase e, EntityLivingBase p) diff --git a/src/main/java/taintedmagic/common/items/wand/ItemFocusEldritch.java b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusEldritch.java similarity index 98% rename from src/main/java/taintedmagic/common/items/wand/ItemFocusEldritch.java rename to src/main/java/taintedmagic/common/items/wand/foci/ItemFocusEldritch.java index a03332f..9af5403 100644 --- a/src/main/java/taintedmagic/common/items/wand/ItemFocusEldritch.java +++ b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusEldritch.java @@ -1,4 +1,4 @@ -package taintedmagic.common.items.wand; +package taintedmagic.common.items.wand.foci; import java.util.Random; @@ -63,7 +63,7 @@ public class ItemFocusEldritch extends ItemFocusBasic public String getSortingHelper (ItemStack s) { - return "AM" + super.getSortingHelper(s); + return "ELDRITCH" + super.getSortingHelper(s); } public int getFocusColor (ItemStack s) diff --git a/src/main/java/taintedmagic/common/items/wand/ItemFocusMageMace.java b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusMageMace.java similarity index 97% rename from src/main/java/taintedmagic/common/items/wand/ItemFocusMageMace.java rename to src/main/java/taintedmagic/common/items/wand/foci/ItemFocusMageMace.java index 02dc1a5..38a090f 100644 --- a/src/main/java/taintedmagic/common/items/wand/ItemFocusMageMace.java +++ b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusMageMace.java @@ -1,4 +1,4 @@ -package taintedmagic.common.items.wand; +package taintedmagic.common.items.wand.foci; import java.util.List; @@ -60,7 +60,7 @@ public class ItemFocusMageMace extends ItemFocusBasic public String getSortingHelper (ItemStack s) { - return "MM" + super.getSortingHelper(s); + return "MACE" + super.getSortingHelper(s); } public int getFocusColor (ItemStack s) diff --git a/src/main/java/taintedmagic/common/items/wand/ItemFocusMeteorology.java b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusMeteorology.java similarity index 80% rename from src/main/java/taintedmagic/common/items/wand/ItemFocusMeteorology.java rename to src/main/java/taintedmagic/common/items/wand/foci/ItemFocusMeteorology.java index b3d2b6a..b44f011 100644 --- a/src/main/java/taintedmagic/common/items/wand/ItemFocusMeteorology.java +++ b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusMeteorology.java @@ -1,33 +1,20 @@ -package taintedmagic.common.items.wand; - -import java.util.Random; +package taintedmagic.common.items.wand.foci; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.command.ICommandManager; -import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; -import net.minecraft.potion.PotionEffect; -import net.minecraft.server.MinecraftServer; -import net.minecraft.util.ChunkCoordinates; -import net.minecraft.util.IChatComponent; import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.Vec3; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import taintedmagic.common.TaintedMagic; -import taintedmagic.common.entities.EntityTaintBubble; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.wands.ItemFocusBasic; -import thaumcraft.common.Thaumcraft; -import thaumcraft.common.config.Config; -import thaumcraft.common.entities.projectile.EntityEmber; import thaumcraft.common.items.wands.ItemWandCasting; import thaumcraft.common.items.wands.WandManager; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class ItemFocusMeteorology extends ItemFocusBasic { @@ -55,7 +42,7 @@ public class ItemFocusMeteorology extends ItemFocusBasic public String getSortingHelper (ItemStack s) { - return "WT" + super.getSortingHelper(s); + return "RAIN" + super.getSortingHelper(s); } public int getFocusColor (ItemStack s) @@ -99,6 +86,6 @@ public class ItemFocusMeteorology extends ItemFocusBasic @SideOnly (Side.CLIENT) public EnumRarity getRarity (ItemStack s) { - return EnumRarity.epic; + return TaintedMagic.rarityCreation; } } diff --git a/src/main/java/taintedmagic/common/items/wand/ItemFocusTaint.java b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusTaint.java similarity index 96% rename from src/main/java/taintedmagic/common/items/wand/ItemFocusTaint.java rename to src/main/java/taintedmagic/common/items/wand/foci/ItemFocusTaint.java index ece88ec..f1e94ad 100644 --- a/src/main/java/taintedmagic/common/items/wand/ItemFocusTaint.java +++ b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusTaint.java @@ -1,4 +1,4 @@ -package taintedmagic.common.items.wand; +package taintedmagic.common.items.wand.foci; import java.util.Random; @@ -54,7 +54,7 @@ public class ItemFocusTaint extends ItemFocusBasic public String getSortingHelper (ItemStack s) { - return "BM" + super.getSortingHelper(s); + return "TAINT" + super.getSortingHelper(s); } public int getFocusColor (ItemStack s) @@ -100,7 +100,7 @@ public class ItemFocusTaint extends ItemFocusBasic } int range = 8; Vec3 vec3d = p.getLook(range); - if (!p.worldObj.isRemote && p.ticksExisted % 5 == 0) p.worldObj.playSoundAtEntity(p, "thaumcraft:bubble", 0.33F, 2F * (float)Math.random()); + if (!p.worldObj.isRemote && p.ticksExisted % 5 == 0) p.worldObj.playSoundAtEntity(p, "thaumcraft:bubble", 0.33F, 5.0F * (float) Math.random()); int potency = wand.getFocusPotency(s); if ( (!p.worldObj.isRemote) && (wand.consumeAllVis(s, p, getVisCost(s), true, false))) diff --git a/src/main/java/taintedmagic/common/items/wand/ItemFocusTaintedBlast.java b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusTaintedBlast.java similarity index 96% rename from src/main/java/taintedmagic/common/items/wand/ItemFocusTaintedBlast.java rename to src/main/java/taintedmagic/common/items/wand/foci/ItemFocusTaintedBlast.java index d36036c..63fb5fb 100644 --- a/src/main/java/taintedmagic/common/items/wand/ItemFocusTaintedBlast.java +++ b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusTaintedBlast.java @@ -1,9 +1,8 @@ -package taintedmagic.common.items.wand; +package taintedmagic.common.items.wand.foci; import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -16,11 +15,11 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; import taintedmagic.common.TaintedMagic; import taintedmagic.common.helper.TaintedMagicHelper; -import taintedmagic.common.helper.Vector3; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.wands.FocusUpgradeType; import thaumcraft.api.wands.ItemFocusBasic; +import thaumcraft.codechicken.lib.vec.Vector3; import thaumcraft.common.items.wands.ItemWandCasting; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -58,7 +57,7 @@ public class ItemFocusTaintedBlast extends ItemFocusBasic public String getSortingHelper (ItemStack s) { - return "TB" + super.getSortingHelper(s); + return "SHOCKWAVE" + super.getSortingHelper(s); } public int getFocusColor (ItemStack s) diff --git a/src/main/java/taintedmagic/common/items/wand/ItemFocusTime.java b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusTime.java similarity index 89% rename from src/main/java/taintedmagic/common/items/wand/ItemFocusTime.java rename to src/main/java/taintedmagic/common/items/wand/foci/ItemFocusTime.java index c58503d..5cb8580 100644 --- a/src/main/java/taintedmagic/common/items/wand/ItemFocusTime.java +++ b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusTime.java @@ -1,4 +1,4 @@ -package taintedmagic.common.items.wand; +package taintedmagic.common.items.wand.foci; import java.awt.Color; @@ -13,7 +13,6 @@ import taintedmagic.common.TaintedMagic; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.wands.ItemFocusBasic; -import thaumcraft.common.Thaumcraft; import thaumcraft.common.items.wands.ItemWandCasting; import thaumcraft.common.items.wands.WandManager; import cpw.mods.fml.relauncher.Side; @@ -45,7 +44,7 @@ public class ItemFocusTime extends ItemFocusBasic public String getSortingHelper (ItemStack s) { - return "TI" + super.getSortingHelper(s); + return "TIME" + super.getSortingHelper(s); } public int getFocusColor (ItemStack s) @@ -79,11 +78,11 @@ public class ItemFocusTime extends ItemFocusBasic WandManager.setCooldown(p, 30000); ItemWandCasting wand = (ItemWandCasting) s.getItem(); - wand.consumeAllVis(s, p, getVisCost(s), true, false); - - w.setWorldTime(w.isDaytime() ? 14000 : 0); - - p.playSound("thaumcraft:wand", 0.5F, 1.0F); + if (wand.consumeAllVis(s, p, getVisCost(s), true, false)) + { + w.setWorldTime(w.isDaytime() ? 14000 : 0); + p.playSound("thaumcraft:wand", 0.5F, 1.0F); + } return s; } @@ -97,6 +96,6 @@ public class ItemFocusTime extends ItemFocusBasic @SideOnly (Side.CLIENT) public EnumRarity getRarity (ItemStack s) { - return EnumRarity.epic; + return TaintedMagic.rarityCreation; } } diff --git a/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusVisShard.java b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusVisShard.java new file mode 100644 index 0000000..a1bc878 --- /dev/null +++ b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusVisShard.java @@ -0,0 +1,116 @@ +package taintedmagic.common.items.wand.foci; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.ResourceLocation; +import net.minecraft.world.World; +import taintedmagic.common.TaintedMagic; +import taintedmagic.common.entities.EntityHomingShard; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; +import thaumcraft.api.wands.FocusUpgradeType; +import thaumcraft.api.wands.ItemFocusBasic; +import thaumcraft.common.items.wands.ItemWandCasting; +import thaumcraft.common.lib.utils.EntityUtils; + +/** + * this class is based off of ItemFocusShard.class created by as part + * of Thaumcraft 5 + */ +public class ItemFocusVisShard extends ItemFocusBasic +{ + private static final AspectList cost = new AspectList().add(Aspect.FIRE, 1).add(Aspect.ENTROPY, 1).add(Aspect.AIR, 1); + private static final AspectList costPersistant = new AspectList().add(Aspect.FIRE, 1).add(Aspect.ENTROPY, 1).add(Aspect.WATER, 1).add(Aspect.AIR, 1); + + public static FocusUpgradeType persistant = new FocusUpgradeType(69, new ResourceLocation("taintedmagic:textures/foci/IconPersistant.png"), "focus.upgrade.persistant.name", "focus.upgrade.persistant.text", new AspectList().add(Aspect.ARMOR, 1).add(Aspect.MOTION, 1).add(Aspect.ENERGY, 1)); + + public ItemFocusVisShard () + { + this.setCreativeTab(TaintedMagic.tabTaintedMagic); + this.setUnlocalizedName("ItemFocusVisShard"); + } + + @SideOnly (Side.CLIENT) + public void registerIcons (IIconRegister ir) + { + this.icon = ir.registerIcon("taintedmagic:ItemFocusVisShard"); + } + + public String getSortingHelper (ItemStack s) + { + return "SHARD" + super.getSortingHelper(s); + } + + public int getFocusColor (ItemStack s) + { + return 10037693; + } + + public int getActivationCooldown (ItemStack s) + { + return 300; + } + + public ItemFocusBasic.WandFocusAnimation getAnimation (ItemStack s) + { + return ItemFocusBasic.WandFocusAnimation.WAVE; + } + + public ItemStack onFocusRightClick (ItemStack s, World w, EntityPlayer p, MovingObjectPosition mop) + { + ItemWandCasting wand = (ItemWandCasting) s.getItem(); + + Entity look = EntityUtils.getPointedEntity(p.worldObj, p, 0.0D, 32.0D, 1.1F); + if (look != null && look instanceof EntityLivingBase) + { + if (!w.isRemote) + { + EntityHomingShard blast = new EntityHomingShard(w, p, (EntityLivingBase) look, wand.getFocusPotency(s), isUpgradedWith(wand.getFocusItem(s), persistant)); + w.spawnEntityInWorld(blast); + w.playSoundAtEntity(blast, "taintedmagic:shard", 0.3F, 1.1F + w.rand.nextFloat() * 0.1F); + } + p.swingItem(); + } + return s; + } + + public AspectList getVisCost (ItemStack s) + { + return isUpgradedWith(s, persistant) ? costPersistant : cost; + } + + public FocusUpgradeType[] getPossibleUpgradesByRank (ItemStack s, int r) + { + switch (r) + { + case 1 : + return new FocusUpgradeType[]{ + FocusUpgradeType.frugal, + FocusUpgradeType.potency }; + case 2 : + return new FocusUpgradeType[]{ + FocusUpgradeType.frugal, + FocusUpgradeType.potency }; + case 3 : + return new FocusUpgradeType[]{ + FocusUpgradeType.frugal, + FocusUpgradeType.potency }; + case 4 : + return new FocusUpgradeType[]{ + FocusUpgradeType.frugal, + FocusUpgradeType.potency }; + case 5 : + return new FocusUpgradeType[]{ + FocusUpgradeType.frugal, + FocusUpgradeType.potency, + persistant }; + } + return null; + } +} diff --git a/src/main/java/taintedmagic/common/lib/LibStrings.java b/src/main/java/taintedmagic/common/lib/LibStrings.java index 6c2c632..0793cb2 100644 --- a/src/main/java/taintedmagic/common/lib/LibStrings.java +++ b/src/main/java/taintedmagic/common/lib/LibStrings.java @@ -4,6 +4,6 @@ public class LibStrings { public static final String MODID = "TaintedMagic"; public static final String NAME = "Tainted Magic"; - public static final String VERSION = "r7.5"; + public static final String VERSION = "r7.6"; public static final String DEPENDENCIES = "required-after:Forge@[10.13.2.1291,);required-after:Thaumcraft@[4.2.3.5,);after:ThaumicTinkerer"; } diff --git a/src/main/java/taintedmagic/common/network/PacketHandler.java b/src/main/java/taintedmagic/common/network/PacketHandler.java index c642f4e..d55bce3 100644 --- a/src/main/java/taintedmagic/common/network/PacketHandler.java +++ b/src/main/java/taintedmagic/common/network/PacketHandler.java @@ -12,6 +12,6 @@ public class PacketHandler public static void init () { int i = 0; - INSTANCE.registerMessage(PacketAttackEntityFromClient.class, PacketAttackEntityFromClient.class, i++, Side.SERVER); + INSTANCE.registerMessage(PacketKatanaAttack.class, PacketKatanaAttack.class, i++, Side.SERVER); } } diff --git a/src/main/java/taintedmagic/common/network/PacketAttackEntityFromClient.java b/src/main/java/taintedmagic/common/network/PacketKatanaAttack.java similarity index 71% rename from src/main/java/taintedmagic/common/network/PacketAttackEntityFromClient.java rename to src/main/java/taintedmagic/common/network/PacketKatanaAttack.java index 5a86765..41a2ebf 100644 --- a/src/main/java/taintedmagic/common/network/PacketAttackEntityFromClient.java +++ b/src/main/java/taintedmagic/common/network/PacketKatanaAttack.java @@ -11,27 +11,29 @@ import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; -public class PacketAttackEntityFromClient implements IMessage, IMessageHandler +public class PacketKatanaAttack implements IMessage, IMessageHandler { private int entityID; private int playerID; private int dimensionID; private float dmg; + private boolean leech; - public PacketAttackEntityFromClient () + public PacketKatanaAttack () { } - public PacketAttackEntityFromClient (Entity e, EntityPlayer p, float dmg) + public PacketKatanaAttack (Entity e, EntityPlayer p, float dmg, boolean leech) { this.entityID = e.getEntityId(); this.playerID = p.getEntityId(); this.dimensionID = e.dimension; this.dmg = dmg; + this.leech = leech; } @Override - public IMessage onMessage (PacketAttackEntityFromClient message, MessageContext ctx) + public IMessage onMessage (PacketKatanaAttack message, MessageContext ctx) { World w = DimensionManager.getWorld(message.dimensionID); if (w == null) return null; @@ -41,6 +43,12 @@ public class PacketAttackEntityFromClient implements IMessage, IMessageHandler

Since the wood is imbued with warp, you think it's only logical to use a Zombie Brain as a place to store the insanity. And, Using the power of the Primordial Pearl as the core of this rod, the power is immense.
The wood is also extremely dense, making it able to store huge amounts of vis - 250 of each, that is.
(Continued) -tm.text.ROD_warpwood.2=It would also seem that the warp stored within the rod reacts with your own warp, causing it to recharge itself. The more warp you amass, the greater the reaction, and the faster it seems to recharge. Due to this process being fueled by the Primordial Pearl, the influx of vis would put any other core to shame.
Seeing as it wards off all warp, The Warp Ward buff seems to negate the reaction completely.

§oToday my wand started whispering strangely to me. As my insane mind grows stronger, the more my wand reveals to me... +tm.text.ROD_warpwood.2=It would also seem that the warp stored within the rod festers off of your own, creating vis as a byproduct and quickly filling up your wand. The more warp you amass, the greater the reaction, and the faster the wand will recharge itself. Due to this process being fueled by the Primordial Pearl, the influx of vis would put any other core to shame.
Seeing as it wards off all warp, The Warp Ward buff seems to negate the reaction completely.

§oToday my wand started whispering strangely to me. As my insane mind grows stronger, the more my wand reveals to me... #ROD_warpwood_staff @@ -374,7 +378,7 @@ tm.text.SHADOWMETALKATANA.1=After having discovered Shadowmetal Fortress Armor, tm.name.INSCRIPTIONFIRE=Volcanic Inscription tm.tag.INSCRIPTIONFIRE=Thaumium Fortress Blade upgrade -tm.text.INSCRIPTIONFIRE.1=You have upgraded your Fortress Blade by inscribing runes upon it.
This inscription will convert damage dealt into fire damage, which will bypass armor. Any target hit will be set aflame.
Furthermore, when releasing a fully charged strike, a cloud of fire will be emit from your blade. One would hold down shift to cancel this effect and release a normal strike. +tm.text.INSCRIPTIONFIRE.1=You have upgraded your Fortress Blade by inscribing runes upon it.
This inscription will convert damage dealt into fire damage, which will bypass armor. Any target hit will be set aflame.
Furthermore, when releasing a fully charged strike, an explosive fireball will be emit from your blade. One would hold down shift to cancel this effect and release a normal strike. #INSCRIPTIONTAINT @@ -382,14 +386,19 @@ tm.name.INSCRIPTIONTAINT=Tainted Inscription tm.tag.INSCRIPTIONTAINT=Thaumium Fortress Blade upgrade tm.text.INSCRIPTIONTAINT.1=You have upgraded your Fortress Blade by inscribing runes upon it.
This inscription will cause your blade to deal magic damage, bypassing armor. Anything you hit will also be inflicted with Taint Poison.
Moreover, if you release a fully charged strike, a cloud of taint will be emit from your blade. One would hold down shift to cancel this effect and release a normal strike. -#INSCRIPTIONWIND +#INSCRIPTIONUNDEAD -tm.name.INSCRIPTIONWIND=Stormbound Inscription -tm.tag.INSCRIPTIONWIND=Thaumium Fortress Blade upgrade -tm.text.INSCRIPTIONWIND.1=You have upgraded your Fortress Blade by inscribing runes upon it.
This inscription will allow you to deal wind damage, which bypasses armor. Your target will also gain a withering effect.
Incidentally, when releasing a fully charged strike, a burst of charged air will be shot in all directions, knocking back and damaging all nearby enemies. One would hold down shift to cancel this effect and release a normal strike. +tm.name.INSCRIPTIONUNDEAD=Undead Inscription +tm.tag.INSCRIPTIONUNDEAD=Thaumium Fortress Blade upgrade +tm.text.INSCRIPTIONUNDEAD.1=You have upgraded your Fortress Blade by inscribing runes upon it.
This inscription inscribes a formula to deal withering damage, which bypasses armor. Your target will also be inflicted a withering damage over time.
In addition, when releasing a fully charged strike on a target, you will be healed for 25% of damage dealt. #VOIDGOGGLES tm.name.VOIDGOGGLES=Voidmetal Goggles of Revealing tm.tag.VOIDGOGGLES=Who needs 20/20 vision anyway? -tm.text.VOIDGOGGLES.1=By infusing your Warped Goggles of Revealing with Voidmetal, you have created a pair of goggles that repair themselves, and have an extremely high vis discount.
Sadly, they offer inferior protection to the original Warped Goggles of Revealing.
Your vision might become distorted and warped while wearing these goggles, but that's okay...warp is not a bad thing, right? \ No newline at end of file +tm.text.VOIDGOGGLES.1=By infusing your Warped Goggles of Revealing with Voidmetal, you have created a pair of goggles that repair themselves, and have an extremely high vis discount.
Sadly, they offer inferior protection to the original Warped Goggles of Revealing.
Your vision might become distorted and warped while wearing these goggles, but that's okay...warp is not a bad thing, right? + +#FOCUSSHARD +tm.name.FOCUSSHARD=Wand Focus: Vis Shard +tm.tag.FOCUSSHARD=Blip bloop +tm.text.FOCUSSHARD.1=With the study of different types of shards, an incredible idea dawned upon you: what if you could animate a vis shard to be used in combat?
This focus can only be cast if you are looking at an enemy. The shard will float through the air, homing in on its target, and will burst on contact.
It would seem that the shard will also bounce off of solid blocks. \ No newline at end of file diff --git a/src/main/resources/assets/taintedmagic/sounds.json b/src/main/resources/assets/taintedmagic/sounds.json index f235369..d4518b0 100644 --- a/src/main/resources/assets/taintedmagic/sounds.json +++ b/src/main/resources/assets/taintedmagic/sounds.json @@ -1,3 +1,4 @@ { - "shockwave": {"category": "master","sounds": [{"name": "shockwave","stream": false}]} + "shockwave": {"category": "master","sounds": [{"name": "shockwave","stream": false}]}, + "shard": {"category": "master","sounds": [{"name": "shard","stream": false}]} } \ No newline at end of file diff --git a/src/main/resources/assets/taintedmagic/sounds/shard.ogg b/src/main/resources/assets/taintedmagic/sounds/shard.ogg new file mode 100644 index 0000000000000000000000000000000000000000..4e506638fe9db77fcd9b3e7e67388e71635bfb3e GIT binary patch literal 6658 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/taintedmagic/textures/blocks/BlockShadowmetal.png b/src/main/resources/assets/taintedmagic/textures/blocks/BlockShadowmetal.png index 3791b0ebbd1a4bed662ae7fdbd74fb1d172c6ace..df0ffff99eaa16b6eea4e79cc95673493328cf2b 100644 GIT binary patch delta 287 zcmdnPxSnZ(WIYoD1H*)g8D>C=u{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstUx|zfk$L9 z0|Vb-5N14{zaj-FC{f}XQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXZEKj`94t10#6sm z5DWjg6L0e!GT?E3tIpEY%kFUJ*#CMpHO{(Y=pIsBFDhd*tL7c~8<6m0sn zz+KSA>tV~46t8J^f;U;UixlJA?B--Ix;eo;*=fVFl5tXHveC_;mOWY i^DFGOT@nx4neK_S@?U6~n3)H3ErX}4pUXO@geCxL1aD;k delta 171 zcmV;c096040=xl`8Gi-<001BJ|6u?C0E0%Fq0hI_*Iuu@EV3h6>dtc$p@{6>X0!wU_u26$U@8@{J} z4@UAL+mJ3BQ8*Ukg3`sM+lX}p-ILh^Thm+NTTySpKrHYK@YezdZ2F|>v3J+stsxhZ zusx|AR>xMuEs8B{Fcy3X>9ye7ni&3ZbKal!UQ?eK8IVW<=+ zzd|bY&=P*(g2H7_cRcOJb8%>xZ-Af1e+uIz@g}5O1IAcv!%#PFZLB8OlJH6P6L>uF zI8+Li*SS0o=|v^EC7b$x)j!}~=Z5ze-G}?N`=LsxszSO%@cdUXYRD>Isr(bYk%p#a zCiuzhPoP?)u0?XqkUsGJ!uN~u1GvZaa~G`D*TQw->u3=s`e;OI#thN1{A0hSiYUgs z!VEu4{R~D(A{vl9dPpxnwfodz>L5j<+JF@cE1*uPCi;WF*AzW{&t3#}-r_*|_}|72toQd3jqoYOC`!T+IX@#7=or+hHwgA1&U zjkxK&39w-7YNxmJ?<7sS8af)tr`D&D7>h+`PRZmI%`8gP$LfN^3#G8LG}-uKP;>3tNRzu;87BuBqBwbqJ3@NYb#`YnLzDT zhh~IltY~+)-|rac=vqH-efIL8<@>u_U43o+ZH;Ju7Livxr?}8&waqi&hJOypo(m1- zWSos{WZQWZfr_u4U-z~;T2*o=&&*Th<(KG6*3Q+;6;xU)|91A9vyE=rtqEhpLd9+| z`Y|7b3PXeDspsXGXj6A)T&6AsOVKGA<@^V(2lZBu^)XjpZ_IjQvv5$Dd(C$3Ebt%O zo^xOrT*$0_bYFFgyXEsM)+<+P?X_-`!!%tZ)MRas+n%?2=IW>}y6euz%^!DqydE{0 zh>}2lAW#St0qKhLojqjFwcGu-Pk(9t^4|@X2EcmR*}G$R>k1MIq6q&{<+|3LbK4vYksFWk#` z4GHlH14UUy*&#%Tf^ZT%tw<}^tM!s;QPYsS0HX*BkRB2+J_fKp76_pbOy*6FW`da5 z0%gH0=YSIf3{c!7@3r;Q{Y^jCfnkVqG&zM;cdEkcdg_Ahq+RTxJb)kxE~A(a#S1d< z89C$6?tKtQpafeQv~)V3u1j9qd$PmZxHGR`6=81|V1&zwP5E-DPo0Gg&jjkAV5Xgio^rL6xLO$3H( zgF+lY+dZ^Vwi`y=c&lh}QNj}Cl316+g)t2CKcn20bA-DNrv;?|NLUHhO?3wwC$Pjjn1jCZ4)u`i>MmUoS>|<9R1&7Ib^N!EyKTvMQ=- z`-Dw1;IAj{04hJa;OM@c{GEGEy(S(`;ehf{fS`$I(Q(iY&`bA%daB-WnmRpa!e;pp z!p`Z>y`#f*TP~U}@{FVrn7k%nrp;cv&)zq{4D<}J16>a2cuW9-J7o<{R0Oa!scT-I zLCq*J^_WyOgEd{qV21~IxYLvou>;YG=mGvh_JN_9Fp(+X{%lHs|NHiiH1hxOUv(|} U@sJRWR{#J207*qoM6N<$f`6MK4*&oF literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/taintedmagic/textures/items/ItemCrystalDagger.png b/src/main/resources/assets/taintedmagic/textures/items/ItemCrystalDagger.png index a644377c167a20908285cf6831cb0783f02101ab..2199e469b5ffe6a220ebd43741131417b5f6cc8b 100644 GIT binary patch delta 781 zcmV+o1M>X#2K)w)SPE|d01|Hj9ziC$kzyx*-bqA3R5(v9Q^{@zEP^a{u*bFp9FUNZ0vu5!mJ5FdK?;F0#GaWqZQgF@z&RC>b2AgOYn?e!9H|2Q_%Wpa{uzc?b z=o`Xe$afZbnnF_v6cu<>#~0CH07Iam3Naex_`SbhfTUF9GFvE{yxfplby}t-u1Ta~ zD##t>o=a0?^K)uLPpHCJ%aJS&_79MM6U;ZyOx=~a#zXP{9mg$-9E%K1G@R8dh$z#0 zpp~XaAyST0t<>0jN2agbDw@4NDxm_c6S^JIS%YS)iKkDVVWZVTw-cbX!DlzX<;o-* zZx+oSXzTd6@WT5-h6sCuJ*1T0T5sZUtBv)wb+p@U^!h!Fm#bu4;LO*>1Nkj~eKeObOgtGZ#37H zAySGNh_JS@hFax<)F&>=Y^@|?7t3-EQkB8aUwB96t)su^CKJrkbR3KhV3`BWbv2t! z%uJ5SgQco0HY&1owIa)nlDs>AJ;Qr4``Lq_4@E-FWcqM1M5F&3(CGHM=-sau?7{6x zc`#p*g?dT0PELxsdz~(8dfX1#wdEN^^ni^q1JUWwyc<<{{-`E%wX)3DE3#NG%kuOk zdA++!L;F~x$$m_K3rWo6a)X6=Q52zbuP&cn%*)(VNj86c=Xx11f^U9!`HGjHKcmI* z+LRwq!QtVbf?e?*&XY$oN@cQLEsI~FqM}W*Zti@;o829}+TKPdU@n@>1=kx6hZyi@ z8NlKKJxHt-_ULrR)OmvxT^{f@;vty`=x@b0{9=ujD?lJxW6gl1*9H}bI00000 LNkvXXu0mjfTJmw{ delta 775 zcmV+i1Ni*>2KEM!SPF0e01|KkA)A}K;WOUst~M$XMt%+2&(HEMO$bK6a~MRBp@Kq6ub>o zUBXcbEEUvM$$}DkxkO<-mNrAvRQPYT>PX7K@6}gj2MkG_-KXewwZi5^rW zG3*xjcD{n83LmI|zx8U3dcE$zr-yxidDa_A`wsM{D+-*uph<-_{5hJKlhkt*M~`xp zO@sXhNAl$0l^lQjvIASz8Ak=41}Ve2oJSN#c>C+`7{)QCNs4$FV=_sxw|gkZ`X>(_nST0+c{;|Giix})kq2MfBuY;^-WU)ORIcvCKpAftQ1n4P2BTcqiKFEDKAyz9cn5HXs?SNA8=34XiW?z+GIX+!!?A?H2F z;Qp?gdzMUDGv#*J-36#z(F4lRoGnR4NG>3M{tWrya8u5x;JmjX7mqh&IG@wd8Tx~$ z8?(Iyr@4A=urp67jW?G&^4A|*1Vf_54P(mmQC0l+KN!4whnVAy(l2tViZ%a{()V zY2$%QAI78*hA9LlpcBG+Q3$eOBr~Sy#{?Hl8CN>ObjX5C7WLIO>dhWHy)jzN5$cUL zmdZ7xGbw0kZ8=e)^mtVX1^|^!IV2EO+j$EOFe4zwMt#aYowlm?( z(~23TP+MtXd%BOa^VfKH@fI&mPBDDEK>;QxM9Xw)s8v>wqPbXaspw;9H5TbGKq+eA z5oJ3(IL7YYF;0%gxcb&bz1l=Eicl<L4SM55HEYKb{pKYVrYP(?-%MChJEasOm_aKLb zg?Z%j6?ADcDXPGd?-n*hDjlFV9%DEeqf%=imoMNqm4Ef6gIsP2rR6#XgOOWjHj{Rn zaIkC=G(-zcbC_&R(I0GJM8U3qfAq09e-F*I5&G*-vAcf&#ieuhw2UdPVisC{Bk(dT zLu46~^OKD&?Cl<5YiA#u)2XY@4+3am7}qh89HfbdNTpC;oah@cLxxIm_{yW5Ys}8g zBAd-Z5DO_Cq^2qoH+qGXKiR|$ynk4h+!iET-rOJz$&Q}Ft%}>85+f@nE225KS!1d= hh~ybdvhlQFe*h{a#bEMsbb|l@002ovPDHLkV1o7YNr?ae delta 708 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 IM6N<$f;rJGp#T5? literal 11068 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 TGwrSX^J~2o1=mg=%`(q2kARo1lO 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%0AlSf_dbS9y$t zGQA-Q_9I?s6P%5cF(1c6{gPrVd3zD>o z^4DNvU$GZd+gwtS?y}E;A6x`H7!%yV=Co!a!keI)PZnKHlvL%*?RwQ8)M6Mm;sN7@ z;+aR<$ribZFqojovofex&M67=+;Hw2@3jY%Ph|K@RHpHi>Dx6Kkh~2cJQ$QexCfny z2S-)PcR*@NRvedatT$dC0ARdFqv{V9gBvnxJ*vXSZF1%1^2-%cqjne(dvOqi$WrVjP_t?0jA1d-fKjVuF+s z_!Wdz;XUwzJ&mb|uT}&ru7KYQVugBr4S;yymcj$xWD>SwT6GF*?Nah#v_b$+(E{z5 zwlUC(@Sq8J(4y;N@_<8jSP)~nz^u@{gMYh_m!pl;gS$cVr~|zUHhPo-@bvA0zTm4U z6TuZouG&lK4r zH}MjXEb@b@ps0&CTf~E5eZTRe2>U(=U7$OoN)y_v0=CBc#>Y>|9}L2SJHZc@;^#hl zhs;%-{rko;7}r#UgR6Ak_`Rt70q>SBM=ZeHK@%wDaWG|erj;`EB$KCcu}0yb?Q&iU zu1^QmBhhf0;D2cSV<7fy_`?}c-!z6GpbUKbFfv|9tInb$s6SvqLn9RWT-n0wFrQ|8 z;szbLCXa`&^15E9*dcM5#!iOUP#ocJ1YbtH_3sl)N>Lhl zBlQQ7Epiht1My}((m*zApcZXQ1j&lTg9YGeehE>%6omMf)|5~YX-tVeqB)cS*2 zsy`@$k9-$GcPJgWz~-rDne?Aur0&2VTvB8`Qkg0pI)iUc#Sm09B7*&(KBGo%!@Rj* zNflAwch1RVGTQO9DlX~+wh&X)#DY(9r4t}QCGHn`Bt@m5Jgk?9*(HSPZRldsMwLzwgX^B1?%V1?x3E)gSQt=SLvN zdpgRW+q1Uibn(I+N<=LI#hR$3WKK7|F`?z_w%MK^@R5(w~lG#cFK@dfI*33Q<6h%={ zNkkA4#0UNV|7!0kyL(1L@JXly133OIfmQ{2Csh5ZYKqPxW7lNF~4S>hsg5p_c+#5h)8$fi}N)XQg zVHd!?+`JBhztTYCz4ANge$zDmZJPXpgcQVQMF(_dF056u017SWN_PZIpM57Ga{wFx zJ88o3763!y@>arKu=yb;SmpcUh(8oSUj|(&T!jq~tLGBXkxmo?jRPh7#r{Dg5pSnE nZdP^)y9?{1kwB~bt8nfMoV=x84Lq)R00000NkvXXu0mjft$vx# delta 351 zcmV-l0igb?1GNK?JPN`901mp~3%fX`v?-KY*l9L4}TRQtN~O>raDY67hnJY002ovPDHLkV1i);pHlz; diff --git a/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial4.png b/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial4.png index e181aa69d1bfbb05dee4170cb32d0da7ecdde14d..032ad9d74bbb467ece41f54916704f1a984dfa6f 100644 GIT binary patch delta 648 zcmV;30(bqI2HORYI|~lN000ic0Tn1pfRRQge_2UHK~y+TJyTt46hRQ|?&+D?x!t{u zQ6cf;Bsr28jG*F!5JgPhG!F`b5E1H+L*|Cu~Il~>P5sY zfAioVqmD?bNW%=xNj4j1ky$D|u>~T&cenvnHRC*8;7E_bgPavrYd;tf zXVqQYbEh2J5S|!ycV@u+Ef3Hlw@?wSHZ0b1S#jgkV_&)r`%Y23B_6(2H z1ha~?8421ug_cVfT5_vWA_>(Wt6|XvSLqUW+k4z@|KiHe`r2q)QX+yV>J&Cw8trYY zo@14vf)s0 zG+46 zMYJJ&O%05&!;xI8B{l*9pUJfpr!JhOAP+<(4x^!>@XCV`A5cj&3NHpKu5_;lk|+|< i)#ry7>*0yIG5H6oLu~35_gwt|0000)uf0#)`K~y+THB#G76hRQJo}Qkbo}Go+ zon?WrgBw;5gA%;r?S%*{AweTCF(L61NlY}F2;o^@ed8DW2OseQ){QbY<BKymdtBnDV`Y7 ze_SrcBx2l@NMEGleJQ-Ng;-0(lrcG-_%!0N+93FqoEGR^%<_aEmV1*niy?ZTH1PDoDY;T!>jI)o&!S3!E2<;WV`?;wrjy~wj5Sel1@Wf9O}7)5 zZNL%7HSXymsK<2DXeX1MNE-q(v#KPCTvZ^(yV=NSz~$0u^fD^;2Y)4rGKE=E`?r~5 ui{sy5I#MP&tAZs6?OfDrvVvanMC2b65r&;uX9OMq0000 diff --git a/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial6.png b/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial6.png index 434379679a483f5a9106f1c4a19dbd854c9fc0b8..3b6e82f8545b3d32b98dfc1f55e8e0723de932fb 100644 GIT binary patch delta 610 zcmV-o0-gQj1-1o{JPN)501mzZ>O!%=kwzzfG)Y83R5(vfQ)!RWPz+4l+;`F=X`0e2 zZMR)$w<-$=p=AZCw1RK^|Nk<0ygb0ti=D(CkNs?G;;rPYt=ivM)1Xt`h@J&ItJmvU z6l$J+zpsb>ZMavh0hJiDV5>G|Fc_$&xcva;{P|>6;x`unCKRNd)%aqFm<$B4dp>-B zJ3{JC5!oeTd!it=Z7UlFGx1+~6l!k}g2ADap-y*bhkJ~?1rm1*&q*cZ<@jGwT`E-1yP2y5{Pl!Yl> z0Vc@;%kqp_c#nDbfWz<^`}7+Q=?%O5t9(0QJ-=+R?#C`>Bq9T$Ser;XaUbocrUt%gvljukwLHW-x<>B7w?(o4rOhua|VkyjMuFC{b=+E6D wYXvX{wE-|g!gpgg{_D1K{ka3wb^;gJPN-601m$aI0aKAkwzzfVo5|nR5(vnRBKNYQ4pQEce@XYrO-kF z``GOhDi!F;_5lVo^#c(TG?C~RA5p)kF(!QQ2l&H}cLo-9lF8iLz31#Xvv*2OdgStm zV#=t^Q>`6Wdpsv*CJCvM#u!aG-#5ovDdvn?ZqenLf+eiAS|vhSL7uliQOjWld`t;{ zPl$SEP92)+17Ww4j=-mTSTd_vGXtzp9cAh&iRXE$M!@poJ9!dPBQ8V0%eIC_I7L#L z;65K>)x-$xx~h;DwZu9*0@(;q*ackX9$HItG`%y##bd1@RZ*b|V6;&bXRe^+f6BS+Od1&7t^S|RUU*pvKjd^s9hvpJJdyXwmQHzFuDB3l! zaSC!7qM}mRLBr0RigS$kH8S%9Gw&Bt`wa*FN7u|XB=)K6QTF#<0|Z6?TJ5w0MdwdxYllSZ%2KI*pYe|CA+8^ia{%@PMw+p~=X`~m8;vt%Qg;T_|aKI@VLFPVRMQ^5H^1f-vb?nppc6Vc=>}{iF z$7qE!_zozf@+?;>nb1U22PknDqU|>M5Q!DJFurTrzd#9{RyR9hJr;tSMW!}#0+A>H q+2`vnxoLG%*tnem`5TDMg#G|owZ3r1sB1(gMmJPN)501mzZ>O!%=kwzzf6G=otR5(vfQ)_S2KoE3nC-L3+6+iN7 zo2LT}rGbV55>P~?R^kI+`2Rm<*xBYnS6Z!ow=+AtcNeUTQQue-Y@OA(%UsZMBXFEh=1#-{d14(gL5FF}gIzg-un3ALv;DSru%IR(mJF z`(}!-Rf}KaIetv$xU0svOe|(uewsypFNotIr_z z_xm(MXGMi^NaKOFp|kS?B*|6ca4i+Sj9NTRF7RBp_&ZzT_k5`&x1ww*1dC#%Dnz~@ z#n}eWdM?#>((^$Qk9mPdk^M)&RPxZy;Uwoqz+GAEFtzgeEXBBZX;R#d8XV<+1iqCG zzSm>i7d4I&Ij3z_Vk>(brh=A2Km|0)YUH>&QNUCAEGKbDOMH-FE@Un%@z=Lfac}a| zofhLfxVbJX?4|17<=BWK5)w$)#Mj0ac(4Df2r(KCu@E5TQYuNg?{6U^ACq1r643d> zqhSI`2y}8MNb1RHe69NMMD>O&%9lx^i;TP&WcNh;_Eq`dnCA<=xC#CNC@-qwB!PiZ P00000NkvXXu0mjf<+~C5 delta 589 zcmV-T0CJ z1n6Unm34R+IVIsY9)gvC#tUyAI1vzmJkNyWUKpc`6D43dL*i8ZSRa8rQ%Jn4_Os# zt!CS1HLmIzJ{KLnH8WgyGrX-Pm<#xSQBfUw5tulRRf#HK=3Re;bC=K`b{g(zFt6!WUx zk5$x54f`@U>nCX`wU*eW6|T}8Kk^p8yJJx@5k)gJ60;T3q3X1mnt7b17%%64HpgoT zxRgd-OU9eB!-uTF`>NkhM;g0qdu^tI7D7M;G|D=b`qq-Ak1Rgw6iQqO;fYLTQPik{ zc-%_GJVe7^vJAYW=VFlE6Y;mt$_K|dCi5?N bX|4GSMvSa;uBJ}200000NkvXXu0mjfRZkFH diff --git a/src/main/resources/assets/taintedmagic/textures/items/ItemWandCap0.png b/src/main/resources/assets/taintedmagic/textures/items/ItemWandCap0.png index aca6ab16ecd0146cb9212e0decd5147747d64b9b..17e57772ab0b655b77a0d85e280972ba387dbc57 100644 GIT binary patch delta 545 zcmV++0^a?!1Gxl{BYyw^b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi z!vFvd!vV){sAK>D02p*dSaefwW^{L9a%BK;VQFr3E^cLXAT%y8E;js(W8VM(0jfzv zK~zXf?UqYR!$1^;I~n_~iZO-ShgxZi6j6(aijRdTE{Y(C?tk2gAnshd@>g3*9nZbV zz!)-ZA_!gNz(-2wo--LTbCb;6Y6Mik7yXe$N{C&xEQhKhukqWXkg-2BTN5%kV!&oE z_n_SD9YWd^^6i({H5S4}aTPTAF3R#U2-wlfA*@1S3v_~j8t8$lX`UK_;w7*N`k;ft zQrM`8R4`bEd4C=7x@}k$6qL>4Ff*S>l*uHPCg9IzEz>x252X4Bp&w-R6G+|}1&{TPO!RAKgRn<$+2;t)#rytaLMj^U<7p}bL0O_3Qy?}nOg&FB6@9|x%6<#=? zC~x#~2&-Tm;3%JR0G-CHbB=4zG*1mdF?FLuRghOOQ&26+OhgI;f=xmk=ylt$iVOUZ jLfE89`x?QVDU1!7B>zkf+G0L>7bntu}!jSOVj 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 Q00000NkvWtM6N<$f`Q4wsQ>@~ delta 1088 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 U*&gktVE_OC07*qoM6N<$g0KHO>;M1& diff --git a/src/main/resources/assets/taintedmagic/textures/misc/IconINSCRIPTIONUNDEAD.png b/src/main/resources/assets/taintedmagic/textures/misc/IconINSCRIPTIONUNDEAD.png new file mode 100644 index 0000000000000000000000000000000000000000..a644a5068296419c47bcbacbbaa0063bf41a7963 GIT binary patch literal 3114 zcmV+_4At|AP)N2bZe?^J zG%heMHvEiZ-v9s$s7XXYR9HtnS6hr-Wffj~|NHXq``P>4=X5UZbUM>%g%%41=5}Vz znOkShoS8Fo=6;{)owgJd3`Syz`e1_MgHdBhfDm4ggct-dUgC>}AUqiY5i8JC&{Bv{ z&=f=c)~@>S=j^lhe_8AM*80}^siqiIB}rXG^hJ!3z)=nn2|ODEhAr<<6ssN2c&Fi= z(vLaE3p;4e3#cY68X-YbhE1zs62BI$MrmrpoHMO$G=ulknoYOi|Lqu~7~L3y7&TK; z1#77Xe>Rd?n$k_WucMO=;_zNg$U)l*?jTAJdtQ1flS;rqdo1w8ycf}#wsxAgU0O^e z1i?y&*sHql$Io9N z(nkY77;^1GQ5YSyM0j(*VKnyWO4zMv=5{V0d$I;kkLGvKgEt+d^DwAF2Gul^`tWVW za%cgD9wCLs*nm_fHf~bYX#l_D7<0Bq6S`yrOqyxPD~pXy%FXP(s<kku#90QEa2Z($ir0oF}b?H+X8!_Cy7!?dgqlm$9Gc~JGCZ03v_%siX*YTgfRa7IU zVa^F+-jzNfv|EU*vL%C?i1_eBw-QZnS>8p^@B!v*F70Z$4Re~yj_Y?2nMGX}3vPmz zf&{!1G{hT|79+r88niGSofwmvj1f51*i1Dk>B}Aa<8Kup6mwqkYO{uW=^L|L%4b8E)aDX<`4e zi8M`+8b7mv>@_3Ap7XoyOaoC45spK{-SBR~3%0<~_i)(b;Q5)mqv-NU>0DV05(O+J}hPw~y)0C$o6JW&77R(%FXqYvX<* z7crwU0#k8hEC1tP?NL<&M%oK4P5x9e^6}1Yg`;J|Qb&LY$I5Dyq*((&xDy5xh*E>L z*$%EBhXL=@iQYt{zIrB~c?CTE79PH|EX-FoZT~kwXdAg)z;JfqFwS*0f>Z0i2IytW z@({F{(IC-O&8C`K@C<4^#FKu$wG-*7(2^g}W*!v4QmseVd=4-e&|Nn46;omKBMIMR=$C?sCXkXx^NmD^Y86p$O(eq%INevzW$IN$eQe2dpI#&Vy*Z-y;o%eT z;=3io=!X}(ut{Pp3biV7pYwX&_GuY;k3&_^;$SdBo7-V@ZQV_LS~ZN>QP0bDDP#@W zw!$fTG+&^#FasTc+z@R|Ds7oNy8skcO|H3UhBlMlZ~e@(SJ$;jr|8BTe>vEsSFR2TVf+ z$5x*vA_&t?Y<>Vp-98+6J-rGY#^Eja9>H*<22J2Kc&51^d4s#DTvjP+x>3tzLuAEX zC|#{0t^3y%2@q6#Akc{Q%X5zRO=v`A z*fod7!r=Bw5J0Rc-78cJbgN5VA{HyI4^+2NNQ9(Xp+TVV*n_4l;Gn}Jmbr8`mAy29 z7(h@S2Qq!2seK}q%;3M@s|X1XHSo=Wr}ye28u9(kdBgnG0%`wRk@oK@s`k+4p0;ro zH|R_&4o?CZIhOE6P1saJ?V%0u!0FS3jo_7Fm8)ixyJ6wzu^_rwBl;9x9Y;aB6ETa@ zL+!|jUGTP{WSNO>MUf?;%c3-*vZmkkmG(VP!n4a8y7}pUGLzTdW6(N7$nYsl8Cs(55sHUG43SeGGeA3-mkLLut_(gBYe4YPHDSB~qu-hF+>_NP*;a`{zfUs+=HIAN>#1y9P&g_%O|V!2 z5-O^q81XD~$a7QRf8U_vj17|d4Xk;2oy0W+=yg=Jzs@Myv$L+h*rOTE$dag6=(!>3 z94M;l{9RG>`Xte3knI;smMkKJT7a&DUzMAZ{}&OiP?P9T*oaBfqN*@hrU?k>pdbm! z*xzqh$H^Thv7oo~H(-+&hNKdM26q1O{J5P@nA6 z^aCYnX5gS%2|{Hvi(0Vgg|wWA;%2d`nsM_m?<8p(0tHKze$z0Es>s)K`9tHTeR@R^ zA3_yB1Z7VlJD%It%}Z+}-i5rL8u1c)x>PNM(X1!C?{3=pLj>U^81MrG=^^aZ1UYsG zT`5=x;&RN*=td@oCQ?TXP)x;Ym_j#ead8o4%k=xD(FU#u=Y;+|xc~g5>t7hu)gJ-c zcOED-Uq^7gh(n7*uG8GBs~!T(?GZ`_v9Nnsp&_h2h|vgy5*P-8m63(>KI9G6jHU71 z9(1}^K#O)F?%T$Z8T$Z#KRTuHFg%C_4*=?q5Y1OtqU19`;Dv3H|3+~A1!=lH+gLa- zmT=RMSc&X00Is{fcW+e9XEMWHzyjo94-?vpd%x+Z}J(|!417GDD!mSxoz|Ux`F!xhLE3G1B)RK7jE79_1~n%0nIM>wPz z{|~^R(u5}OTh#4eBNN_&sMN}~YykW=oKU7EN<5sHM&rS4IeUFHouviT9ln%Is#=T& z%Re2<<}lf!aeUy(e8XYu85Q<`7vn$`DP?dZqlwKy&-aw1Jcz@(kU?X;n%0VYMY5L9 z%c4+~HQaz0N$wT5a}BY#thSuy+`jX^6G;0dKXrpAK5Q+OqN9aI8UrPK!(phF5FZsq z#NTVW&76rL&ykSa1dzzVutsPFHz8>Z7e?w;9KhMcgVTF62L};wGlm!MGYz$6x|h*S z@i}quaa%Tr+YLuPt0Hg0H{LNI!4l0VoJMmEeyL^dOP)N2bZe?^J zG%heMHvEiZ-v9svnn^@KR9HvNmwjl}RT#%tw&j?!HCLqT1-Ci11}Q-=v?jS;5i)}z zREVprKYAqzGPlay?)CnD=WeScsDGMBVfG$E-C`S?^Y`|gb4^ghEKP_k8m^2eRItyv z`}t4M$lZIT2OfU+o_l`h`+c70d!BP{$^Y7nNt|zts+5tgDr0&ove`FEV&&9RfyZfifNTMF_C$y*p{;Y(~%4{~hNOrlGYTa8NMJ?yW z(+g`8seg4Q;CD#mejt%LD1q85p~{FTM?&|0W1I!dn;ySXSkwCHX+&5pfx8^A3-pQ64CpA`0)f|vIs))0M8@$S7~6*?hE1gU znX@))RI4%W#qsO;o2{*_F;UM4>;VWQc)pK&XkkCkAIZkA_z@kZGZPwdmr0PEr?qp5 z-7$HK)h-ZZ+;XkmSrC~A!0lSnPwB|rB2n6qiQgb_noRu8^8gw8M0~d!GAnuK+HkP5 zGF~cw^FDsLOnh~Pj?~SNXa_J2fkD8Jpoc#pc!I3_!kFgww;}VSc**OGdF7(Kv@yEv znNso6wWM|-0E;C|HOa2zY^{45*^X^Qn__$?{xg1x@e@Y(jzMUYOg#sY8@1jr^-RcU zcMTEVr9*cO(LWAIn=yTLS|_T}NCSX(0@g`JJ_Kw(-^Uq0#rN-++odCCiOoX1+}Rtz z*HBjksJ?`Vu;}LizN7>9UW9hFc+TZkA4b$|5a=+H-cAYjFfW6z5`R;@NXLcoa%X3@ zb~c3oP*ZgX5`W>x*b&2wy-xjChn~~yd8vl1=|la!w?g(|fKw7UFNC!4DQm!P!*IZ< z(0;m^1veA@9^9&(W|R}#0kY#!mUr0^>man;A9WUr*FA^s*?<7A8W`xPoU#DV5FpJ> z2<(0WR5oBa~G}2W~bXNvmvKbPT27PcQpozVB7XO;>-{4=-2iCF;Z_29= z{F@O~8SS>wZpVppLUB&0K?rb8eJW07+IQ-Rd_AB$ zV(=kENh4DC+1)eP*IpO_{?mx+g4}+$cYx6S2=GHVbyuI#As>W5y|=xmcsFPcq$(m^ zN?+&()T$ogxrZsmR%*W#f-|<%)D-8!YK^1#G9q0CiFW`W&k+dR5p>XDFRSsi;+fW| zS~}w+WZ*qCFh=y>i?|!D@QA)Do>n}w_dX(C27wJ+N;A}aTNF6=u;=-|P@v8?nQ6VQ zl!Ip$7t$u$a~ot<_>pO@URJcfX~ngYlD`4!i=x)w SE~%XW0000