diff --git a/.gitignore b/.gitignore index 853e47f..dd127af 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,5 @@ /.classpath /.project /eclipse -/bin \ No newline at end of file +/bin +/run \ No newline at end of file diff --git a/build.gradle b/build.gradle index 6285638..2caf53b 100644 --- a/build.gradle +++ b/build.gradle @@ -1,16 +1,21 @@ -buildscript { - repositories { +buildscript +{ + repositories + { mavenCentral() - maven { + maven + { name = "forge" url = "http://files.minecraftforge.net/maven" } - maven { + maven + { name = "sonatype" url = "https://oss.sonatype.org/content/repositories/snapshots/" } } - dependencies { + dependencies + { classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT' } } @@ -18,56 +23,43 @@ buildscript { apply plugin: 'forge' ext.configFile = file('build.properties') - ext.config = parseConfig(configFile) version = "${config.mod_version}" -group= "com.yorkeJohn.taintedmagic" // http://maven.apache.org/guides/mini/guide-naming-conventions.html +group= "com.yorkeJohn.taintedmagic" archivesBaseName = "${config.mod_name}" -minecraft { +minecraft +{ version = "1.7.10-10.13.4.1448-1.7.10" - runDir = "eclipse" + runDir = "run" } -dependencies { - // you may put jars on which you depend on in ./libs - // or you may define them like so.. - //compile "some.group:artifact:version:classifier" - //compile "some.group:artifact:version" - - // real examples - //compile 'com.mod-buildcraft:buildcraft:6.0.8:dev' // adds buildcraft to the dev env - //compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env - - // for more info... - // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html - // http://www.gradle.org/docs/current/userguide/dependency_management.html - +dependencies +{ } processResources { - // this will ensure that this task is redone when the versions change. inputs.property "version", project.version inputs.property "mcversion", project.minecraft.version - // replace stuff in mcmod.info, nothing else - from(sourceSets.main.resources.srcDirs) { + from(sourceSets.main.resources.srcDirs) + { include 'mcmod.info' - - // replace version and mcversion } - // copy everything else, thats not the mcmod.info - from(sourceSets.main.resources.srcDirs) { + from(sourceSets.main.resources.srcDirs) + { exclude 'mcmod.info' } } -def parseConfig(File config) { - config.withReader { +def parseConfig(File config) +{ + config.withReader + { def prop = new Properties() prop.load(it) return (new ConfigSlurper().parse(prop)) diff --git a/src/main/java/taintedmagic/client/ClientProxy.java b/src/main/java/taintedmagic/client/ClientProxy.java index dbb6545..42e99b1 100644 --- a/src/main/java/taintedmagic/client/ClientProxy.java +++ b/src/main/java/taintedmagic/client/ClientProxy.java @@ -1,19 +1,20 @@ package taintedmagic.client; -import java.util.Random; - import net.minecraft.client.Minecraft; -import net.minecraft.client.particle.EntityFX; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.common.MinecraftForge; import taintedmagic.client.handler.HUDHandler; +import taintedmagic.client.renderer.RenderEntityDiffusion; +import taintedmagic.client.renderer.RenderEntityGlowpet; import taintedmagic.client.renderer.RenderEntityHomingShard; import taintedmagic.client.renderer.RenderEntityTaintBubble; import taintedmagic.client.renderer.RenderItemKatana; import taintedmagic.common.CommonProxy; -import taintedmagic.common.entities.EntityEldritchOrbAttack; +import taintedmagic.common.entities.EntityDarkMatter; +import taintedmagic.common.entities.EntityDiffusion; +import taintedmagic.common.entities.EntityGlowpet; import taintedmagic.common.entities.EntityHomingShard; import taintedmagic.common.entities.EntityTaintBubble; import taintedmagic.common.helper.TaintedMagicHelper; @@ -23,7 +24,7 @@ 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; +import cpw.mods.fml.common.FMLCommonHandler; public class ClientProxy extends CommonProxy { @@ -32,8 +33,10 @@ public class ClientProxy extends CommonProxy { // Entities RenderingRegistry.registerEntityRenderingHandler(EntityTaintBubble.class, new RenderEntityTaintBubble()); - RenderingRegistry.registerEntityRenderingHandler(EntityEldritchOrbAttack.class, new RenderEldritchOrb()); + RenderingRegistry.registerEntityRenderingHandler(EntityDarkMatter.class, new RenderEldritchOrb()); RenderingRegistry.registerEntityRenderingHandler(EntityHomingShard.class, new RenderEntityHomingShard()); + RenderingRegistry.registerEntityRenderingHandler(EntityGlowpet.class, new RenderEntityGlowpet()); + RenderingRegistry.registerEntityRenderingHandler(EntityDiffusion.class, new RenderEntityDiffusion()); // Items MinecraftForgeClient.registerItemRenderer(ItemRegistry.ItemKatana, new RenderItemKatana()); @@ -49,6 +52,7 @@ public class ClientProxy extends CommonProxy public void registerClientHandlers () { MinecraftForge.EVENT_BUS.register(new HUDHandler()); + FMLCommonHandler.instance().bus().register(new HUDHandler()); } @Override diff --git a/src/main/java/taintedmagic/client/handler/HUDHandler.java b/src/main/java/taintedmagic/client/handler/HUDHandler.java index a2d73e4..d6fffb6 100644 --- a/src/main/java/taintedmagic/client/handler/HUDHandler.java +++ b/src/main/java/taintedmagic/client/handler/HUDHandler.java @@ -1,14 +1,29 @@ package taintedmagic.client.handler; +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.client.renderer.OpenGlHelper; +import net.minecraft.client.shader.ShaderGroup; +import net.minecraft.client.util.JsonException; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.event.RenderGameOverlayEvent; import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType; +import taintedmagic.common.items.equipment.ItemWarpedGoggles; import taintedmagic.common.items.tools.ItemKatana; import taintedmagic.common.items.tools.ItemThaumicDisassembler; +import thaumcraft.client.lib.ClientTickEventsFML; +import thaumcraft.client.lib.RenderEventHandler; import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.TickEvent; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +@SideOnly (Side.CLIENT) public class HUDHandler { @SubscribeEvent diff --git a/src/main/java/taintedmagic/client/renderer/RenderEntityDiffusion.java b/src/main/java/taintedmagic/client/renderer/RenderEntityDiffusion.java new file mode 100644 index 0000000..2eafd6a --- /dev/null +++ b/src/main/java/taintedmagic/client/renderer/RenderEntityDiffusion.java @@ -0,0 +1,76 @@ +package taintedmagic.client.renderer; + +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.entity.Render; +import net.minecraft.entity.Entity; +import net.minecraft.util.ResourceLocation; + +import org.lwjgl.opengl.GL11; + +import taintedmagic.common.entities.EntityDiffusion; +import thaumcraft.client.fx.ParticleEngine; +import thaumcraft.client.lib.UtilsFX; + +public class RenderEntityDiffusion extends Render +{ + public void render (EntityDiffusion e, double x, double y, double z, float f, float pT) + { + Tessellator t = Tessellator.instance; + + GL11.glPushMatrix(); + + GL11.glTranslated(x, y, z); + + float c = 0.1F; + float a = ( (20.0F - (float) e.ticksExisted) / 40.0F); + + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + + UtilsFX.bindTexture(ParticleEngine.particleTexture); + + float f2 = e.ticksExisted % 13 / 16.0F; + float f3 = f2 + 0.0624375F; + float f4 = 0.1875F; + float f5 = f4 + 0.0624375F; + float f6 = 1.0F; + float f7 = 0.5F; + float f8 = 0.5F; + + GL11.glColor4f(c, c, c, a); + + GL11.glRotatef(180.0F - this.renderManager.playerViewY, 0.0F, 1.0F, 0.0F); + GL11.glRotatef(-this.renderManager.playerViewX, 1.0F, 0.0F, 0.0F); + + float s = 0.5F; + GL11.glScalef(s, s, s); + + t.startDrawingQuads(); + + t.setNormal(0.0F, 1.0F, 0.0F); + t.setColorRGBA_F(c, c, c, a); + + t.addVertexWithUV(0.0F - f7, 0.0F - f8, 0.0D, f2, f5); + t.addVertexWithUV(f6 - f7, 0.0F - f8, 0.0D, f3, f5); + t.addVertexWithUV(f6 - f7, 1.0F - f8, 0.0D, f3, f4); + t.addVertexWithUV(0.0F - f7, 1.0F - f8, 0.0D, f2, f4); + + t.draw(); + + GL11.glDisable(GL11.GL_BLEND); + + GL11.glPopMatrix(); + } + + @Override + public void doRender (Entity e, double x, double y, double z, float f, float pT) + { + render((EntityDiffusion) e, x, y, z, f, pT); + } + + @Override + protected ResourceLocation getEntityTexture (Entity e) + { + return null; + } +} diff --git a/src/main/java/taintedmagic/client/renderer/RenderEntityGlowpet.java b/src/main/java/taintedmagic/client/renderer/RenderEntityGlowpet.java new file mode 100644 index 0000000..f2f5bba --- /dev/null +++ b/src/main/java/taintedmagic/client/renderer/RenderEntityGlowpet.java @@ -0,0 +1,83 @@ +package taintedmagic.client.renderer; + +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.EntityGlowpet; +import thaumcraft.client.fx.ParticleEngine; + +public class RenderEntityGlowpet extends Render +{ + public RenderEntityGlowpet () + { + super(); + this.shadowSize = 0.0F; + } + + public void renderEntityAt (EntityGlowpet e, double x, double y, double z, float f, 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(1.0F, 0.75F, 0.45F, 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.4F, 0.4F); + + t.startDrawingQuads(); + + t.setColorRGBA_F(1.0F, 0.75F, 0.45F, 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((EntityGlowpet) e, x, y, z, f, pT); + } + + protected ResourceLocation getEntityTexture (Entity e) + { + return TextureMap.locationBlocksTexture; + } +} diff --git a/src/main/java/taintedmagic/client/renderer/RenderEntityHomingShard.java b/src/main/java/taintedmagic/client/renderer/RenderEntityHomingShard.java index e27b655..1ec1eda 100644 --- a/src/main/java/taintedmagic/client/renderer/RenderEntityHomingShard.java +++ b/src/main/java/taintedmagic/client/renderer/RenderEntityHomingShard.java @@ -25,7 +25,7 @@ public class RenderEntityHomingShard extends Render this.shadowSize = 0.0F; } - public void renderEntityAt (EntityHomingShard e, double x, double y, double z, float fq, float pt) + public void renderEntityAt (EntityHomingShard e, double x, double y, double z, float f, float pT) { Tessellator t = Tessellator.instance; @@ -77,9 +77,9 @@ public class RenderEntityHomingShard extends Render GL11.glPopMatrix(); } - public void doRender (Entity e, double x, double y, double z, float f, float pt) + public void doRender (Entity e, double x, double y, double z, float f, float pT) { - renderEntityAt((EntityHomingShard) e, x, y, z, f, pt); + renderEntityAt((EntityHomingShard) e, x, y, z, f, pT); } protected ResourceLocation getEntityTexture (Entity e) diff --git a/src/main/java/taintedmagic/client/renderer/RenderEntityTaintBubble.java b/src/main/java/taintedmagic/client/renderer/RenderEntityTaintBubble.java index fb2a56c..933e75b 100644 --- a/src/main/java/taintedmagic/client/renderer/RenderEntityTaintBubble.java +++ b/src/main/java/taintedmagic/client/renderer/RenderEntityTaintBubble.java @@ -14,8 +14,7 @@ import taintedmagic.common.entities.EntityTaintBubble; public class RenderEntityTaintBubble extends Render { - private static final ResourceLocation texture = new ResourceLocation("taintedmagic:textures/entities/EntityTaintBubble.png"); - private Random random = new Random(); + private static final ResourceLocation texture = new ResourceLocation("thaumcraft:textures/misc/particles.png"); public RenderEntityTaintBubble () { @@ -28,26 +27,32 @@ public class RenderEntityTaintBubble extends Render Tessellator t = Tessellator.instance; EntityTaintBubble bubble = (EntityTaintBubble) e; + float r = 0.8F + e.worldObj.rand.nextFloat() * 0.2F; + float g = e.worldObj.rand.nextFloat() * 0.4F; + float b = 1.0F - e.worldObj.rand.nextFloat() * 0.2F; + float a = (50.0F - (float) e.ticksExisted) / 50.0F; + GL11.glPushMatrix(); GL11.glTranslated(x, y, z); GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE); - GL11.glDepthMask(true); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 0.75F); + + GL11.glDepthMask(false); + + GL11.glColor4f(r, g, b, a); Minecraft.getMinecraft().renderEngine.bindTexture(texture); - int p = (int) (7.0F * ((float) bubble.ticksExisted / (float) bubble.duration)); - float f2 = 0; - float f3 = 1; - float f4 = p / 8.0F; - float f5 = (p + 1) / 8.0F; + int p = 7 + bubble.ticksExisted % 8; + float f2 = p / 16.0F; + float f3 = f2 + 0.0624375F; + float f4 = 0.25F; + float f5 = f4 + 0.0624375F; float f6 = 1.0F; float f7 = 0.5F; float f8 = 0.5F; - float s = 0.25F; + float s = 0.3F; GL11.glScalef(s, s, s); @@ -55,9 +60,10 @@ public class RenderEntityTaintBubble extends Render GL11.glRotatef(-this.renderManager.playerViewX, 1.0F, 0.0F, 0.0F); t.startDrawingQuads(); + t.setBrightness(240); t.setNormal(0.0F, 1.0F, 0.0F); - t.setColorRGBA_F(1.0F, 1.0F, 1.0F, 0.9F); + t.setColorRGBA_F(r, g, b, a); t.addVertexWithUV(-f7, -f8, 0.0D, f2, f5); t.addVertexWithUV(f6 - f7, -f8, 0.0D, f3, f5); @@ -66,8 +72,8 @@ public class RenderEntityTaintBubble extends Render t.draw(); + GL11.glDepthMask(true); GL11.glDisable(GL11.GL_BLEND); - GL11.glDisable(32826); GL11.glPopMatrix(); } diff --git a/src/main/java/taintedmagic/common/CommonProxy.java b/src/main/java/taintedmagic/common/CommonProxy.java index ab98b55..801d0c4 100644 --- a/src/main/java/taintedmagic/common/CommonProxy.java +++ b/src/main/java/taintedmagic/common/CommonProxy.java @@ -1,16 +1,7 @@ package taintedmagic.common; -import taintedmagic.common.registry.ItemRegistry; -import thaumcraft.api.aspects.AspectList; -import thaumcraft.common.Thaumcraft; -import thaumcraft.common.items.wands.WandManager; -import net.minecraft.client.model.ModelBiped; -import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import net.minecraftforge.client.MinecraftForgeClient; -import cpw.mods.fml.client.registry.RenderingRegistry; public class CommonProxy { diff --git a/src/main/java/taintedmagic/common/TaintedMagic.java b/src/main/java/taintedmagic/common/TaintedMagic.java index 379f944..58e9c26 100644 --- a/src/main/java/taintedmagic/common/TaintedMagic.java +++ b/src/main/java/taintedmagic/common/TaintedMagic.java @@ -1,24 +1,19 @@ package taintedmagic.common; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; -import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.config.Configuration; -import net.minecraftforge.common.config.Property; import net.minecraftforge.common.util.EnumHelper; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import taintedmagic.api.IBloodlust; import taintedmagic.common.handler.ConfigHandler; import taintedmagic.common.handler.TaintedMagicEventHandler; import taintedmagic.common.handler.UpdateHandler; -import taintedmagic.common.lib.LibCreativeTab; -import taintedmagic.common.lib.LibStrings; +import taintedmagic.common.lib.LibInfo; import taintedmagic.common.network.PacketHandler; import taintedmagic.common.registry.BlockRegistry; import taintedmagic.common.registry.ItemRegistry; @@ -26,8 +21,6 @@ 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; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.EventHandler; @@ -36,7 +29,7 @@ import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; -@Mod (modid = LibStrings.MODID, name = LibStrings.NAME, version = LibStrings.VERSION, dependencies = LibStrings.DEPENDENCIES) +@Mod (modid = LibInfo.MODID, name = LibInfo.NAME, version = LibInfo.VERSION, dependencies = LibInfo.DEPENDENCIES) public class TaintedMagic { @Mod.Instance ("TaintedMagic") @@ -47,7 +40,7 @@ public class TaintedMagic public static CommonProxy proxy; public static TaintedMagicEventHandler taintedMagicEvents; - public static CreativeTabs tabTaintedMagic = new LibCreativeTab(); + public static CreativeTabs tabTaintedMagic = new TaintedMagicCreativeTab(); public static ConfigHandler configHandler; public static final Logger log = LogManager.getLogger("TAINTEDMAGIC"); public static EnumRarity rarityCreation = EnumHelper.addRarity("CREATION", EnumChatFormatting.GOLD, "Creation"); @@ -67,6 +60,7 @@ public class TaintedMagic PacketHandler.init(); ItemRegistry.init(); BlockRegistry.init(); + BlockRegistry.initTiles(); ModEntityRegistry.init(); RecipeRegistry.init(); diff --git a/src/main/java/taintedmagic/common/lib/LibCreativeTab.java b/src/main/java/taintedmagic/common/TaintedMagicCreativeTab.java similarity index 89% rename from src/main/java/taintedmagic/common/lib/LibCreativeTab.java rename to src/main/java/taintedmagic/common/TaintedMagicCreativeTab.java index dcfd4d8..d990cd8 100644 --- a/src/main/java/taintedmagic/common/lib/LibCreativeTab.java +++ b/src/main/java/taintedmagic/common/TaintedMagicCreativeTab.java @@ -1,4 +1,4 @@ -package taintedmagic.common.lib; +package taintedmagic.common; import java.util.ArrayList; import java.util.List; @@ -6,19 +6,19 @@ import java.util.List; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import taintedmagic.common.TaintedMagic; import taintedmagic.common.helper.TaintedMagicHelper; +import taintedmagic.common.lib.LibInfo; import taintedmagic.common.registry.ItemRegistry; import thaumcraft.common.config.ConfigItems; import thaumcraft.common.items.wands.ItemWandCasting; -public class LibCreativeTab extends CreativeTabs +public class TaintedMagicCreativeTab extends CreativeTabs { public List list = new ArrayList(); - public LibCreativeTab () + public TaintedMagicCreativeTab () { - super(LibStrings.MODID); + super(LibInfo.MODID); } @Override diff --git a/src/main/java/taintedmagic/common/blocks/BlockLumos.java b/src/main/java/taintedmagic/common/blocks/BlockLumos.java new file mode 100644 index 0000000..9b1f9b1 --- /dev/null +++ b/src/main/java/taintedmagic/common/blocks/BlockLumos.java @@ -0,0 +1,128 @@ +package taintedmagic.common.blocks; + +import java.util.Random; + +import net.minecraft.block.Block; +import net.minecraft.block.ITileEntityProvider; +import net.minecraft.item.Item; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; +import taintedmagic.common.blocks.tile.TileEntityLumos; +import thaumcraft.common.config.Config; +import thaumcraft.common.config.ConfigItems; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class BlockLumos extends Block implements ITileEntityProvider +{ + int duration = 0; + + public BlockLumos () + { + super(Config.airyMaterial); + this.setBlockName("BlockLumos"); + this.setTickRandomly(false); + this.setLightLevel(1.0F); + this.setStepSound(new CustomStepSound("thaumcraft:crystal", 0.3F, 1.0F)); + this.setBlockTextureName("thaumcraft:blank"); + } + + public void setGlowDuration (int i) + { + this.duration = i; + } + + public int getGlowDuration () + { + return this.duration; + } + + @Override + public void setBlockBoundsBasedOnState (IBlockAccess w, int x, int y, int z) + { + int meta = w.getBlockMetadata(x, y, z); + if (meta == 2) setBlockBounds(0.3F, 0.3F, 0.3F, 0.7F, 0.7F, 0.7F); + else setBlockBounds(0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F); + } + + @SideOnly (Side.CLIENT) + @Override + public AxisAlignedBB getSelectedBoundingBoxFromPool (World w, int x, int y, int z) + { + return AxisAlignedBB.getBoundingBox(0.0D, 0.0D, 0.0D, 0.0D, 0.0D, 0.0D); + } + + @Override + public AxisAlignedBB getCollisionBoundingBoxFromPool (World w, int x, int y, int z) + { + return null; + } + + @Override + public int getRenderType () + { + return -1; + } + + @Override + public boolean isSideSolid (IBlockAccess w, int x, int y, int z, ForgeDirection side) + { + return false; + } + + @Override + public boolean isBlockNormalCube () + { + return false; + } + + @Override + public boolean isOpaqueCube () + { + return false; + } + + @Override + public boolean isReplaceable (IBlockAccess w, int x, int y, int z) + { + return true; + } + + @Override + public boolean canBeReplacedByLeaves (IBlockAccess w, int x, int y, int z) + { + return true; + } + + public boolean renderAsNormalBlock () + { + return false; + } + + @Override + public boolean isLeaves (IBlockAccess w, int x, int y, int z) + { + return true; + } + + @Override + public Item getItemDropped (int a, Random r, int b) + { + return null; + } + + @Override + public Item getItem (World w, int x, int y, int z) + { + return null; + } + + @Override + public TileEntity createNewTileEntity (World w, int m) + { + return new TileEntityLumos(); + } +} \ No newline at end of file diff --git a/src/main/java/taintedmagic/common/blocks/CustomStepSound.java b/src/main/java/taintedmagic/common/blocks/CustomStepSound.java new file mode 100644 index 0000000..548539f --- /dev/null +++ b/src/main/java/taintedmagic/common/blocks/CustomStepSound.java @@ -0,0 +1,21 @@ +package taintedmagic.common.blocks; + +import net.minecraft.block.Block; + +public class CustomStepSound extends Block.SoundType +{ + public CustomStepSound (String soundPath, float volume, float pitch) + { + super(soundPath, volume, pitch); + } + + public String getBreakSound () + { + return this.soundName; + } + + public String getStepResourcePath () + { + return this.soundName; + } +} diff --git a/src/main/java/taintedmagic/common/blocks/tile/TileEntityLumos.java b/src/main/java/taintedmagic/common/blocks/tile/TileEntityLumos.java new file mode 100644 index 0000000..6cf36c1 --- /dev/null +++ b/src/main/java/taintedmagic/common/blocks/tile/TileEntityLumos.java @@ -0,0 +1,72 @@ +package taintedmagic.common.blocks.tile; + +import java.util.List; +import java.util.Random; + +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.AxisAlignedBB; +import taintedmagic.common.blocks.BlockLumos; +import taintedmagic.common.entities.EntityGlowpet; +import taintedmagic.common.items.wand.foci.ItemFocusLumos; +import thaumcraft.client.fx.ParticleEngine; +import thaumcraft.client.fx.particles.FXSparkle; +import thaumcraft.common.Thaumcraft; +import thaumcraft.common.items.wands.ItemWandCasting; + +public class TileEntityLumos extends TileEntity +{ + int ticksExisted; + + public TileEntityLumos () + { + } + + public boolean canUpdate () + { + return true; + } + + @Override + public void updateEntity () + { + ticksExisted++; + + Block b = worldObj.getBlock(xCoord, yCoord, zCoord); + int meta = worldObj.getBlockMetadata(xCoord, yCoord, zCoord); + + List ents = worldObj.getEntitiesWithinAABB(EntityGlowpet.class, AxisAlignedBB.getBoundingBox(xCoord, yCoord, zCoord, xCoord + 1, yCoord + 1, zCoord + 1).expand(2.0D, 2.0D, 2.0D)); + if (b instanceof BlockLumos) + { + BlockLumos src = (BlockLumos) b; + if (meta == 0 && ents.isEmpty()) + { + worldObj.setBlockToAir(xCoord, yCoord, zCoord); + } + + else if (meta == 1 && ticksExisted > src.getGlowDuration()) + { + worldObj.setBlockToAir(xCoord, yCoord, zCoord); + } + + Random r = new Random(); + if ( (meta == 1 && r.nextInt(50) == 0) || (meta == 2 && r.nextInt(9) == 0)) + { + Thaumcraft.proxy.sparkle((float) xCoord + 0.5F + (this.worldObj.rand.nextFloat() - this.worldObj.rand.nextFloat()) * 0.25F, (float) yCoord + 0.5F + (this.worldObj.rand.nextFloat() - this.worldObj.rand.nextFloat()) * 0.25F, (float) zCoord + 0.5F + (this.worldObj.rand.nextFloat() - this.worldObj.rand.nextFloat()) * 0.25F, 0.5F, 6, -0.05F); + } + + if ( (meta == 1 || meta == 2) && r.nextInt(512) == 0) + { + for (int a = 0; a < 9; a++) + { + FXSparkle fx = new FXSparkle(worldObj, xCoord + worldObj.rand.nextFloat(), yCoord + worldObj.rand.nextFloat(), zCoord + worldObj.rand.nextFloat(), 1.75F, worldObj.rand.nextInt(5), 3 + worldObj.rand.nextInt(3)); + fx.setGravity(0.1F); + ParticleEngine.instance.addEffect(worldObj, fx); + if (r.nextBoolean()) break; + } + } + } + } +} diff --git a/src/main/java/taintedmagic/common/entities/EntityEldritchOrbAttack.java b/src/main/java/taintedmagic/common/entities/EntityDarkMatter.java similarity index 81% rename from src/main/java/taintedmagic/common/entities/EntityEldritchOrbAttack.java rename to src/main/java/taintedmagic/common/entities/EntityDarkMatter.java index f783c57..cea6f99 100644 --- a/src/main/java/taintedmagic/common/entities/EntityEldritchOrbAttack.java +++ b/src/main/java/taintedmagic/common/entities/EntityDarkMatter.java @@ -1,32 +1,35 @@ package taintedmagic.common.entities; -import java.util.List; - import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.DamageSource; -import net.minecraft.util.EntityDamageSourceIndirect; import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.MovingObjectPosition.MovingObjectType; import net.minecraft.world.World; import thaumcraft.common.entities.projectile.EntityEldritchOrb; -public class EntityEldritchOrbAttack extends EntityEldritchOrb +public class EntityDarkMatter extends EntityEldritchOrb { - public float dmg = 10F; + public float dmg = 0.0F; public boolean corrosive; - public EntityEldritchOrbAttack (World w) + public EntityDarkMatter (World w) { super(w); } - public EntityEldritchOrbAttack (World w, EntityLivingBase e, boolean corrosive) + public EntityDarkMatter (World w, EntityLivingBase e, float dmg, boolean corrosive) { super(w, e); this.corrosive = corrosive; + this.dmg = dmg; + } + + @Override + public boolean shouldRenderInPass (int pass) + { + return pass == 1; } @Override diff --git a/src/main/java/taintedmagic/common/entities/EntityDiffusion.java b/src/main/java/taintedmagic/common/entities/EntityDiffusion.java new file mode 100644 index 0000000..1508f7f --- /dev/null +++ b/src/main/java/taintedmagic/common/entities/EntityDiffusion.java @@ -0,0 +1,157 @@ +package taintedmagic.common.entities; + +import io.netty.buffer.ByteBuf; + +import java.util.List; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.projectile.EntityThrowable; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; +import net.minecraft.util.DamageSource; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class EntityDiffusion extends EntityThrowable +{ + public static final String TAG_DAMAGE = "dmg"; + + public boolean corrosive = false; + public float dmg = 0.0F; + + public EntityDiffusion (World w) + { + super(w); + } + + public EntityDiffusion (World w, EntityLivingBase e, float scatter, float dmg, boolean corrosive) + { + super(w, e); + this.corrosive = corrosive; + this.dmg = dmg; + setThrowableHeading(this.motionX, this.motionY, this.motionZ, func_70182_d(), scatter); + } + + @Override + public boolean shouldRenderInPass (int pass) + { + return pass == 1; + } + + protected float getGravityVelocity () + { + return 0.0F; + } + + protected float func_70182_d () + { + return 1.0F; + } + + public void onUpdate () + { + if (this.ticksExisted > 20) setDead(); + + this.motionX *= 0.95D; + this.motionY *= 0.95D; + this.motionZ *= 0.95D; + + if (this.onGround) + { + this.motionX *= 0.66D; + this.motionY *= 0.66D; + this.motionZ *= 0.66D; + } + super.onUpdate(); + } + + public void writeSpawnData (ByteBuf buf) + { + buf.writeFloat(this.dmg); + } + + public void readSpawnData (ByteBuf buf) + { + this.dmg = buf.readFloat(); + } + + protected void onImpact (MovingObjectPosition mop) + { + if (!this.worldObj.isRemote && getThrower() != null) + { + List l = this.worldObj.getEntitiesWithinAABBExcludingEntity(getThrower(), this.boundingBox.expand(1.0D, 1.0D, 1.0D)); + + for (int i = 0; i < l.size(); i++) + { + Entity e = (Entity) l.get(i); + if (e instanceof EntityLivingBase) + { + if (mop.entityHit != null) + { + ((EntityLivingBase) e).attackEntityFrom(DamageSource.causeIndirectMagicDamage(getThrower(), e), this.dmg); + if (this.corrosive) + { + try + { + ((EntityLivingBase) e).addPotionEffect(new PotionEffect(Potion.wither.id, 160, 1)); + } + catch (Exception ex) + { + ex.printStackTrace(); + } + } + else + { + try + { + ((EntityLivingBase) e).addPotionEffect(new PotionEffect(Potion.weakness.id, 160, 1)); + } + catch (Exception ex) + { + ex.printStackTrace(); + } + } + } + } + } + } + setDead(); + } + + protected boolean canTriggerWalking () + { + return false; + } + + @SideOnly (Side.CLIENT) + public float getShadowSize () + { + return 0.1F; + } + + public void writeEntityToNBT (NBTTagCompound cmp) + { + super.writeEntityToNBT(cmp); + cmp.setFloat(TAG_DAMAGE, this.dmg); + } + + public void readEntityFromNBT (NBTTagCompound cmp) + { + super.readEntityFromNBT(cmp); + this.dmg = cmp.getInteger(TAG_DAMAGE); + } + + public boolean canBeCollidedWith () + { + return false; + } + + public boolean attackEntityFrom (DamageSource s, float f) + { + return false; + } +} diff --git a/src/main/java/taintedmagic/common/entities/EntityGlowpet.java b/src/main/java/taintedmagic/common/entities/EntityGlowpet.java new file mode 100644 index 0000000..73a9269 --- /dev/null +++ b/src/main/java/taintedmagic/common/entities/EntityGlowpet.java @@ -0,0 +1,141 @@ +package taintedmagic.common.entities; + +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.projectile.EntityThrowable; +import net.minecraft.init.Blocks; +import net.minecraft.util.MathHelper; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.Vec3; +import net.minecraft.world.World; +import taintedmagic.common.registry.BlockRegistry; +import thaumcraft.common.Thaumcraft; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class EntityGlowpet extends EntityThrowable +{ + int maxAge = 0; + Material[] mats = { Material.plants, Material.air, Material.leaves, Material.portal, Material.vine, Material.web, Material.portal }; + + public EntityGlowpet (World w) + { + super(w); + } + + public EntityGlowpet (World w, EntityLivingBase p, int maxAgeMul) + { + super(w, p); + this.maxAge = 200 * maxAgeMul; + 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 boolean shouldRenderInPass (int pass) + { + return pass == 1; + } + + @Override + protected float getGravityVelocity () + { + return 0.0F; + } + + @Override + protected void onImpact (MovingObjectPosition mop) + { + if (mop.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) + { + Block b = this.worldObj.getBlock(mop.blockX, mop.blockY, mop.blockZ); + + int l = mats.length; + List whitelisted = new ArrayList(l); + for (int i = 0; i < l; i++) + whitelisted.add(mats[i]); + + if (!whitelisted.contains(b.getMaterial())) + { + 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, 6, 0.0F); + + super.onUpdate(); + + if (!this.worldObj.isRemote) + { + int x = MathHelper.floor_double(this.posX); + int y = MathHelper.floor_double(this.posY - this.getYOffset()); + int z = MathHelper.floor_double(this.posZ); + + for (int i = -1; i < 2; i++) + { + for (int j = -1; j < 2; j++) + { + for (int k = -1; k < 2; k++) + { + if (this.worldObj.getBlock(x + i, y + k, z + j) == Blocks.air) + { + this.worldObj.setBlock(x + i, y + k, z + j, BlockRegistry.BlockLumos, 0, 3); + break; + } + } + } + } + + if (this.getThrower() == null || this.getThrower().isDead || this.getThrower().getDistanceSqToEntity(this) > 1250.0D || this.ticksExisted > this.maxAge || this.isWet()) + { + this.worldObj.setEntityState(this, (byte) 16); + setDead(); + } + } + + if (this.ticksExisted % 10 == 0 && this.getThrower() != null && !this.getThrower().isDead && this.getThrower().getDistanceSqToEntity(this) > 10.0D) + { + double d = getDistanceToEntity(this.getThrower()); + double dx = this.getThrower().posX - this.posX; + double dy = this.getThrower().boundingBox.minY + this.getThrower().height * 0.6D - this.posY; + double dz = this.getThrower().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/entities/EntityHomingShard.java b/src/main/java/taintedmagic/common/entities/EntityHomingShard.java index 1be24eb..a84b1f1 100644 --- a/src/main/java/taintedmagic/common/entities/EntityHomingShard.java +++ b/src/main/java/taintedmagic/common/entities/EntityHomingShard.java @@ -3,7 +3,10 @@ package taintedmagic.common.entities; import io.netty.buffer.ByteBuf; import java.util.ArrayList; +import java.util.List; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.projectile.EntityThrowable; @@ -30,6 +33,8 @@ public class EntityHomingShard extends EntityThrowable implements IEntityAdditio int targetID = 0; EntityLivingBase target; + Material[] mats = { Material.plants, Material.air, Material.leaves, Material.portal, Material.vine, Material.web, Material.portal }; + public EntityHomingShard (World w) { super(w); @@ -52,6 +57,12 @@ public class EntityHomingShard extends EntityThrowable implements IEntityAdditio this.motionY = (-MathHelper.sin(rp / 180.0F * (float) Math.PI) * f); } + @Override + public boolean shouldRenderInPass (int pass) + { + return pass == 1; + } + @Override public void entityInit () { @@ -107,11 +118,21 @@ public class EntityHomingShard extends EntityThrowable implements IEntityAdditio setDead(); } - if (mop.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK && this.worldObj.getBlock(mop.blockX, mop.blockY, mop.blockZ).isOpaqueCube()) + if (mop.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) { - this.motionZ *= -0.5D; - this.motionX *= -0.5D; - this.motionY *= -0.5D; + Block b = this.worldObj.getBlock(mop.blockX, mop.blockY, mop.blockZ); + + int l = mats.length; + List whitelisted = new ArrayList(l); + for (int i = 0; i < l; i++) + whitelisted.add(mats[i]); + + if (!whitelisted.contains(b.getMaterial())) + { + this.motionZ *= -0.5D; + this.motionX *= -0.5D; + this.motionY *= -0.5D; + } } } diff --git a/src/main/java/taintedmagic/common/entities/EntityTaintBubble.java b/src/main/java/taintedmagic/common/entities/EntityTaintBubble.java index b367d0b..65f6bf0 100644 --- a/src/main/java/taintedmagic/common/entities/EntityTaintBubble.java +++ b/src/main/java/taintedmagic/common/entities/EntityTaintBubble.java @@ -1,50 +1,51 @@ package taintedmagic.common.entities; -import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; import java.util.List; -import java.util.Random; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.projectile.EntityThrowable; -import net.minecraft.init.Blocks; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; +import net.minecraft.util.ChunkCoordinates; import net.minecraft.util.DamageSource; import net.minecraft.util.EntityDamageSourceIndirect; +import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -import thaumcraft.api.potions.PotionFluxTaint; -import thaumcraft.common.Thaumcraft; -import thaumcraft.common.config.Config; +import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class EntityTaintBubble extends EntityThrowable implements IEntityAdditionalSpawnData { - public static final String TAG_DURATION = "duration"; - public static final String TAG_DAMAGE = "damage"; + public static final String TAG_DAMAGE = "dmg"; public boolean corrosive = false; - public int duration = 20; - public float damage = 5F; + public float dmg = 0.0F; public EntityTaintBubble (World w) { super(w); } - public EntityTaintBubble (World w, EntityLivingBase e, float scatter, boolean corrosive) + public EntityTaintBubble (World w, EntityLivingBase e, float scatter, float dmg, boolean corrosive) { super(w, e); this.corrosive = corrosive; + this.dmg = dmg; setThrowableHeading(this.motionX, this.motionY, this.motionZ, func_70182_d(), scatter); } + @Override + public boolean shouldRenderInPass (int pass) + { + return pass == 1; + } + protected float getGravityVelocity () { return 0.0F; @@ -57,74 +58,78 @@ public class EntityTaintBubble extends EntityThrowable implements IEntityAdditio public void onUpdate () { - if (this.ticksExisted > this.duration) setDead(); + // simulated taint swarm motion + ChunkCoordinates c = new ChunkCoordinates((int) this.posX + this.rand.nextInt(7) - this.rand.nextInt(7), (int) this.posY + this.rand.nextInt(6) - 2, (int) this.posZ + this.rand.nextInt(7) - this.rand.nextInt(7)); + double varX = c.posX + 0.5D - this.posX; + double varY = c.posY + 0.1D - this.posY; + double varZ = c.posZ + 0.5D - this.posZ; + this.motionX += (Math.signum(varX) * 0.5D - this.motionX) * 0.025D; + this.motionY += (Math.signum(varY) * 0.7D - this.motionY) * 0.05D; + this.motionZ += (Math.signum(varZ) * 0.5D - this.motionZ) * 0.025D; - if (this.duration <= 20) - { - this.motionX *= 0.95D; - this.motionY *= 0.95D; - this.motionZ *= 0.95D; - } - else - { - this.motionX *= 0.975D; - this.motionY *= 0.975D; - this.motionZ *= 0.975D; - } + float angle = (float) (Math.atan2(this.motionZ, this.motionX) * 180.0D / Math.PI) - 90.0F; + float wrappedAngle = MathHelper.wrapAngleTo180_float(angle - this.rotationYaw); + this.rotationYaw += wrappedAngle; + + if (this.ticksExisted > 50) setDead(); + + this.motionX *= 0.95D; + this.motionY *= 0.95D; + this.motionZ *= 0.95D; if (this.onGround) { - this.motionX *= 0.66D; - this.motionY *= 0.66D; - this.motionZ *= 0.66D; + this.motionX *= 0.65D; + this.motionY *= 0.65D; + this.motionZ *= 0.65D; } super.onUpdate(); } - public void writeSpawnData (ByteBuf data) + public void writeSpawnData (ByteBuf buf) { - data.writeByte(this.duration); + buf.writeFloat(this.dmg); } - public void readSpawnData (ByteBuf data) + public void readSpawnData (ByteBuf buf) { - this.duration = data.readByte(); + this.dmg = buf.readFloat(); } protected void onImpact (MovingObjectPosition mop) { - if ( (!this.worldObj.isRemote) && (getThrower() != null)) + if (!this.worldObj.isRemote && getThrower() != null) { - List list = this.worldObj.getEntitiesWithinAABBExcludingEntity(getThrower(), this.boundingBox.expand(1.0D, 1.0D, 1.0D)); + List l = this.worldObj.getEntitiesWithinAABBExcludingEntity(getThrower(), this.boundingBox.expand(1.0D, 1.0D, 1.0D)); - for (int i = 0; i < list.size(); i++) + for (int i = 0; i < l.size(); i++) { - Entity ent = (Entity) list.get(i); - if (ent instanceof EntityLivingBase) + Entity e = (Entity) l.get(i); + if (e instanceof EntityLivingBase) { if (mop.entityHit != null) { - ((EntityLivingBase) ent).attackEntityFrom(new EntityDamageSourceIndirect("taint", this, getThrower()).setMagicDamage(), this.damage); + ((EntityLivingBase) e).attackEntityFrom(new EntityDamageSourceIndirect("taint", this, getThrower()).setMagicDamage(), this.dmg); if (this.corrosive) { try { - ((EntityLivingBase) ent).addPotionEffect(new PotionEffect(Potion.wither.id, 100, 1)); + ((EntityLivingBase) e).addPotionEffect(new PotionEffect(Potion.wither.id, 100, 1)); } - catch (Exception e) + catch (Exception ex) { - e.printStackTrace(); + ex.printStackTrace(); } } else { try { - ((EntityLivingBase) ent).addPotionEffect(new PotionEffect(Potion.poison.id, 100, 1)); + ((EntityLivingBase) e).addPotionEffect(new PotionEffect(Potion.poison.id, 100, 1)); } - catch (Exception e) + catch (Exception ex) { - e.printStackTrace(); + ex.printStackTrace(); } } } @@ -148,15 +153,13 @@ public class EntityTaintBubble extends EntityThrowable implements IEntityAdditio public void writeEntityToNBT (NBTTagCompound cmp) { super.writeEntityToNBT(cmp); - cmp.setFloat(TAG_DAMAGE, this.damage); - cmp.setInteger(TAG_DURATION, this.duration); + cmp.setFloat(TAG_DAMAGE, this.dmg); } public void readEntityFromNBT (NBTTagCompound cmp) { super.readEntityFromNBT(cmp); - this.damage = cmp.getInteger(TAG_DAMAGE); - this.duration = cmp.getInteger(TAG_DURATION); + this.dmg = cmp.getInteger(TAG_DAMAGE); } public boolean canBeCollidedWith () diff --git a/src/main/java/taintedmagic/common/handler/TaintedMagicEventHandler.java b/src/main/java/taintedmagic/common/handler/TaintedMagicEventHandler.java index 0e3becf..73644a8 100644 --- a/src/main/java/taintedmagic/common/handler/TaintedMagicEventHandler.java +++ b/src/main/java/taintedmagic/common/handler/TaintedMagicEventHandler.java @@ -16,13 +16,13 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.ChatComponentText; -import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; import net.minecraftforge.event.entity.living.LivingAttackEvent; 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.foci.FocusUpgrades; import taintedmagic.common.items.wand.foci.ItemFocusMageMace; import taintedmagic.common.registry.ItemRegistry; import thaumcraft.api.ThaumcraftApiHelper; @@ -66,7 +66,7 @@ public class TaintedMagicEventHandler } /* - * Used to upate the attack damage for the Mage's Mace focus + * Used to upate the attack dmg for the Mage's Mace focus */ public void updateAttackDamage (EntityPlayer p) { @@ -201,27 +201,32 @@ public class TaintedMagicEventHandler if (event.crafting.getItem() == ItemRegistry.ItemMaterial && event.crafting.getItemDamage() == 5) giveResearch(event.player); } - public void giveResearch (EntityPlayer player) + public void giveResearch (EntityPlayer p) { - if ( (!ThaumcraftApiHelper.isResearchComplete(player.getCommandSenderName(), "CREATION") && (ThaumcraftApiHelper.isResearchComplete(player.getCommandSenderName(), "CREATIONSHARD") && !player.worldObj.isRemote))) + if (!p.worldObj.isRemote) { - Thaumcraft.proxy.getResearchManager().completeResearch(player, "CREATION"); - PacketHandler.INSTANCE.sendTo(new PacketResearchComplete("CREATION"), (EntityPlayerMP) player); - player.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("text.1"))); - player.playSound("thaumcraft:wind", 1.0F, 5.0F); - try + if (!ThaumcraftApiHelper.isResearchComplete(p.getCommandSenderName(), "CREATION") && ThaumcraftApiHelper.isResearchComplete(p.getCommandSenderName(), "CREATIONSHARD")) { - player.addPotionEffect(new PotionEffect(Potion.blindness.id, 80, 0)); - player.addPotionEffect(new PotionEffect(Config.potionBlurredID, 200, 0)); - } - catch (Exception e) - { - e.printStackTrace(); - } - if ( (!ThaumcraftApiHelper.isResearchComplete(player.getCommandSenderName(), "OUTERREV") && (ThaumcraftApiHelper.isResearchComplete(player.getCommandSenderName(), "CREATION") && !player.worldObj.isRemote))) - { - Thaumcraft.proxy.getResearchManager().completeResearch(player, "OUTERREV"); - PacketHandler.INSTANCE.sendTo(new PacketResearchComplete("OUTERREV"), (EntityPlayerMP) player); + Thaumcraft.proxy.getResearchManager().completeResearch(p, "CREATION"); + PacketHandler.INSTANCE.sendTo(new PacketResearchComplete("CREATION"), (EntityPlayerMP) p); + p.addChatMessage(new ChatComponentText("\u00A75" + StatCollector.translateToLocal("text.creation"))); + p.playSound("thaumcraft:wind", 1.0F, 5.0F); + + if (!ThaumcraftApiHelper.isResearchComplete(p.getCommandSenderName(), "OUTERREV") && ThaumcraftApiHelper.isResearchComplete(p.getCommandSenderName(), "CREATION")) + { + Thaumcraft.proxy.getResearchManager().completeResearch(p, "OUTERREV"); + PacketHandler.INSTANCE.sendTo(new PacketResearchComplete("OUTERREV"), (EntityPlayerMP) p); + } + + try + { + p.addPotionEffect(new PotionEffect(Potion.blindness.id, 80, 0)); + p.addPotionEffect(new PotionEffect(Config.potionBlurredID, 200, 0)); + } + catch (Exception e) + { + e.printStackTrace(); + } } } } @@ -238,7 +243,7 @@ public class TaintedMagicEventHandler ItemStack drops = new ItemStack(ItemRegistry.ItemMaterial, r.nextInt(5), 7); addDropItem(event, drops); } - else if (p.getHeldItem() != null && p.getHeldItem().getItem() instanceof ItemWandCasting && ((ItemWandCasting) p.getHeldItem().getItem()).getFocus(p.getHeldItem()) != null && ((ItemWandCasting) p.getHeldItem().getItem()).getFocus(p.getHeldItem()).isUpgradedWith( ((ItemWandCasting) p.getHeldItem().getItem()).getFocusItem(p.getHeldItem()), ItemFocusMageMace.bloodlust)) + else if (p.getHeldItem() != null && p.getHeldItem().getItem() instanceof ItemWandCasting && ((ItemWandCasting) p.getHeldItem().getItem()).getFocus(p.getHeldItem()) != null && ((ItemWandCasting) p.getHeldItem().getItem()).getFocus(p.getHeldItem()).isUpgradedWith( ((ItemWandCasting) p.getHeldItem().getItem()).getFocusItem(p.getHeldItem()), FocusUpgrades.bloodlust)) { Random r = new Random(); ItemStack drops = new ItemStack(ItemRegistry.ItemMaterial, r.nextInt(5), 7); @@ -267,7 +272,7 @@ public class TaintedMagicEventHandler } if (event.itemStack.getItem() instanceof IBloodlust) event.toolTip.add("\u00A74" + StatCollector.translateToLocal("text.bloodlust")); if (event.itemStack.getItem() instanceof ItemCrimsonSword) event.toolTip.add("\u00A74" + StatCollector.translateToLocal("text.bloodlust")); - if ( (event.itemStack.getItem() instanceof ItemFocusMageMace && ((ItemFocusBasic) event.itemStack.getItem()).isUpgradedWith(event.itemStack, ItemFocusMageMace.bloodlust)) || (event.itemStack.getItem() instanceof ItemWandCasting && ((ItemWandCasting) event.itemStack.getItem()).getFocus(event.itemStack) != null && ((ItemWandCasting) event.itemStack.getItem()).getFocus(event.itemStack) instanceof ItemFocusMageMace && ((ItemWandCasting) event.itemStack.getItem()).getFocus(event.itemStack).isUpgradedWith( ((ItemWandCasting) event.itemStack.getItem()).getFocusItem(event.itemStack), ItemFocusMageMace.bloodlust))) event.toolTip.add("\u00A74" + StatCollector.translateToLocal("text.bloodlust")); + if ( (event.itemStack.getItem() instanceof ItemFocusMageMace && ((ItemFocusBasic) event.itemStack.getItem()).isUpgradedWith(event.itemStack, FocusUpgrades.bloodlust)) || (event.itemStack.getItem() instanceof ItemWandCasting && ((ItemWandCasting) event.itemStack.getItem()).getFocus(event.itemStack) != null && ((ItemWandCasting) event.itemStack.getItem()).getFocus(event.itemStack) instanceof ItemFocusMageMace && ((ItemWandCasting) event.itemStack.getItem()).getFocus(event.itemStack).isUpgradedWith( ((ItemWandCasting) event.itemStack.getItem()).getFocusItem(event.itemStack), FocusUpgrades.bloodlust))) event.toolTip.add("\u00A74" + StatCollector.translateToLocal("text.bloodlust")); if (event.itemStack.stackTagCompound != null && event.itemStack.stackTagCompound.getBoolean("voidtouched")) event.toolTip.add("\u00A75" + StatCollector.translateToLocal("text.voidtouched")); } diff --git a/src/main/java/taintedmagic/common/handler/UpdateHandler.java b/src/main/java/taintedmagic/common/handler/UpdateHandler.java index e3994e1..0927502 100644 --- a/src/main/java/taintedmagic/common/handler/UpdateHandler.java +++ b/src/main/java/taintedmagic/common/handler/UpdateHandler.java @@ -7,12 +7,12 @@ import java.net.URL; import java.util.Scanner; import taintedmagic.common.TaintedMagic; -import taintedmagic.common.lib.LibStrings; +import taintedmagic.common.lib.LibInfo; import net.minecraft.util.EnumChatFormatting; public class UpdateHandler { - private static String currentVersion = LibStrings.VERSION; + private static String currentVersion = LibInfo.VERSION; private static String newestVersion; public static String updateStatus = null; public static boolean show = false; diff --git a/src/main/java/taintedmagic/common/handler/WandUpdateHandler.java b/src/main/java/taintedmagic/common/handler/WandHandler.java similarity index 79% rename from src/main/java/taintedmagic/common/handler/WandUpdateHandler.java rename to src/main/java/taintedmagic/common/handler/WandHandler.java index 018010d..44ffbe3 100644 --- a/src/main/java/taintedmagic/common/handler/WandUpdateHandler.java +++ b/src/main/java/taintedmagic/common/handler/WandHandler.java @@ -17,7 +17,7 @@ import thaumcraft.common.items.wands.ItemWandCasting; import thaumcraft.common.lib.potions.PotionWarpWard; import net.minecraft.entity.player.EntityPlayer; -public class WandUpdateHandler implements IWandRodOnUpdate +public class WandHandler implements IWandRodOnUpdate { Aspect aspect; Aspect primals[] = Aspect.getPrimalAspects().toArray(new Aspect[0]); @@ -31,9 +31,11 @@ public class WandUpdateHandler implements IWandRodOnUpdate int x = permwarp; if (x == 0) x++; - int y = Math.max( (200 - x), 50); - - if (player.ticksExisted % y == 0) + int y = Math.max( (200 - x), 20); + double fx = 20 * coth(x / 250.0D); + int rfx = Math.min((int) Math.round(fx), 200); + + if (player.ticksExisted % rfx == 0) { for (int i = 0; i < primals.length; i++) { @@ -42,4 +44,9 @@ public class WandUpdateHandler implements IWandRodOnUpdate } } } + + public double coth (double x) + { + return Math.cosh(x) / Math.sinh(x); + } } diff --git a/src/main/java/taintedmagic/common/helper/TaintedMagicHelper.java b/src/main/java/taintedmagic/common/helper/TaintedMagicHelper.java index e8da81c..144b382 100644 --- a/src/main/java/taintedmagic/common/helper/TaintedMagicHelper.java +++ b/src/main/java/taintedmagic/common/helper/TaintedMagicHelper.java @@ -1,10 +1,10 @@ package taintedmagic.common.helper; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; 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 net.minecraft.world.IBlockAccess; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.codechicken.lib.vec.Vector3; @@ -27,9 +27,9 @@ public class TaintedMagicHelper public static double getDistanceTo (double x, double y, double z, EntityPlayer p) { - double var7 = p.posX + 0.5D - x; - double var9 = p.posY + 0.5D - y; - double var11 = p.posZ + 0.5D - z; - return var7 * var7 + var9 * var9 + var11 * var11; + double distX = p.posX + 0.5D - x; + double distY = p.posY + 0.5D - y; + double distZ = p.posZ + 0.5D - z; + return distX * distX + distY * distY + distZ * distZ; } } diff --git a/src/main/java/taintedmagic/common/items/ItemMaterial.java b/src/main/java/taintedmagic/common/items/ItemMaterial.java index 5366176..0cdaff4 100644 --- a/src/main/java/taintedmagic/common/items/ItemMaterial.java +++ b/src/main/java/taintedmagic/common/items/ItemMaterial.java @@ -17,7 +17,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class ItemMaterial extends Item { - public int SUBTYPES = 9; + public int SUBTYPES = 10; public IIcon[] icons = new IIcon[SUBTYPES]; public ItemMaterial () @@ -50,6 +50,8 @@ public class ItemMaterial extends Item return EnumRarity.uncommon; case 8 : return EnumRarity.uncommon; + case 9 : + return EnumRarity.uncommon; } return EnumRarity.common; } diff --git a/src/main/java/taintedmagic/common/items/equipment/ItemVoidwalkerBoots.java b/src/main/java/taintedmagic/common/items/equipment/ItemVoidwalkerBoots.java index 7e9ae0d..079cfe8 100644 --- a/src/main/java/taintedmagic/common/items/equipment/ItemVoidwalkerBoots.java +++ b/src/main/java/taintedmagic/common/items/equipment/ItemVoidwalkerBoots.java @@ -10,6 +10,8 @@ import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.DamageSource; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.ISpecialArmor; import net.minecraftforge.common.MinecraftForge; @@ -105,6 +107,7 @@ public class ItemVoidwalkerBoots extends ItemArmor implements IVisDiscountGear, @Override public void addInformation (ItemStack s, EntityPlayer p, List l, boolean b) { + l.add(EnumChatFormatting.DARK_PURPLE + StatCollector.translateToLocal("tc.visdiscount") + ": " + getVisDiscount(s, p, null) + "%"); } public void onUpdate (ItemStack s, World w, Entity e, int j, boolean k) diff --git a/src/main/java/taintedmagic/common/items/tools/ItemKatana.java b/src/main/java/taintedmagic/common/items/tools/ItemKatana.java index dfb4631..800454c 100644 --- a/src/main/java/taintedmagic/common/items/tools/ItemKatana.java +++ b/src/main/java/taintedmagic/common/items/tools/ItemKatana.java @@ -241,10 +241,7 @@ public class ItemKatana extends Item implements IWarpingGear, IRepairable 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 PacketKatanaAttack(mop.entityHit, p, this.getAttackDamage(s) * mul, leech)); - } + 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()); @@ -256,6 +253,7 @@ public class ItemKatana extends Item implements IWarpingGear, IRepairable case 0 : { EntityExplosiveOrb proj = new EntityExplosiveOrb(w, p); + proj.strength = getAttackDamage(s) * 2.0F; proj.posX += proj.motionX; proj.posY += proj.motionY; proj.posZ += proj.motionZ; @@ -267,11 +265,10 @@ public class ItemKatana extends Item implements IWarpingGear, IRepairable { for (int a = 0; a < 50; a++) { - EntityTaintBubble proj = new EntityTaintBubble(w, p, 5.0F, false); + EntityTaintBubble proj = new EntityTaintBubble(w, p, 5.0F, getAttackDamage(s) * 1.5F, false); proj.posX += proj.motionX; proj.posY += proj.motionY; proj.posZ += proj.motionZ; - proj.damage = getAttackDamage(s) * 0.2F; if (!w.isRemote) w.spawnEntityInWorld(proj); p.swingItem(); } @@ -281,6 +278,8 @@ public class ItemKatana extends Item implements IWarpingGear, IRepairable break; } } + s.stackTagCompound = new NBTTagCompound(); + s.stackTagCompound.setInteger("inscription", 2); } private boolean isFullyCharged (EntityPlayer p) diff --git a/src/main/java/taintedmagic/common/items/tools/ItemThaumicDisassembler.java b/src/main/java/taintedmagic/common/items/tools/ItemThaumicDisassembler.java index 9f8ab42..652cb0f 100644 --- a/src/main/java/taintedmagic/common/items/tools/ItemThaumicDisassembler.java +++ b/src/main/java/taintedmagic/common/items/tools/ItemThaumicDisassembler.java @@ -52,8 +52,8 @@ public class ItemThaumicDisassembler extends Item { super.addInformation(s, p, l, b); - l.add("\u00A78" + StatCollector.translateToLocal("text.mode") + ": " + getModeName(s)); - l.add("\u00A78" + StatCollector.translateToLocal("text.efficiency") + ": " + (getMode(s) == 3 ? "\u00A7c" : "\u00A7a") + getEfficiency(s)); + l.add("\u00A78" + StatCollector.translateToLocal("text.disassembler.mode") + ": " + getModeName(s)); + l.add("\u00A78" + StatCollector.translateToLocal("text.disassembler.efficiency") + ": " + (getMode(s) == 3 ? "\u00A7c" : "\u00A7a") + getEfficiency(s)); l.add(" "); l.add("\u00A79" + "+20 " + StatCollector.translateToLocal("text.attackdamage")); } @@ -185,7 +185,7 @@ public class ItemThaumicDisassembler extends Item if (s != null && s.getItem() instanceof ItemThaumicDisassembler) { - String str = "\u00A78" + StatCollector.translateToLocal("text.mode") + ": " + getModeName(s) + (getMode(s) == 3 ? "\u00A7c" : "\u00A7a") + " (" + getEfficiency(s) + ")"; + String str = "\u00A78" + StatCollector.translateToLocal("text.disassembler.mode") + ": " + getModeName(s) + (getMode(s) == 3 ? "\u00A7c" : "\u00A7a") + " (" + getEfficiency(s) + ")"; GL11.glPushMatrix(); GL11.glEnable(GL11.GL_BLEND); diff --git a/src/main/java/taintedmagic/common/items/wand/foci/FocusUpgrades.java b/src/main/java/taintedmagic/common/items/wand/foci/FocusUpgrades.java new file mode 100644 index 0000000..affdb08 --- /dev/null +++ b/src/main/java/taintedmagic/common/items/wand/foci/FocusUpgrades.java @@ -0,0 +1,19 @@ +package taintedmagic.common.items.wand.foci; + +import net.minecraft.util.ResourceLocation; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; +import thaumcraft.api.wands.FocusUpgradeType; + +public class FocusUpgrades +{ + public static int ID = Short.MAX_VALUE; + public static FocusUpgradeType sanity = new FocusUpgradeType(ID--, new ResourceLocation("taintedmagic:textures/foci/IconSanity.png"), "focus.upgrade.sanity.name", "focus.upgrade.sanity.text", new AspectList().add(Aspect.MIND, 1).add(Aspect.HEAL, 1)); + public static FocusUpgradeType bloodlust = new FocusUpgradeType(ID--, new ResourceLocation("taintedmagic:textures/misc/IconBloodlust.png"), "focus.upgrade.bloodlust.name", "focus.upgrade.bloodlust.text", new AspectList().add(Aspect.WEAPON, 1).add(Aspect.HEAL, 1)); + public static FocusUpgradeType antibody = new FocusUpgradeType(ID--, new ResourceLocation("taintedmagic:textures/foci/IconAntibody.png"), "focus.upgrade.antibody.name", "focus.upgrade.antibody.text", new AspectList().add(Aspect.TAINT, 1).add(Aspect.HEAL, 1)); + public static FocusUpgradeType corrosive = new FocusUpgradeType(ID--, new ResourceLocation("taintedmagic:textures/foci/IconCorrosive.png"), "focus.upgrade.corrosive.name", "focus.upgrade.corrosive.text", new AspectList().add(Aspect.TAINT, 1).add(Aspect.POISON, 1)); + public static FocusUpgradeType persistent = new FocusUpgradeType(ID--, new ResourceLocation("taintedmagic:textures/foci/IconPersistent.png"), "focus.upgrade.persistent.name", "focus.upgrade.persistent.text", new AspectList().add(Aspect.ARMOR, 1).add(Aspect.MOTION, 1).add(Aspect.ENERGY, 1)); + public static FocusUpgradeType maxima = new FocusUpgradeType(ID--, new ResourceLocation("taintedmagic:textures/foci/IconMaxima.png"), "focus.upgrade.maxima.name", "focus.upgrade.maxima.text", new AspectList().add(Aspect.LIGHT, 4).add(Aspect.AURA, 1).add(Aspect.ENERGY, 4)); + public static FocusUpgradeType glowpet = new FocusUpgradeType(ID--, new ResourceLocation("taintedmagic:textures/foci/IconGlowpet.png"), "focus.upgrade.glowpet.name", "focus.upgrade.glowpet.text", new AspectList().add(Aspect.MOTION, 1).add(Aspect.LIGHT, 4).add(Aspect.ENERGY, 4)); + public static FocusUpgradeType diffusion = new FocusUpgradeType(ID--, new ResourceLocation("taintedmagic:textures/foci/IconDiffusion.png"), "focus.upgrade.diffusion.name", "focus.upgrade.diffusion.text", new AspectList().add(Aspect.DARKNESS, 1).add(Aspect.ELDRITCH, 4).add(Aspect.AURA, 4)); +} diff --git a/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusDarkMatter.java b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusDarkMatter.java new file mode 100644 index 0000000..2d361af --- /dev/null +++ b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusDarkMatter.java @@ -0,0 +1,172 @@ +package taintedmagic.common.items.wand.foci; + +import java.util.Random; + +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.potion.PotionEffect; +import net.minecraft.util.IIcon; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.World; +import taintedmagic.common.TaintedMagic; +import taintedmagic.common.entities.EntityDarkMatter; +import taintedmagic.common.entities.EntityDiffusion; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; +import thaumcraft.api.wands.FocusUpgradeType; +import thaumcraft.api.wands.ItemFocusBasic; +import thaumcraft.common.Thaumcraft; +import thaumcraft.common.config.Config; +import thaumcraft.common.items.wands.ItemWandCasting; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class ItemFocusDarkMatter extends ItemFocusBasic +{ + IIcon depthIcon = null; + + private static final AspectList cost = new AspectList().add(Aspect.ENTROPY, 20).add(Aspect.FIRE, 20); + private static final AspectList costSanity = new AspectList().add(Aspect.ENTROPY, 20).add(Aspect.FIRE, 50).add(Aspect.ORDER, 50); + private static final AspectList costCorrosive = new AspectList().add(Aspect.ENTROPY, 20).add(Aspect.FIRE, 50).add(Aspect.WATER, 20); + + public ItemFocusDarkMatter () + { + this.setCreativeTab(TaintedMagic.tabTaintedMagic); + this.setUnlocalizedName("ItemFocusDarkMatter"); + } + + @SideOnly (Side.CLIENT) + public void registerIcons (IIconRegister ir) + { + this.icon = ir.registerIcon("taintedmagic:ItemFocusDarkMatter"); + this.depthIcon = ir.registerIcon("taintedmagic:ItemFocusDarkMatter_depth"); + } + + public IIcon getFocusDepthLayerIcon (ItemStack s) + { + return this.depthIcon; + } + + public String getSortingHelper (ItemStack s) + { + return "ELDRITCH" + super.getSortingHelper(s); + } + + public int getFocusColor (ItemStack s) + { + return 0x000018; + } + + public AspectList getVisCost (ItemStack s) + { + return isUpgradedWith(s, FocusUpgrades.corrosive) ? costCorrosive : isUpgradedWith(s, FocusUpgrades.sanity) ? costSanity : cost; + } + + public int getActivationCooldown (ItemStack s) + { + return isUpgradedWith(s, FocusUpgrades.diffusion) ? -1 : 1000; + } + + public boolean isVisCostPerTick (ItemStack s) + { + return isUpgradedWith(s, FocusUpgrades.diffusion); + } + + public ItemFocusBasic.WandFocusAnimation getAnimation (ItemStack s) + { + return isUpgradedWith(s, FocusUpgrades.diffusion) ? ItemFocusBasic.WandFocusAnimation.CHARGE : ItemFocusBasic.WandFocusAnimation.WAVE; + } + + public ItemStack onFocusRightClick (ItemStack s, World w, EntityPlayer p, MovingObjectPosition mop) + { + ItemWandCasting wand = (ItemWandCasting) s.getItem(); + + if (isUpgradedWith(wand.getFocusItem(s), FocusUpgrades.diffusion)) + { + p.setItemInUse(s, 2147483647); + } + else + { + if (!w.isRemote) + { + if (wand.consumeAllVis(s, p, getVisCost(s), true, false)) + { + EntityDarkMatter proj = new EntityDarkMatter(w, p, 14F + wand.getFocusPotency(s), isUpgradedWith(wand.getFocusItem(s), FocusUpgrades.corrosive)); + w.spawnEntityInWorld(proj); + if (!isUpgradedWith(wand.getFocusItem(s), FocusUpgrades.sanity)) + { + if (w.rand.nextInt(20) == 0) + { + Thaumcraft.addStickyWarpToPlayer(p, 1); + } + } + } + w.playSoundAtEntity(p, "thaumcraft:egattack", 0.4F, 1.0F + w.rand.nextFloat() * 0.1F); + } + p.swingItem(); + } + return s; + } + + public void onUsingFocusTick (ItemStack s, EntityPlayer p, int i) + { + ItemWandCasting wand = (ItemWandCasting) s.getItem(); + if (!wand.consumeAllVis(s, p, getVisCost(s), false, false)) + { + p.stopUsingItem(); + return; + } + if (!p.worldObj.isRemote && p.ticksExisted % 5 == 0) p.worldObj.playSoundAtEntity(p, "thaumcraft:wind", 0.33F, 5.0F * (float) Math.random()); + + if (!p.worldObj.isRemote && wand.consumeAllVis(s, p, getVisCost(s), true, false)) + { + for (int a = 0; a < 2 + wand.getFocusPotency(s); a++) + { + EntityDiffusion proj = new EntityDiffusion(p.worldObj, p, isUpgradedWith(wand.getFocusItem(s), FocusUpgradeType.enlarge) ? 15.0F : 8.0F, 10F + wand.getFocusPotency(s), isUpgradedWith(wand.getFocusItem(s), FocusUpgrades.corrosive)); + proj.posX += proj.motionX; + proj.posY += proj.motionY; + proj.posZ += proj.motionZ; + p.worldObj.spawnEntityInWorld(proj); + if (!isUpgradedWith(wand.getFocusItem(s), FocusUpgrades.sanity)) + { + if (p.worldObj.rand.nextInt(200) == 0) + { + Thaumcraft.addStickyWarpToPlayer(p, 1); + } + } + } + } + } + + 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, + FocusUpgrades.diffusion, + FocusUpgrades.sanity }; + case 4 : + return new FocusUpgradeType[]{ + FocusUpgradeType.frugal, + FocusUpgradeType.potency }; + case 5 : + return new FocusUpgradeType[]{ + FocusUpgradeType.frugal, + FocusUpgradeType.potency, + FocusUpgrades.corrosive }; + } + return null; + } +} diff --git a/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusEldritch.java b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusEldritch.java deleted file mode 100644 index 9af5403..0000000 --- a/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusEldritch.java +++ /dev/null @@ -1,152 +0,0 @@ -package taintedmagic.common.items.wand.foci; - -import java.util.Random; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.IIcon; -import net.minecraft.util.MathHelper; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; -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.EntityEldritchOrbAttack; -import taintedmagic.common.entities.EntityTaintBubble; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.aspects.AspectList; -import thaumcraft.api.wands.FocusUpgradeType; -import thaumcraft.api.wands.ItemFocusBasic; -import thaumcraft.common.Thaumcraft; -import thaumcraft.common.entities.monster.EntityEldritchGuardian; -import thaumcraft.common.entities.projectile.EntityEldritchOrb; -import thaumcraft.common.entities.projectile.EntityEmber; -import thaumcraft.common.items.wands.ItemWandCasting; -import thaumcraft.common.items.wands.WandManager; -import thaumcraft.common.lib.network.PacketHandler; -import thaumcraft.common.lib.network.misc.PacketMiscEvent; - -public class ItemFocusEldritch extends ItemFocusBasic -{ - public static FocusUpgradeType sanity = new FocusUpgradeType(57, new ResourceLocation("taintedmagic", "textures/foci/IconSanity.png"), "focus.upgrade.sanity.name", "focus.upgrade.sanity.text", new AspectList().add(Aspect.MIND, 1).add(Aspect.HEAL, 1)); - IIcon depthIcon = null; - - private static final AspectList costBase = new AspectList().add(Aspect.ENTROPY, 20).add(Aspect.FIRE, 20); - private static final AspectList costSane = new AspectList().add(Aspect.ENTROPY, 20).add(Aspect.FIRE, 50).add(Aspect.ORDER, 20); - private static final AspectList costCorrosive = new AspectList().add(Aspect.ENTROPY, 50).add(Aspect.FIRE, 20).add(Aspect.WATER, 20); - - long soundDelay = 0L; - - public ItemFocusEldritch () - { - this.setCreativeTab(TaintedMagic.tabTaintedMagic); - this.setUnlocalizedName("ItemFocusEldritch"); - } - - @SideOnly (Side.CLIENT) - public void registerIcons (IIconRegister ir) - { - this.icon = ir.registerIcon("taintedmagic:ItemFocusEldritch"); - this.depthIcon = ir.registerIcon("taintedmagic:ItemFocusEldritch_depth"); - } - - public IIcon getFocusDepthLayerIcon (ItemStack s) - { - return this.depthIcon; - } - - public String getSortingHelper (ItemStack s) - { - return "ELDRITCH" + super.getSortingHelper(s); - } - - public int getFocusColor (ItemStack s) - { - return 0x000018; - } - - public AspectList getVisCost (ItemStack s) - { - return isUpgradedWith(s, ItemFocusTaint.corrosive) ? costCorrosive : isUpgradedWith(s, sanity) ? costSane : costBase; - } - - public int getActivationCooldown (ItemStack s) - { - return 600; - } - - public boolean isVisCostPerTick (ItemStack s) - { - return false; - } - - 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(); - - if (!w.isRemote) - { - int potency = wand.getFocusPotency(s); - if (wand.consumeAllVis(s, p, getVisCost(s), true, false)) - { - EntityEldritchOrbAttack orb = null; - orb = new EntityEldritchOrbAttack(w, p, isUpgradedWith(wand.getFocusItem(s), ItemFocusTaint.corrosive)); - orb.dmg = (10F + potency); - w.spawnEntityInWorld(orb); - if (!isUpgradedWith(wand.getFocusItem(s), sanity)) - { - Random rand = new Random(); - int randomInt = rand.nextInt(10); - if (randomInt == 5) - { - Thaumcraft.addStickyWarpToPlayer(p, 1); - } - } - } - w.playSoundAtEntity(p, "thaumcraft:egattack", 0.4F, 1.0F + w.rand.nextFloat() * 0.1F); - } - p.swingItem(); - return s; - } - - public FocusUpgradeType[] getPossibleUpgradesByRank (ItemStack s, int rank) - { - switch (rank) - { - 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, - ItemFocusTaint.corrosive }; - case 4 : - return new FocusUpgradeType[]{ - FocusUpgradeType.frugal, - FocusUpgradeType.potency }; - case 5 : - return new FocusUpgradeType[]{ - FocusUpgradeType.frugal, - FocusUpgradeType.potency, - this.sanity }; - } - return null; - } -} diff --git a/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusLumos.java b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusLumos.java new file mode 100644 index 0000000..d00d5b3 --- /dev/null +++ b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusLumos.java @@ -0,0 +1,216 @@ +package taintedmagic.common.items.wand.foci; + +import java.util.List; +import java.util.Random; + +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.StatCollector; +import net.minecraft.world.World; +import taintedmagic.common.TaintedMagic; +import taintedmagic.common.blocks.BlockLumos; +import taintedmagic.common.entities.EntityGlowpet; +import taintedmagic.common.registry.BlockRegistry; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; +import thaumcraft.api.wands.FocusUpgradeType; +import thaumcraft.api.wands.ItemFocusBasic; +import thaumcraft.client.fx.ParticleEngine; +import thaumcraft.client.fx.particles.FXSparkle; +import thaumcraft.common.items.wands.ItemWandCasting; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class ItemFocusLumos extends ItemFocusBasic +{ + private static final AspectList cost = new AspectList().add(Aspect.AIR, 500).add(Aspect.FIRE, 500); + private static final AspectList costGlowpet = new AspectList().add(Aspect.ORDER, 500).add(Aspect.AIR, 500).add(Aspect.FIRE, 1000); + private static final AspectList costMaxima = new AspectList().add(Aspect.ORDER, 1000).add(Aspect.FIRE, 1500).add(Aspect.AIR, 500); + + public ItemFocusLumos () + { + this.setCreativeTab(TaintedMagic.tabTaintedMagic); + this.setUnlocalizedName("ItemFocusLumos"); + } + + @SideOnly (Side.CLIENT) + public void registerIcons (IIconRegister ir) + { + this.icon = ir.registerIcon("taintedmagic:ItemFocusLumos"); + } + + public String getSortingHelper (ItemStack s) + { + return "GLOWPET" + super.getSortingHelper(s); + } + + public int getFocusColor (ItemStack s) + { + return 0xFFC27C; + } + + @Override + public void addInformation (ItemStack s, EntityPlayer p, List l, boolean b) + { + super.addInformation(s, p, l, b); + if (this.isUpgradedWith(s, FocusUpgrades.maxima)) + { + l.add(" "); + l.add(EnumChatFormatting.BLUE + "+" + new String(this.isUpgradedWith(s, FocusUpgradeType.enlarge) ? Integer.toString(11 + this.getUpgradeLevel(s, FocusUpgradeType.enlarge)) : "11") + " " + StatCollector.translateToLocal("text.radius")); + } + if (this.isUpgradedWith(s, FocusUpgrades.glowpet)) + { + l.add(" "); + l.add(EnumChatFormatting.BLUE + new String(this.isUpgradedWith(s, FocusUpgradeType.extend) ? Integer.toString(1 + this.getUpgradeLevel(s, FocusUpgradeType.extend)) : "1") + "x " + StatCollector.translateToLocal("text.burnTime")); + } + } + + public AspectList getVisCost (ItemStack s) + { + return isUpgradedWith(s, FocusUpgrades.maxima) ? this.costMaxima : isUpgradedWith(s, FocusUpgrades.glowpet) ? this.costGlowpet : this.cost; + } + + public int getActivationCooldown (ItemStack s) + { + return 1000; + } + + public boolean isVisCostPerTick (ItemStack s) + { + return false; + } + + 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(); + + if (!w.isRemote) + { + if (mop != null && mop.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK && !p.isSneaking()) + { + if (wand.consumeAllVis(s, p, getVisCost(s), true, false)) + { + int x = mop.blockX; + int y = mop.blockY; + int z = mop.blockZ; + + switch (mop.sideHit) + { + case 0 : + y--; + break; + case 1 : + y++; + break; + case 2 : + z--; + break; + case 3 : + z++; + break; + case 4 : + x--; + break; + case 5 : + x++; + } + w.setBlock(x, y, z, BlockRegistry.BlockLumos, 2, 3); + w.playSoundAtEntity(p, "thaumcraft:ice", 0.3F, 1.1F + w.rand.nextFloat() * 0.1F); + for (int a = 0; a < 9; a++) + { + FXSparkle fx = new FXSparkle(w, x + w.rand.nextFloat(), y + w.rand.nextFloat(), z + w.rand.nextFloat(), 1.75F, w.rand.nextInt(5), 3 + w.rand.nextInt(3)); + fx.setGravity(0.1F); + ParticleEngine.instance.addEffect(w, fx); + } + } + } + else + { + if (isUpgradedWith(wand.getFocusItem(s), FocusUpgrades.glowpet)) + { + if (wand.consumeAllVis(s, p, getVisCost(s), true, false)) + { + EntityGlowpet pet = new EntityGlowpet(w, p, wand.getFocusExtend(s) + 1); + w.spawnEntityInWorld(pet); + w.playSoundAtEntity(pet, "taintedmagic:shard", 0.3F, 1.1F + w.rand.nextFloat() * 0.1F); + for (int a = 0; a < 18; a++) + { + FXSparkle fx = new FXSparkle(w, pet.posX + w.rand.nextFloat(), pet.posY + w.rand.nextFloat(), pet.posZ + w.rand.nextFloat(), 1.75F, w.rand.nextInt(5), 3 + w.rand.nextInt(3)); + fx.setGravity(0.1F); + ParticleEngine.instance.addEffect(w, fx); + } + } + } + else if (isUpgradedWith(wand.getFocusItem(s), FocusUpgrades.maxima)) + { + int r = 11 + wand.getFocusEnlarge(s); + if (wand.consumeAllVis(s, p, getVisCost(s), true, false)) + { + for (int xOff = -r; xOff <= r; xOff++) + { + for (int yOff = -r; yOff <= r; yOff++) + { + for (int zOff = -r; zOff <= r; zOff++) + { + int x = (int) (p.posX + xOff); + int y = (int) (p.posY + yOff); + int z = (int) (p.posZ + zOff); + + if (w.isAirBlock(x, y, z) && w.getBlock(x, y, z) != BlockRegistry.BlockLumos && w.getBlockLightValue(x, y, z) < 9) + { + BlockLumos src = (BlockLumos) BlockRegistry.BlockLumos; + src.setGlowDuration(200); + w.setBlock(x, y, z, src, 1, 3); + if (w.rand.nextInt(12) == 0) + { + for (int a = 0; a < 9; a++) + { + FXSparkle fx = new FXSparkle(w, x + w.rand.nextFloat(), y + w.rand.nextFloat(), z + w.rand.nextFloat(), 1.75F, w.rand.nextInt(5), 3 + w.rand.nextInt(3)); + fx.setGravity(0.1F); + ParticleEngine.instance.addEffect(w, fx); + } + } + } + } + } + } + w.playSoundAtEntity(p, "thaumcraft:ice", 0.3F, 1.1F + w.rand.nextFloat() * 0.1F); + } + } + } + } + p.swingItem(); + return s; + } + + public FocusUpgradeType[] getPossibleUpgradesByRank (ItemStack s, int r) + { + switch (r) + { + case 1 : + return new FocusUpgradeType[]{ FocusUpgrades.glowpet, FocusUpgrades.maxima, FocusUpgradeType.frugal }; + case 2 : + return new FocusUpgradeType[]{ FocusUpgradeType.frugal, isUpgradedWith(s, FocusUpgrades.glowpet) ? FocusUpgradeType.extend : isUpgradedWith(s, FocusUpgrades.maxima) ? FocusUpgradeType.enlarge : null }; + case 3 : + return new FocusUpgradeType[]{ FocusUpgradeType.frugal, isUpgradedWith(s, FocusUpgrades.glowpet) ? FocusUpgradeType.extend : isUpgradedWith(s, FocusUpgrades.maxima) ? FocusUpgradeType.enlarge : null }; + case 4 : + return new FocusUpgradeType[]{ FocusUpgradeType.frugal, isUpgradedWith(s, FocusUpgrades.glowpet) ? FocusUpgradeType.extend : isUpgradedWith(s, FocusUpgrades.maxima) ? FocusUpgradeType.enlarge : null }; + case 5 : + return new FocusUpgradeType[]{ FocusUpgradeType.frugal, isUpgradedWith(s, FocusUpgrades.glowpet) ? FocusUpgradeType.extend : isUpgradedWith(s, FocusUpgrades.maxima) ? FocusUpgradeType.enlarge : null }; + } + return null; + } + + public boolean canApplyUpgrade (ItemStack s, EntityPlayer p, FocusUpgradeType t, int rank) + { + return !t.equals(FocusUpgradeType.enlarge) || ((ItemFocusBasic) s.getItem()).isUpgradedWith(s, FocusUpgrades.maxima); + } +} diff --git a/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusMageMace.java b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusMageMace.java index 38a090f..77c3392 100644 --- a/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusMageMace.java +++ b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusMageMace.java @@ -28,10 +28,7 @@ public class ItemFocusMageMace extends ItemFocusBasic public IIcon depthIcon = null; public IIcon ornIcon = null; - public int dmg; - - public static FocusUpgradeType bloodlust = new FocusUpgradeType(58, new ResourceLocation("taintedmagic", "textures/misc/IconBloodlust.png"), "focus.upgrade.bloodlust.name", "focus.upgrade.bloodlust.text", new AspectList().add(Aspect.WEAPON, 1).add(Aspect.HEAL, 1)); - public static final AspectList costBase = new AspectList().add(Aspect.ENTROPY, 50); + public static final AspectList cost = new AspectList().add(Aspect.ENTROPY, 50); public static final AspectList costBloodlust = new AspectList().add(Aspect.ENTROPY, 50).add(Aspect.ORDER, 20).add(Aspect.FIRE, 50); public ItemFocusMageMace () @@ -70,7 +67,7 @@ public class ItemFocusMageMace extends ItemFocusBasic public AspectList getVisCost (ItemStack s) { - return this.isUpgradedWith(s, bloodlust) ? this.costBloodlust : this.costBase; + return this.isUpgradedWith(s, FocusUpgrades.bloodlust) ? this.costBloodlust : this.cost; } public int getActivationCooldown (ItemStack s) @@ -125,13 +122,13 @@ public class ItemFocusMageMace extends ItemFocusBasic return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.potency, - this.bloodlust }; + FocusUpgrades.bloodlust }; } return null; } public boolean canApplyUpgrade (ItemStack s, EntityPlayer p, FocusUpgradeType t, int rank) { - return (!t.equals(this.bloodlust)) || (ThaumcraftApiHelper.isResearchComplete(p.getCommandSenderName(), "BLOODLUSTUPGRADE")); + return (!t.equals(FocusUpgrades.bloodlust)) || (ThaumcraftApiHelper.isResearchComplete(p.getCommandSenderName(), "BLOODLUSTUPGRADE")); } } diff --git a/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusMeteorology.java b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusMeteorology.java index b44f011..22fd30c 100644 --- a/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusMeteorology.java +++ b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusMeteorology.java @@ -8,9 +8,14 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import taintedmagic.common.TaintedMagic; +import taintedmagic.common.helper.TaintedMagicHelper; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.wands.ItemFocusBasic; +import thaumcraft.client.fx.ParticleEngine; +import thaumcraft.client.fx.particles.FXWisp; +import thaumcraft.codechicken.lib.vec.Vector3; +import thaumcraft.common.Thaumcraft; import thaumcraft.common.items.wands.ItemWandCasting; import thaumcraft.common.items.wands.WandManager; import cpw.mods.fml.relauncher.Side; @@ -20,7 +25,7 @@ public class ItemFocusMeteorology extends ItemFocusBasic { IIcon depthIcon = null; - private static final AspectList costBase = new AspectList().add(Aspect.AIR, 1000).add(Aspect.WATER, 1000).add(Aspect.FIRE, 1000).add(Aspect.EARTH, 1000).add(Aspect.ORDER, 1000).add(Aspect.ENTROPY, 1000); + private static final AspectList cost = new AspectList().add(Aspect.AIR, 1000).add(Aspect.WATER, 1000).add(Aspect.FIRE, 1000).add(Aspect.EARTH, 1000).add(Aspect.ORDER, 1000).add(Aspect.ENTROPY, 1000); public ItemFocusMeteorology () { @@ -57,7 +62,7 @@ public class ItemFocusMeteorology extends ItemFocusBasic public int getActivationCooldown (ItemStack s) { - return 1; + return 30000; } public boolean isVisCostPerTick (ItemStack s) @@ -72,14 +77,38 @@ public class ItemFocusMeteorology extends ItemFocusBasic public ItemStack onFocusRightClick (ItemStack s, World w, EntityPlayer p, MovingObjectPosition mop) { - WandManager.setCooldown(p, 30000); ItemWandCasting wand = (ItemWandCasting) s.getItem(); - wand.consumeAllVis(s, p, getVisCost(s), true, false); - w.getWorldInfo().setRainTime(w.isRaining() ? 24000 : 0); - w.getWorldInfo().setRaining(!w.isRaining()); + if (wand.consumeAllVis(s, p, getVisCost(s), true, false)) + { + w.getWorldInfo().setRainTime(w.isRaining() ? 24000 : 0); + w.getWorldInfo().setRaining(!w.isRaining()); + p.playSound("thaumcraft:wand", 0.5F, 1.0F); - p.playSound("thaumcraft:wand", 0.5F, 1.0F); + if (w.isRemote) + { + 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 green = p.worldObj.rand.nextFloat(); + float blue = p.worldObj.rand.nextFloat(); + + FXWisp ef = new FXWisp(w, p.posX + xp + off, p.posY + 10 + yp + off, p.posZ + zp + off, 0.5F + ((float) Math.random() * 0.25F), 0.25F, green, blue); + ef.setGravity(0.75F); + ef.shrink = true; + ef.noClip = true; + + 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); + } + } + } return s; } diff --git a/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusTaint.java b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusTaint.java index f1e94ad..6dde5ef 100644 --- a/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusTaint.java +++ b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusTaint.java @@ -27,12 +27,10 @@ import thaumcraft.common.items.wands.WandManager; public class ItemFocusTaint extends ItemFocusBasic { - public static FocusUpgradeType tainturgy = new FocusUpgradeType(55, new ResourceLocation("taintedmagic", "textures/foci/IconTainturgy.png"), "focus.upgrade.tainturgy.name", "focus.upgrade.tainturgy.text", new AspectList().add(Aspect.TAINT, 1).add(Aspect.HEAL, 1)); - public static FocusUpgradeType corrosive = new FocusUpgradeType(56, new ResourceLocation("taintedmagic", "textures/foci/IconCorrosive.png"), "focus.upgrade.corrosive.name", "focus.upgrade.corrosive.text", new AspectList().add(Aspect.TAINT, 1).add(Aspect.POISON, 1)); IIcon depthIcon = null; - private static final AspectList costBase = new AspectList().add(Aspect.EARTH, 10).add(Aspect.WATER, 10); - private static final AspectList costTainturgist = new AspectList().add(Aspect.EARTH, 10).add(Aspect.WATER, 10).add(Aspect.ORDER, 10); + private static final AspectList cost = new AspectList().add(Aspect.EARTH, 10).add(Aspect.WATER, 10); + private static final AspectList costAntibody = new AspectList().add(Aspect.EARTH, 10).add(Aspect.WATER, 10).add(Aspect.ORDER, 10); public ItemFocusTaint () { @@ -64,7 +62,7 @@ public class ItemFocusTaint extends ItemFocusBasic public AspectList getVisCost (ItemStack s) { - return isUpgradedWith(s, tainturgy) ? costTainturgist : costBase; + return isUpgradedWith(s, FocusUpgrades.antibody) ? costAntibody : cost; } public int getActivationCooldown (ItemStack s) @@ -86,7 +84,6 @@ public class ItemFocusTaint extends ItemFocusBasic { ItemWandCasting wand = (ItemWandCasting) s.getItem(); p.setItemInUse(s, 2147483647); - WandManager.setCooldown(p, -1); return s; } @@ -98,27 +95,20 @@ public class ItemFocusTaint extends ItemFocusBasic p.stopUsingItem(); return; } - int range = 8; - Vec3 vec3d = p.getLook(range); 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))) + if (!p.worldObj.isRemote && wand.consumeAllVis(s, p, getVisCost(s), true, false)) { - float scatter = isUpgradedWith(wand.getFocusItem(s), FocusUpgradeType.enlarge) ? 15.0F : 8.0F; for (int a = 0; a < 2 + wand.getFocusPotency(s); a++) { - EntityTaintBubble orb = new EntityTaintBubble(p.worldObj, p, scatter, isUpgradedWith(wand.getFocusItem(s), this.corrosive)); - orb.posX += orb.motionX; - orb.posY += orb.motionY; - orb.posZ += orb.motionZ; - orb.damage = 5F + potency; - p.worldObj.spawnEntityInWorld(orb); - if (!isUpgradedWith(wand.getFocusItem(s), tainturgy)) + EntityTaintBubble proj = new EntityTaintBubble(p.worldObj, p, isUpgradedWith(wand.getFocusItem(s), FocusUpgradeType.enlarge) ? 15.0F : 8.0F, 4F + wand.getFocusPotency(s), isUpgradedWith(wand.getFocusItem(s), FocusUpgrades.corrosive)); + proj.posX += proj.motionX; + proj.posY += proj.motionY; + proj.posZ += proj.motionZ; + p.worldObj.spawnEntityInWorld(proj); + if (!isUpgradedWith(wand.getFocusItem(s), FocusUpgrades.antibody)) { - Random rand = new Random(); - int randomInt = rand.nextInt(150); - if (randomInt == 9) + if (p.worldObj.rand.nextInt(150) == 0) { try { @@ -150,7 +140,7 @@ public class ItemFocusTaint extends ItemFocusBasic return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.potency, - tainturgy }; + FocusUpgrades.antibody }; case 4 : return new FocusUpgradeType[]{ FocusUpgradeType.frugal, @@ -160,7 +150,7 @@ public class ItemFocusTaint extends ItemFocusBasic return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.potency, - corrosive }; + FocusUpgrades.corrosive }; } return null; } diff --git a/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusTaintedBlast.java b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusTaintedShockwave.java similarity index 80% rename from src/main/java/taintedmagic/common/items/wand/foci/ItemFocusTaintedBlast.java rename to src/main/java/taintedmagic/common/items/wand/foci/ItemFocusTaintedShockwave.java index 63fb5fb..786d787 100644 --- a/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusTaintedBlast.java +++ b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusTaintedShockwave.java @@ -24,25 +24,25 @@ import thaumcraft.common.items.wands.ItemWandCasting; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class ItemFocusTaintedBlast extends ItemFocusBasic +public class ItemFocusTaintedShockwave extends ItemFocusBasic { - private static final AspectList costBase = new AspectList().add(Aspect.ENTROPY, 500).add(Aspect.EARTH, 500).add(Aspect.WATER, 500); + private static final AspectList cost = new AspectList().add(Aspect.ENTROPY, 1000).add(Aspect.EARTH, 1000).add(Aspect.WATER, 1000).add(Aspect.ORDER, 500); public static IIcon depthIcon; public static IIcon ornIcon; - public ItemFocusTaintedBlast () + public ItemFocusTaintedShockwave () { this.setCreativeTab(TaintedMagic.tabTaintedMagic); - this.setUnlocalizedName("ItemFocusTaintedBlast"); + this.setUnlocalizedName("ItemFocusTaintedShockwave"); } @SideOnly (Side.CLIENT) public void registerIcons (IIconRegister ir) { - this.icon = ir.registerIcon("taintedmagic:ItemFocusTaintedBlast"); + this.icon = ir.registerIcon("taintedmagic:ItemFocusTaintedShockwave"); this.depthIcon = ir.registerIcon("taintedmagic:ItemFocusTaint_depth"); - this.ornIcon = ir.registerIcon("taintedmagic:ItemFocusTaintedBlast_orn"); + this.ornIcon = ir.registerIcon("taintedmagic:ItemFocusTaintedShockwave_orn"); } public IIcon getFocusDepthLayerIcon (ItemStack s) @@ -67,7 +67,7 @@ public class ItemFocusTaintedBlast extends ItemFocusBasic public AspectList getVisCost (ItemStack s) { - return costBase; + return cost; } public int getActivationCooldown (ItemStack s) @@ -128,25 +128,15 @@ public class ItemFocusTaintedBlast extends ItemFocusBasic switch (rank) { case 1 : - return new FocusUpgradeType[]{ - FocusUpgradeType.frugal, - FocusUpgradeType.enlarge }; + return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.enlarge }; case 2 : - return new FocusUpgradeType[]{ - FocusUpgradeType.frugal, - FocusUpgradeType.enlarge }; + return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.enlarge }; case 3 : - return new FocusUpgradeType[]{ - FocusUpgradeType.frugal, - FocusUpgradeType.enlarge }; + return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.enlarge }; case 4 : - return new FocusUpgradeType[]{ - FocusUpgradeType.frugal, - FocusUpgradeType.enlarge }; + return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.enlarge }; case 5 : - return new FocusUpgradeType[]{ - FocusUpgradeType.frugal, - FocusUpgradeType.enlarge }; + return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.enlarge }; } return null; } diff --git a/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusTime.java b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusTime.java index 5cb8580..52673a5 100644 --- a/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusTime.java +++ b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusTime.java @@ -2,6 +2,7 @@ package taintedmagic.common.items.wand.foci; import java.awt.Color; +import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; @@ -10,11 +11,15 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import taintedmagic.common.TaintedMagic; +import taintedmagic.common.helper.TaintedMagicHelper; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.wands.ItemFocusBasic; +import thaumcraft.client.fx.ParticleEngine; +import thaumcraft.client.fx.particles.FXWisp; +import thaumcraft.codechicken.lib.vec.Vector3; import thaumcraft.common.items.wands.ItemWandCasting; -import thaumcraft.common.items.wands.WandManager; +import cpw.mods.fml.relauncher.ReflectionHelper; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -22,7 +27,7 @@ public class ItemFocusTime extends ItemFocusBasic { IIcon depthIcon = null; - private static final AspectList costBase = new AspectList().add(Aspect.AIR, 1000).add(Aspect.WATER, 1000).add(Aspect.FIRE, 1000).add(Aspect.EARTH, 1000).add(Aspect.ORDER, 1000).add(Aspect.ENTROPY, 1000); + private static final AspectList cost = new AspectList().add(Aspect.AIR, 1000).add(Aspect.WATER, 1000).add(Aspect.FIRE, 1000).add(Aspect.EARTH, 1000).add(Aspect.ORDER, 1000).add(Aspect.ENTROPY, 1000); public ItemFocusTime () { @@ -60,7 +65,7 @@ public class ItemFocusTime extends ItemFocusBasic public int getActivationCooldown (ItemStack s) { - return 1; + return 30000; } public boolean isVisCostPerTick (ItemStack s) @@ -75,13 +80,38 @@ public class ItemFocusTime extends ItemFocusBasic public ItemStack onFocusRightClick (ItemStack s, World w, EntityPlayer p, MovingObjectPosition mop) { - WandManager.setCooldown(p, 30000); ItemWandCasting wand = (ItemWandCasting) s.getItem(); if (wand.consumeAllVis(s, p, getVisCost(s), true, false)) { - w.setWorldTime(w.isDaytime() ? 14000 : 0); + w.setWorldTime(w.isDaytime() ? 14000 : 24000); p.playSound("thaumcraft:wand", 0.5F, 1.0F); + + if (w.isRemote) + { + 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 = p.worldObj.rand.nextFloat(); + float green = p.worldObj.rand.nextFloat(); + float blue = p.worldObj.rand.nextFloat(); + + FXWisp ef = new FXWisp(w, p.posX + xp + off, p.posY + 10 + yp + off, p.posZ + zp + off, 0.5F + ((float) Math.random() * 0.25F), red, green, blue); + ef.setGravity(0.75F); + ef.shrink = true; + ef.noClip = true; + + 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); + } + + } } return s; } diff --git a/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusVisShard.java b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusVisShard.java index a1bc878..edc4da0 100644 --- a/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusVisShard.java +++ b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusVisShard.java @@ -25,10 +25,8 @@ import thaumcraft.common.lib.utils.EntityUtils; */ 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)); + private static final AspectList cost = new AspectList().add(Aspect.FIRE, 100).add(Aspect.ENTROPY, 100).add(Aspect.AIR, 100); + private static final AspectList costPersistent = new AspectList().add(Aspect.FIRE, 100).add(Aspect.ENTROPY, 100).add(Aspect.WATER, 100).add(Aspect.AIR, 100); public ItemFocusVisShard () { @@ -71,9 +69,12 @@ public class ItemFocusVisShard extends ItemFocusBasic { 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); + if (wand.consumeAllVis(s, p, getVisCost(s), true, false)) + { + EntityHomingShard blast = new EntityHomingShard(w, p, (EntityLivingBase) look, wand.getFocusPotency(s), isUpgradedWith(wand.getFocusItem(s), FocusUpgrades.persistent)); + w.spawnEntityInWorld(blast); + w.playSoundAtEntity(blast, "taintedmagic:shard", 0.3F, 1.1F + w.rand.nextFloat() * 0.1F); + } } p.swingItem(); } @@ -82,7 +83,7 @@ public class ItemFocusVisShard extends ItemFocusBasic public AspectList getVisCost (ItemStack s) { - return isUpgradedWith(s, persistant) ? costPersistant : cost; + return isUpgradedWith(s, FocusUpgrades.persistent) ? costPersistent : cost; } public FocusUpgradeType[] getPossibleUpgradesByRank (ItemStack s, int r) @@ -109,7 +110,7 @@ public class ItemFocusVisShard extends ItemFocusBasic return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.potency, - persistant }; + FocusUpgrades.persistent }; } return null; } diff --git a/src/main/java/taintedmagic/common/lib/LibStrings.java b/src/main/java/taintedmagic/common/lib/LibInfo.java similarity index 93% rename from src/main/java/taintedmagic/common/lib/LibStrings.java rename to src/main/java/taintedmagic/common/lib/LibInfo.java index 0793cb2..4f7a9e4 100644 --- a/src/main/java/taintedmagic/common/lib/LibStrings.java +++ b/src/main/java/taintedmagic/common/lib/LibInfo.java @@ -1,6 +1,6 @@ package taintedmagic.common.lib; -public class LibStrings +public class LibInfo { public static final String MODID = "TaintedMagic"; public static final String NAME = "Tainted Magic"; diff --git a/src/main/java/taintedmagic/common/lib/LibToolMaterials.java b/src/main/java/taintedmagic/common/lib/LibToolMaterials.java index 6850aac..2e03b53 100644 --- a/src/main/java/taintedmagic/common/lib/LibToolMaterials.java +++ b/src/main/java/taintedmagic/common/lib/LibToolMaterials.java @@ -10,25 +10,8 @@ public class LibToolMaterials public static ToolMaterial toolMatShadow = EnumHelper.addToolMaterial("SHADOW", 3, 2200, 17.0F, 6.0F, 30); public static ToolMaterial toolMatPrimal = EnumHelper.addToolMaterial("PRIMAL", 3, 512, 16.0F, 14.5F, 28); - public static ArmorMaterial armorMatShadow = EnumHelper.addArmorMaterial("SHADOW", 800, new int[]{ - 4, - 8, - 6, - 2 }, 25); - public static ArmorMaterial armorMatSpecial = EnumHelper.addArmorMaterial("SPECIAL", 500, new int[]{ - 4, - 6, - 6, - 4 }, 25); - public static ArmorMaterial armorMatVoidFortress = EnumHelper.addArmorMaterial("VOIDFORTRESS", 300, new int[]{ - 4, - 8, - 6, - 0 }, 20); - - public static ArmorMaterial armorMatShadowFortress = EnumHelper.addArmorMaterial("SHADOWFORTRESS", 2500, new int[]{ - 4, - 10, - 6, - 0 }, 30); + public static ArmorMaterial armorMatShadow = EnumHelper.addArmorMaterial("SHADOW", 800, new int[]{ 4, 8, 6, 2 }, 25); + public static ArmorMaterial armorMatSpecial = EnumHelper.addArmorMaterial("SPECIAL", 500, new int[]{ 4, 6, 6, 4 }, 25); + public static ArmorMaterial armorMatVoidFortress = EnumHelper.addArmorMaterial("VOIDFORTRESS", 300, new int[]{ 4, 8, 6, 0 }, 20); + public static ArmorMaterial armorMatShadowFortress = EnumHelper.addArmorMaterial("SHADOWFORTRESS", 2500, new int[]{ 4, 10, 6, 0 }, 30); } diff --git a/src/main/java/taintedmagic/common/network/PacketHandler.java b/src/main/java/taintedmagic/common/network/PacketHandler.java index d55bce3..8b17095 100644 --- a/src/main/java/taintedmagic/common/network/PacketHandler.java +++ b/src/main/java/taintedmagic/common/network/PacketHandler.java @@ -1,13 +1,13 @@ package taintedmagic.common.network; -import taintedmagic.common.lib.LibStrings; +import taintedmagic.common.lib.LibInfo; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; import cpw.mods.fml.relauncher.Side; public class PacketHandler { - public static final SimpleNetworkWrapper INSTANCE = NetworkRegistry.INSTANCE.newSimpleChannel(LibStrings.MODID.toLowerCase()); + public static final SimpleNetworkWrapper INSTANCE = NetworkRegistry.INSTANCE.newSimpleChannel(LibInfo.MODID.toLowerCase()); public static void init () { diff --git a/src/main/java/taintedmagic/common/network/PacketKatanaAttack.java b/src/main/java/taintedmagic/common/network/PacketKatanaAttack.java index 41a2ebf..1e55c7f 100644 --- a/src/main/java/taintedmagic/common/network/PacketKatanaAttack.java +++ b/src/main/java/taintedmagic/common/network/PacketKatanaAttack.java @@ -7,6 +7,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.DamageSource; import net.minecraft.world.World; import net.minecraftforge.common.DimensionManager; +import thaumcraft.common.Thaumcraft; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; @@ -46,7 +47,7 @@ public class PacketKatanaAttack implements IMessage, IMessageHandlerThe darkness intrigues you, even though it ensues a dangerous path. But what have you got to lose? The thought of an adventure into the unknown excites you!
The page is still rendered unclear, you could only make out bits and pieces... But one day, you will decipher this page and have a newfound mastery...one day! tm.text.TAINTEDMAGIC.2=taintedmagic:textures/misc/PageTAINTEDMAGIC.png:0:255:255:255:.5

Who wrote this? #SHADOWMETAL tm.name.SHADOWMETAL=Shadowmetal -tm.tag.SHADOWMETAL=I have seen the truth -tm.text.SHADOWMETAL.1=Once upon a time you were doing some crucible work. You accidentally dropped a block of stone into a bubbling mess and the result was Shadowmetal Ore.
This metal seems promising, all it takes is a mundane furnace to smelt it, resulting in a Shadowmetal Ingot. It is extremely hard and has a very high durability. You think you will need to research some more before it is usable, maybe the whispers can give you more information... but who knows. +tm.tag.SHADOWMETAL=When a door closes a window opens +tm.text.SHADOWMETAL.1=Once upon a time you were transmuting §osomething§r in your crucible. After screwing up a recipe, in panic, you accidentally dropped a block of stone into the bubbling mess. The result was Shadowmetal Ore.
All it takes is a mundane furnace to smelt it, resulting in a Shadowmetal Ingot. It is extremely heavy and very durable. You think you will need to research some more before it is usable.
§oYou listen closely and hear a dull, incomprehensible whisper coming from within this strange substance. Are you crazy? Who knows. #CAP_shadowmetal tm.name.CAP_shadowmetal=Shadowmetal Wand Caps -tm.tag.CAP_shadowmetal=What a drag -tm.text.CAP_shadowmetal.1=With the discovery of Void Metal Wand Caps you wondered if you could improve their performance even further. You tested this theory by infusing the caps with some Shadowmetal, as well as the primal aspects of a primordial pearl. It proved very successful.
The Shadowmetal Caps seem to be extremely efficient at channeling vis, and will grant a heavy discount of 30% for all primal aspects.
The Primordial Pearl is not consumed during the crafting process. +tm.tag.CAP_shadowmetal=Moonlight without dark +tm.text.CAP_shadowmetal.1=With the discovery of Void Metal Wand Caps you wondered if you could improve their performance even further. You tested this theory by infusing the caps with some Shadowmetal, as well as the primal aspects of a primordial pearl. It proved very successful.
The Shadowmetal Caps seem to be extremely efficient at channeling vis, and will grant a heavy discount of 30% for all primal aspects. #ROD_warpwood tm.name.ROD_warpwood=Warpwood Wand Rod tm.tag.ROD_warpwood=The wand chooses the wizard... -tm.text.ROD_warpwood.1=Ever since you discovered Warpwood, you have wondered if it would be possible to forge this wood into a wand. The Primordial Pearl has given you the answer to the question.
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.1=Ever since you discovered Warpwood, you have wondered if it would be possible to forge this wood into a wand. The Primordial Pearl has given you the answer to this question.
Since this is Warpwood we're speaking of, you think it's only logical to use a Zombie Brain as a conduit for the corrupt energies. Using the power of the Primordial Pearl as the core of this rod, the power is incomparable.
The wood is perfect for wandcraft. Warpwood has a high density meaning it's capable of storing 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 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... +tm.text.ROD_warpwood.2=It would also seem that the user's warped energy has a sort of... reaction with the organic warp levels from within the rod. It would seem that as this reaction between the two energies happens, vis is created as a byproduct and is stored within your wand. The more warp you amass, the greater the reactivity.
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. My wand grows stronger...stronger as if it were an extension of myself. #ROD_warpwood_staff tm.name.ROD_warpwood_staff=Warpwood Staff Core tm.tag.ROD_warpwood_staff=It's not quite clear why... -tm.text.ROD_warpwood_staff.1=After having seen the power of the Warpwood wand core, you wondered what would happen if you were to make a staff.
Unlike most staves, simply adding a primal charm was not enough to bind them into a staff core. It took the use of the Primordial Pearl.
The same auto recharging abilities seem to apply as well, and on top of all of that this staff core offers a huge amount of storage - 500 primal vis. +tm.text.ROD_warpwood_staff.1=After having become quite familiar with your Warpwood Wand, you pondered how you could fortify the wand as a staff.
Unlike most staves, simply adding a primal charm was not enough. The answer lied once more...with the Primordial Pearl.
The same vis-generating traits seem to apply as well, and on top everything, this staff core offers enough space to store 500 primal vis. #EVILSHARDS tm.name.EVILSHARDS=Unbalanced Shards -tm.tag.EVILSHARDS=You can bring... equilibrium? -tm.text.EVILSHARDS.1=Applying certain aspects to a Balanced Shard proved to have some rather interesting effects. You decided to call this process "unbalancing".
So far, you have discovered Fluxed Shards, and Warped Shards. You're sure they will both prove very useful in your studies. +tm.tag.EVILSHARDS=A heartbeat without harmony +tm.text.EVILSHARDS.1=Applying certain aspects to a Balanced Shard proved to have some rather interesting effects. You decided to call this process "unbalancing".
So far, you have discovered Fluxed Shards, and Warped Shards. #CRIMSONROBES tm.name.CRIMSONROBES=Crimson Seamstry -tm.tag.CRIMSONROBES=This will not wash out -tm.text.CRIMSONROBES.1=After studying Crystal Blood for quite some time, you realized that the Crimson Cult's Robes posses very similar properties.
By staining Enchanted Fabric with Crystal Blood, you were able to perfectly replicate the material that the Crimson Cult uses for their attire.
Using Crimson-stained Cloth (see right) you were able to make all of the robe pieces. Their recipes are inscribed on the following pages. +tm.tag.CRIMSONROBES=The warm of her silken dress... +tm.text.CRIMSONROBES.1=By comparing Crystal Blood and various cultist artifacts, you noticed similarities. It would seem that the cult stains nearly everything with a substance very similar to Crystal Blood.
By staining Enchanted Fabric with Crystal Blood, you were able to perfectly replicate the imperative material used by the Crimson Cult to produce their attire.
Using Crimson-stained Cloth (see right) you were able to replicate all of the various robe pieces. Their recipes are inscribed on the following pages. #VOIDFORTRESS @@ -192,55 +198,53 @@ tm.text.VOIDFORTRESS.1=This is a simple improvement on the concepts laid down by tm.name.WARPEDGOGGLES=Warped Goggles Of Revealing tm.tag.WARPEDGOGGLES=The telltale heart -tm.text.WARPEDGOGGLES.1=By infusing your Goggles of Revealing with Shadowmetal you have solved an everlasting problem.
A thaumaturge like yourself must choose between function and protection. By using Shadowmetal to strengthen your goggles, you have gained a few extra armor points - but at a cost.
It seems that one of the lenses became clouded with warp - causing you to have strange visions at times. But no problem, it could be worse, right? +tm.text.WARPEDGOGGLES.1=By infusing your Goggles of Revealing with Shadowmetal and a bit of Ethereal Essence you have solved an everlasting problem.
A thaumaturge like yourself must choose between function and protection. By using Shadowmetal to strengthen your goggles, they now offer better protection.
§oIt seems that one of the lenses became clouded with warp - causing you to have strange visions at times. But no problem, it could be worse, right? #TAINTFOCUS tm.name.TAINTFOCUS=Wand Focus: Tainted Storm -tm.tag.TAINTFOCUS=Sickness must be purged! -tm.text.TAINTFOCUS.1=After having seen the destructive power of flux you thought it would be interesting to make a wand focus that harnesses this power. The result is the Tainted Storm focus.
This focus will blast an AoE attack of Tainted Bubbles within a range of 10 metres, inflicting a poison effect on contact, and causing a fair amount of damage.
Take caution when using this focus, for there is a chance you will get infected with the Flux Flu while using it. But, thats only the consequence of handling such a large amount of flux. +tm.tag.TAINTFOCUS=Sickness must be purged +tm.text.TAINTFOCUS.1=After having noticed the destructive properties of flux, you thought it would be interesting to create a wand focus using flux offensively. The result is the Tainted Storm focus.
This focus will conjure an AoE storm of harmful Taint Bubbles that poison and damage anything they hit.
Take necessary precautions when using this focus, for it isn't uncommon to be infected with the Flux Flu while using it. #ELDRITCHFOCUS tm.name.ELDRITCHFOCUS=Wand Focus: Dark Matter -tm.tag.ELDRITCHFOCUS=And in the darkness bind them -tm.text.ELDRITCHFOCUS.1=After having payed a visit to the voidscape known as the Outerlands, the race known as the Eldritch have sparked your interest. You are very intrigued by the Eldritch Guardians, and especially the orbs of dark matter that they tend to hurl at you.
After having made contact with this dark matter, you have thought it might be worth it to take a shot at the Eldritch's magic.
By utilizing the powers of creation, you have managed to create a focus that summons these orbs of dark matter upon command.
(Continued) -tm.text.ELDRITCHFOCUS.2=Because this focus is infused with the awakened power of The Shard of Creation, the orbs have turned out to be even stronger than the ones the guardians fire at you. They deal 5 hearts of damage, and inflict a weakness potion upon contact.
However, you must take caution when using this focus. Every time you cast the focus, and summon an orb, there is a chance the orb will cause you to gain a small amount of sticky warp... But a little warp never hurt anyone right? +tm.tag.ELDRITCHFOCUS=Avada kedavra +tm.text.ELDRITCHFOCUS.1=With the ever complex primordial pearl and your pre-existing knowledge of wand foci, you have finally designed the perfect wand focus.
Using the pearl as a powerful catalyst, you have constructed a crystal of raw power. Using the very fabric of magic, you created the perfect weapon to wield dark matter as the eldritch once did.
§oI stare into the glossy surface of the focus and wonder - what has become of myself? Nothing can stop me... §r§lNOTHING! #KNIGHTROBES tm.name.KNIGHTROBES=Crimson Forgery -tm.tag.KNIGHTROBES=Dance to the song of ringing steel -tm.text.KNIGHTROBES.1=With a will, there is a way...
It seems that it wasn't quite as easy to create the Crimson Knight armor as it was to create the Robes. But, you have found an answer.
Crimson Plating was just the substance you needed. This strong, bloodstained metal is identical to that of Crimson Knight armor.
The recipes for the plating, and the armor are transcribed on the following pages. +tm.tag.KNIGHTROBES=The song of ringing steel +tm.text.KNIGHTROBES.1=With a will, there is a way...
It seems that it wasn't quite as easy to replicate the Crimson Knight armor as it was to replicate the Robes. But, as usual, you found a solution.
Crimson Plating was just the material you needed. This strong, bloodstained metal is identical to the plating used by the cult.
The recipes for the plating and the armor are transcribed on the following pages. #PRAETORARMOR tm.name.PRAETORARMOR=Advanced Crimson Forgery -tm.tag.PRAETORARMOR=And now, the final curtain! -tm.text.PRAETORARMOR.1=Strange whispers have been talking to you more than usual. They spoke of the Crimson Cult's leader - and you hope to be the one to defeat them. You have been having visions, and you thought that with the discoveries of Crimson-stained Cloth, and Crimson Plating, it won't be hard to replicate the praetor's suit of armor.
But, you were wrong. You thought it would be easy enough, but apparently it is not. You had to use quite a bit more plating and cloth than expected, but you have managed to construct the armor. Their recipes are written on the following pages. - +tm.tag.PRAETORARMOR=And now, the final curtain +tm.text.PRAETORARMOR.1=After slaying a group of Crimson Cultists, you rummaged through one of their robes and found a very peculiar book. It spoke of the Crimson Cult's leader.
You've been having visions, and dreams about the Crimson Praetor ever since you opened that book...you're certain it was cursed. But, with the information from these visions, you designed a way to replicate the Crimson Praetor's armor.
Recipes are transcribed on the following pages. #WARPTREE tm.name.WARPTREE=Warpwood Tree tm.tag.WARPTREE=It hits back -tm.text.WARPTREE.1=Whilst studying the magical trees in the Tainted Lands, you have noticed just how rich with magic they are. Although they are too unstable and messy for your uses, you think it would be worthwhile to create a tree that is infused with warp.
The Warpwood Tree is just that, a tree imbued the fundamental aspects of warp. You don't know what you will ever use this tree for, but maybe one day it will be just what you need. +tm.text.WARPTREE.1=Whilst studying magical trees in the Tainted Lands, you have noticed high levels of magical energies. Although tainted trees are far too unstable and messy for your needs, you think it would be a worthwhile experiment to breed a tree that is infused with warp.
The Warpwood Tree is just that, an organic structure that thrives on corrupt energies. You don't know what you will ever use this wood for, but maybe one day it will be just what you need. #SHADOWCLOTH tm.name.SHADOWCLOTH=Shadow-Imbued Cloth -tm.tag.SHADOWCLOTH=I wear black 'cause I'm emo -tm.text.SHADOWCLOTH.1=When you discovered Shadowmetal, you ran a few experiments using it. Shadow-Imbued Cloth was one of many results.
Shadow-Imbued Cloth has similar properties to Enchanted Fabric though it is quite dark in colour, and has some interesting magical properties... It is soft, thin, light, and incredibly strong. You are certain that it will be of many uses. +tm.tag.SHADOWCLOTH=The black veil +tm.text.SHADOWCLOTH.1=When you first discovered Shadowmetal, you experimented to see how it would react with different magical materials. Shadow-Imbued Cloth was one of many results.
Shadow-Imbued Cloth has similar properties to Enchanted Fabric though it is quite dark in colour, and has some interesting magical properties... It is soft, thin, light, and incredibly strong. You are certain that it will be of many uses. #VOIDWALKERBOOTS tm.name.VOIDWALKERBOOTS=Boots of the Voidwalker -tm.tag.VOIDWALKERBOOTS=Otherworldly footwear -tm.text.VOIDWALKERBOOTS.1=You have been searching, searching very hard for a set of boots to complete your Void Thaumaturge attire. After a long night of researching, you finally devised the perfect pair of boots to complete the set.
The Boots of the Voidwalker offer outstanding protection, as well as an enormous speed boost while walking or flying. You will also be immune to fall damage while wearing the boots. +tm.tag.VOIDWALKERBOOTS=Her mother sits eyes downcast +tm.text.VOIDWALKERBOOTS.1=You have been searching, searching very hard for a set of boots to complete your Void Thaumaturge attire. After a long, rainy night of research, you finally designed the perfect pair of boots to complete the set.
The Boots of the Voidwalker offer outstanding protection, as well as an incomparable speed boost while walking or flying. You will also be immune to fall damage while wearing the boots. #CREATIONSHARD tm.name.CREATIONSHARD=Shard of Creation -tm.tag.CREATIONSHARD=I am not a madman +tm.tag.CREATIONSHARD=I have seen the truth tm.text.CREATIONSHARD.1=You have finally found it... Something to challenge the Eldritch.
The Shard of Creation. This shard of condensed power is the ultimate fuel source for your magic. A fragment containing the power to create.
This shard might be the key to the discovering how it all came to be, this is what you have always been looking for.
§oThis shard - as soon as the infusion was complete, a sensation of pure clarity filled your twisted mind, you had a revelation, it is all clear to you now. You are not a madman, you will show them. You will show them all! #CREATION @@ -260,101 +264,97 @@ tm.text.CREATION.5=To protect the Pearls, they created the guardians, this ensur #THAUMICDISASSEMBLER tm.name.THAUMICDISASSEMBLER=Thaumic Disassembler -tm.tag.THAUMICDISASSEMBLER=Wait a minute... -tm.text.THAUMICDISASSEMBLER.1=It was rumored that in the world of modern technology, a tool existed that goes by the name "The Atomic Disassembler".
This tool is said to be perfect - you can break any block at your desired speed. All it cost was a little bit of energy.
You became jealous hearing about these technological advancements and honestly, you want these tech-tools.
But, you are a Thaumaturge. You will NOT dabble in technology. You must create a tool that is an equal to the Atomic Disassembler using the power of Thaumaturgy. -tm.text.THAUMICDISASSEMBLER.2=The Thaumic Disassembler is just that, you can break any block, anytime, at any speed you want. Just Shift+Right-click to change the speed. Though, when it came time to find a way to power this tool, you were stumped for quite some time. Due to the Thaumium in the matrix, the repairing proprieties of Void Metal did not apply.
Finally, it dawned upon you. All it took was a small amount of Perditio Vis to keep this tool charged.
You do not need technology, for you are a Thaumaturge! +tm.tag.THAUMICDISASSEMBLER=Innovation +tm.text.THAUMICDISASSEMBLER.1=It was rumored that in the world of modern technology, a tool exists called the Atomic Disassembler.
This tool is said to be perfect - you can break any block with impeccable precision. All it costs is a little bit of energy.
You became jealous hearing about these technological advancements and honestly, you considered delving into the world of technology.
But, you are a Thaumaturge. You will NOT dabble in technology. You must create a tool that is an equal to the Atomic Disassembler using the power of Thaumaturgy. (continued) +tm.text.THAUMICDISASSEMBLER.2=The Thaumic Disassembler is just that, you can break any block with precision and speed.
Shift+Right-click to change how fast you break through blocks.
Due to the Thaumium in the alloy, the repairing proprieties of Void Metal did not apply. To compensate, a small amount of Perditio Vis is required to keep this tool charged. #FOCUSTIME tm.name.FOCUSTIME=Wand Focus: Time -tm.tag.FOCUSTIME=Mou ikkai +tm.tag.FOCUSTIME=That once a certainty, lost in grief tm.text.FOCUSTIME.1=Using the basic principals of creation, you have created a focus to modify the world slightly.
The Time focus is simple. Using the Shard of Creation to tap into the world's creational formula, you are able to shift the time from night to day and vice versa.
The only problem is the immensely long cooldown time of 30 seconds.
This focus will not accept upgrades from the Focal Manipulator. #FOCUSWEATHER tm.name.FOCUSWEATHER=Wand Focus: Meteorology -tm.tag.FOCUSWEATHER=There's a 30% chance that it's already raining. +tm.tag.FOCUSWEATHER=A prayer passes from her lips tm.text.FOCUSWEATHER.1=Using the basic principals of creation, it wasn't hard to create a focus to modify the current weather in the world.
The weather focus will stop a storm if one exists, or start one if no storm is present.
The only problem is the rather long cooldown of 30 seconds.
This focus will not accept upgrades from the Focal Manipulator. #VOIDSASH tm.name.VOIDSASH=Voidwalker's Sash of Runic Shielding - -tm.tag.VOIDSASH=Gotta go fast - -tm.text.VOIDSASH.1=After extensive study of Runic Shielding, you had a bizarre idea.
Using Void Metal, Shadowmetal, the Primordial Pearl, a little Shadow Cloth and a fine mixture of essentia; a sash of runic shielding more powerful than you had ever believed possible was created. The Voidwalker's Sash of Runic Shielding offers §6Runic Shield +20§0 and can be equipped in the belt slot.
If you are wearing the sash alongside the Boots of the Voidwalker, your speed and jump height will be increased greatly. One would Shift+Right-click with the sash to toggle this effect. +tm.tag.VOIDSASH=Farewells unsaid +tm.text.VOIDSASH.1=With extensive study of Runic Shielding, you had a bizarre idea.
Using Void Metal, Shadowmetal, the Primordial Pearl, a little Shadow Cloth and a fine mixture of essentia; a sash of runic shielding more powerful than you had ever believed possible was created. The Voidwalker's Sash of Runic Shielding offers §6Runic Shield +20§0 and can be equipped in the belt slot.
If you are wearing the sash alongside the Boots of the Voidwalker, your speed and jump height will be increased greatly. One would Shift+Right-click with the sash to toggle this effect. #MAGICFUNGUAR tm.name.MAGICFUNGUAR=Magic Funguar -tm.tag.MAGICFUNGUAR=Is butter a carb? +tm.tag.MAGICFUNGUAR=Flambé tm.text.MAGICFUNGUAR.1=Vis Shrooms. The bane of every Thaumaturge's existence. Every time you walk through a magical forest, you somehow end up stepping on one of these pesky mushrooms and start to feel sick.
One day, you had had enough with these mushrooms. You plucked one from the ground and took it home with you.
You have discovered that that after combining it with some mundane ingredients and a magical shard, the mushroom had become §oedible.§r
Furthermore, when eaten, you will gain research points at random. #CRYSTALDAGGER tm.name.CRYSTALDAGGER=Crystal Blood -tm.tag.CRYSTALDAGGER=Drip, drip, drop... -tm.text.CRYSTALDAGGER.1=After having discovered the Essentia Crystallizer, you've managed to create a dagger that crystallizes the blood of your foes.
Whenever a living creature is killed by this blade, a few drops of blood will be crystallized. It also seems that any blade that possesses the same Bloodlust effect will also crystallize any creature's blood upon death.
You are certain that this is no ordinary blood, it is particularly interesting because Crimson Cult Attire seems to have similar properties. - -#MACEFOCUS +tm.tag.CRYSTALDAGGER=Zwerchhau +tm.text.CRYSTALDAGGER.1=After having discovered the Essentia Crystallizer, you've managed to create a dagger that crystallizes the blood of your foes.
Using this blade allows you to obtain Crystal Blood upon killing enemies. Any weapon that possesses the Bloodlust trait has a similar effect.
You are certain that this is no ordinary blood, it is particularly interesting because artifacts retrieved from the Crimson Cult seem to have similar properties. tm.name.MACEFOCUS=Wand Focus: Mage's Mace -tm.tag.MACEFOCUS=Yes, just hit them with your staff -tm.text.MACEFOCUS.1=With the discovery of foci, you've noticed that most foci are ranged. For you, this can sometimes be a problem.
By infusing some sharp objects into a Block of Shadowmetal, you created a foci that acts as a mace.
When equipped, this focus will grant increased attack damage to the staff or wand that you are using; Turning it into the perfect melee weapon. Nonetheless, this comes at a cost. The focus uses vis every time you hit a mob, no damage will be inflicted if your staff or wand does not have the required vis. The potency upgrade will increase the damage by one each level. +tm.tag.MACEFOCUS=From wizard to warrior +tm.text.MACEFOCUS.1=With the discovery of foci, you've noticed that most foci are ranged. For you, this can sometimes be a problem.
By infusing some sharp objects into a Block of Shadowmetal, you created a focus that acts as a mace.
When equipped, this focus will grant increased attack damage to the staff or wand that you are using; turning it into the perfect melee weapon. Nonetheless, this comes at a cost. The focus uses vis every time you hit a mob, no damage will be inflicted if your staff or wand does not have the required vis. The potency upgrade will increase the damage dealt by +1 for each level. #CRIMSONBLADE tm.name.CRIMSONBLADE=Crimson Blade tm.tag.CRIMSONBLADE=This shall be mercy -tm.text.CRIMSONBLADE.1=This seems to be the conclusion of your studies on the Crimson Cult and Crystal Blood, you have finally done it. You created the legendary weapon known as The Crimson Blade; the blade wielded by the Cult's leader them self.
This blade will inflict weakness upon anything it strikes, and it also possesses the ability to crystallize blood - just like the Crystal Dagger. +tm.text.CRIMSONBLADE.1=This seems to be the conclusion of your studies on the Crimson Cult. You have finally done it. You created the legendary weapon known as The Crimson Blade; the blade wielded by the Cult's leader them self.
This blade will anything it hits with weakness and also possesses the Bloodlust trait - just like the Crystal Dagger. #SHADOWFORTRESSARMOR tm.name.SHADOWFORTRESSARMOR=Shadow Fortress Armor -tm.tag.SHADOWFORTRESSARMOR=If you wear robes, you are weak +tm.tag.SHADOWFORTRESSARMOR=A torn uniform in hand tm.text.SHADOWFORTRESSARMOR.1=After having discovered Thaumium and Void Fortress Armor, you thought to yourself that Shadowmetal would be the perfect candidate to be made into Fortress Armor.
It worked perfectly. While this suit of armor did not inherit the auto-repair ability, it is drastically more protective than the Void Fortress Armor. It also seems that wearing multiple pieces of this armor will increase its protection significantly.
Like normal fortress armor, this armor can be enhanced by various different faceplates and modifications. #CAP_cloth tm.name.CAP_cloth=Cloth Caps -tm.tag.CAP_cloth=Remember to wrap it +tm.tag.CAP_cloth=Satin and silence tm.text.CAP_cloth.1=With the immersive study of wandcraft, and the discovery of Enchanted Fabric, you decided to use some to cap a wand.
You are not sure why it worked, seeing as it is just cloth, but it did nonetheless. Using a few pieces of fabric, and a little vis, you have forged a fairly effective and very cheap wand cap.
This cap grants a 5% Vis Discount... Though, you are not quite sure why. #CAP_crimsoncloth tm.name.CAP_crimsoncloth=Crimson-Stained Cloth Caps -tm.tag.CAP_crimsoncloth=I love them red +tm.tag.CAP_crimsoncloth=Stained in red. tm.text.CAP_crimsoncloth.1=Using the same concept that the Cloth Caps laid down, you created very similar caps from Crimson-Stained Cloth. Though, you needed some Salis Mundus to bind it all together.
It seems that the Crystal Blood from which the cloth was stained helps the caps channel vis at a far more efficient rate. The Crimson Cloth Caps seem to provide a 15% vis discount. #CAP_shadowcloth tm.name.CAP_shadowcloth=Shadow-Imbued Cloth Caps -tm.tag.CAP_shadowcloth=On Wednesdays we wear black +tm.tag.CAP_shadowcloth=Shadows and secrets tm.text.CAP_shadowcloth.1=You've created a new type of wand cap using the exact same design as the Cloth Caps, except using Shadow-Imbued Cloth. The idea was definitely a success, though you needed to use a pinch of Salis Mundus to bind it all together.
The Shadow Cloth Caps are exactly the same as the Cloth Caps, but slightly more efficient. They will grant a 10% Vis Discount. #FOCUSTAINTEDBLAST tm.name.FOCUSTAINTEDBLAST=Wand Focus: Tainted Shockwave -tm.tag.FOCUSTAINTEDBLAST=Almighty push -tm.text.FOCUSTAINTEDBLAST.1=With the study of advanced foci and taint, you felt the need for a focus that offensive, but defensive.
The Wand Focus: Tainted Shockwave will gather an extremely concentrated amount of tainted energy at the tip of you wand, then eventually explode in a 15 block radius. This will certainly blast all entities far away from you. It also seems that the Enlarge upgrade in the Focal Manipulator will increase the radius.
50 zombies swarming you? No problem! Whip out your wand and they will be sent flying. +tm.tag.FOCUSTAINTEDBLAST=Magical opposition +tm.text.FOCUSTAINTEDBLAST.1=With the study of advanced foci and flux, you felt the need for a focus that is more defensive than offensive.
This focus will send a violent shockwave of energy from your wand (or staff), sending all enemies in flight far away from you. #PRIMALBLADE tm.name.PRIMALBLADE=Edge of the Primordials tm.tag.PRIMALBLADE=Kamui -tm.text.PRIMALBLADE.1=Using many dangerous magics, you've created the other half of your primal tool set.
The Edge of the Primordials is a dangerously sharp blade imbued with primal aspects. When blocking, a strong vortex of energy will be created that will pull all mobs within a 15 block radius towards you, damaging them. The effect is similar to that of a Hungry Node. This blade also possesses Eldritch Sapping - this will cause the blade to inflict strong weakness and hunger effects to your enemy.
Be careful with this blade... You may start hallucinating if you use it too much... +tm.text.PRIMALBLADE.1=Using many dangerous magics, you've created the other half of your primal tool set.
The Edge of the Primordials is a hazardously sharp blade imbued with primal aspects. When blocking, a strong vortex of energy will be created that will pull all mobs within a 15 block radius towards you, damaging them. The effect is similar to that of a Hungry Node. This blade also possesses Eldritch Sapping - this will cause the blade to inflict strong weakness and hunger effects to your enemy.
Be careful with this blade... You may start hallucinating if you use it too much... #BLOODLUSTUPGRADE tm.name.BLOODLUSTUPGRADE=Tier 5 Upgrade: Bloodlust -tm.tag.BLOODLUSTUPGRADE=Bleed me a river -tm.text.BLOODLUSTUPGRADE.1=This upgrade can only be applied to the Mage's Mace focus, and will allow the mace to inherit Bloodlust ability, like that of the Crystal Dagger. +tm.tag.BLOODLUSTUPGRADE=Red like roses fill my dreams +tm.text.BLOODLUSTUPGRADE.1=This upgrade can only be applied to the Mage's Mace focus, and will allow your wand (or staff) to inherit Bloodlust trait. #VOIDSENTBLOOD tm.name.VOIDSENTBLOOD=Voidsent Blood -tm.tag.VOIDSENTBLOOD=Lady Amandine's favourite -tm.text.VOIDSENTBLOOD.1=While you love Crimson Cult robes, they are inferior to any armor made from Voidmetal because they do not repair themselves.
Until now.
Voidsent Blood is a simple concoction, it's just Crystal Blood infused with void aspects.
Applying this elixir to Crimson Cult attire via a crafting grid will cause the armor to repair itself. +tm.tag.VOIDSENTBLOOD=Amdapori +tm.text.VOIDSENTBLOOD.1=While you love Crimson Cult robes, they are inferior to any armor made from Voidmetal because they do not repair themselves.
Until now.
Voidsent Blood is a simple concoction: Crystal Blood infused with void aspects.
Applying this elixir to Crimson Cult attire via a crafting grid will cause the armor to repair itself. #THAUMIUMKATANA @@ -365,13 +365,13 @@ tm.text.THAUMIUMKATANA.1=Using a design similar to Thaumium Fortress Armor, you #VOIDMETALKATANA tm.name.VOIDMETALKATANA=Voidmetal Fortress Blade -tm.tag.VOIDMETALKATANA=Void samurai +tm.tag.VOIDMETALKATANA=Third eye tm.text.VOIDMETALKATANA.1=By using the same construction process as the Thaumium Fortress blade, but substituting the material for Voidmetal, you have created a Fortress Blade that is even more powerful.
The Voidmetal Fortress Blade is not only sharper and stronger than its Thaumium counterpart, but also possesses the Greater Sapping effect which will weaken anything you hit.
They do say that this much Voidmetal is not healthy for ones body, but you care not.
Like a Thaumium Fortress blade, this blade can be enhanced with various inscriptions. #SHADOWMETALKATANA tm.name.SHADOWMETALKATANA=Shadowmetal Fortress Blade -tm.tag.SHADOWMETALKATANA=Chakra blades +tm.tag.SHADOWMETALKATANA=Midare setsugekka tm.text.SHADOWMETALKATANA.1=After having discovered Shadowmetal Fortress Armor, you were certain that you could make a Fortress Blade from Shadowmetal as well.
The results were astounding. By following the same construction process as the Thaumium and Voidmetal Fortress Blades, you have created the strongest, and sharpest Fortress Blade you have ever laid eyes upon.
The blade will also inflict a slowing effect while simultaneously blurring the vision of whatever you hit.
Like a Thaumium Fortress blade, this blade can be enhanced with various inscriptions. #INSCRIPTIONFIRE @@ -395,10 +395,16 @@ tm.text.INSCRIPTIONUNDEAD.1=You have upgraded your Fortress Blade by inscribing #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? +tm.tag.VOIDGOGGLES=Rinnegan +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. #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 +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. + +#FOCUSLUMOS +tm.name.FOCUSLUMOS=Wand Focus: Lumos +tm.tag.FOCUSLUMOS=It's leviOOOOOSA +tm.text.FOCUSLUMOS.1=After having studied foci and aspects you had an amazing idea. What if you could create light from the tip of your wand? This focus does just that.
Simply aim your wand (or staff) at a block and watch as a pocket of light appears! The light source can be broken and thus removed with your bare hands. \ No newline at end of file diff --git a/src/main/resources/assets/taintedmagic/textures/entities/EntityTaintBubble.png b/src/main/resources/assets/taintedmagic/textures/entities/EntityTaintBubble.png deleted file mode 100644 index 6d81407..0000000 Binary files a/src/main/resources/assets/taintedmagic/textures/entities/EntityTaintBubble.png and /dev/null differ diff --git a/src/main/resources/assets/taintedmagic/textures/entities/EntityTaintBubble.png.mcmeta b/src/main/resources/assets/taintedmagic/textures/entities/EntityTaintBubble.png.mcmeta deleted file mode 100644 index a5ddb40..0000000 --- a/src/main/resources/assets/taintedmagic/textures/entities/EntityTaintBubble.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "texture": - { - "blur": true - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taintedmagic/textures/foci/IconAntibody.png b/src/main/resources/assets/taintedmagic/textures/foci/IconAntibody.png new file mode 100644 index 0000000..a23fc9d Binary files /dev/null and b/src/main/resources/assets/taintedmagic/textures/foci/IconAntibody.png differ diff --git a/src/main/resources/assets/taintedmagic/textures/foci/IconBloodlust.png b/src/main/resources/assets/taintedmagic/textures/foci/IconBloodlust.png index f4c740e..016983a 100644 Binary files a/src/main/resources/assets/taintedmagic/textures/foci/IconBloodlust.png and b/src/main/resources/assets/taintedmagic/textures/foci/IconBloodlust.png differ diff --git a/src/main/resources/assets/taintedmagic/textures/foci/IconCorrosive.png b/src/main/resources/assets/taintedmagic/textures/foci/IconCorrosive.png index e3a69d8..0130a3d 100644 Binary files a/src/main/resources/assets/taintedmagic/textures/foci/IconCorrosive.png and b/src/main/resources/assets/taintedmagic/textures/foci/IconCorrosive.png differ diff --git a/src/main/resources/assets/taintedmagic/textures/foci/IconDiffusion.png b/src/main/resources/assets/taintedmagic/textures/foci/IconDiffusion.png new file mode 100644 index 0000000..1c3745d Binary files /dev/null and b/src/main/resources/assets/taintedmagic/textures/foci/IconDiffusion.png differ diff --git a/src/main/resources/assets/taintedmagic/textures/foci/IconGlowpet.png b/src/main/resources/assets/taintedmagic/textures/foci/IconGlowpet.png new file mode 100644 index 0000000..b40f25a Binary files /dev/null and b/src/main/resources/assets/taintedmagic/textures/foci/IconGlowpet.png differ diff --git a/src/main/resources/assets/taintedmagic/textures/foci/IconMaxima.png b/src/main/resources/assets/taintedmagic/textures/foci/IconMaxima.png new file mode 100644 index 0000000..0324bfc Binary files /dev/null and b/src/main/resources/assets/taintedmagic/textures/foci/IconMaxima.png differ diff --git a/src/main/resources/assets/taintedmagic/textures/foci/IconPersistant.png b/src/main/resources/assets/taintedmagic/textures/foci/IconPersistent.png similarity index 100% rename from src/main/resources/assets/taintedmagic/textures/foci/IconPersistant.png rename to src/main/resources/assets/taintedmagic/textures/foci/IconPersistent.png diff --git a/src/main/resources/assets/taintedmagic/textures/foci/IconSanity.png b/src/main/resources/assets/taintedmagic/textures/foci/IconSanity.png index 1259040..caa353d 100644 Binary files a/src/main/resources/assets/taintedmagic/textures/foci/IconSanity.png and b/src/main/resources/assets/taintedmagic/textures/foci/IconSanity.png differ diff --git a/src/main/resources/assets/taintedmagic/textures/foci/IconTainturgy.png b/src/main/resources/assets/taintedmagic/textures/foci/IconTainturgy.png deleted file mode 100644 index 75b4963..0000000 Binary files a/src/main/resources/assets/taintedmagic/textures/foci/IconTainturgy.png and /dev/null differ diff --git a/src/main/resources/assets/taintedmagic/textures/items/ItemFocusEldritch.png b/src/main/resources/assets/taintedmagic/textures/items/ItemFocusDarkMatter.png similarity index 100% rename from src/main/resources/assets/taintedmagic/textures/items/ItemFocusEldritch.png rename to src/main/resources/assets/taintedmagic/textures/items/ItemFocusDarkMatter.png diff --git a/src/main/resources/assets/taintedmagic/textures/items/ItemFocusEldritch.png.mcmeta b/src/main/resources/assets/taintedmagic/textures/items/ItemFocusDarkMatter.png.mcmeta similarity index 100% rename from src/main/resources/assets/taintedmagic/textures/items/ItemFocusEldritch.png.mcmeta rename to src/main/resources/assets/taintedmagic/textures/items/ItemFocusDarkMatter.png.mcmeta diff --git a/src/main/resources/assets/taintedmagic/textures/items/ItemFocusEldritch_depth.png b/src/main/resources/assets/taintedmagic/textures/items/ItemFocusDarkMatter_depth.png similarity index 100% rename from src/main/resources/assets/taintedmagic/textures/items/ItemFocusEldritch_depth.png rename to src/main/resources/assets/taintedmagic/textures/items/ItemFocusDarkMatter_depth.png diff --git a/src/main/resources/assets/taintedmagic/textures/items/ItemFocusEldritch_depth.png.mcmeta b/src/main/resources/assets/taintedmagic/textures/items/ItemFocusDarkMatter_depth.png.mcmeta similarity index 100% rename from src/main/resources/assets/taintedmagic/textures/items/ItemFocusEldritch_depth.png.mcmeta rename to src/main/resources/assets/taintedmagic/textures/items/ItemFocusDarkMatter_depth.png.mcmeta diff --git a/src/main/resources/assets/taintedmagic/textures/items/ItemFocusLumos.png b/src/main/resources/assets/taintedmagic/textures/items/ItemFocusLumos.png new file mode 100644 index 0000000..c103022 Binary files /dev/null and b/src/main/resources/assets/taintedmagic/textures/items/ItemFocusLumos.png differ diff --git a/src/main/resources/assets/taintedmagic/textures/items/ItemFocusLumos.png.mcmeta b/src/main/resources/assets/taintedmagic/textures/items/ItemFocusLumos.png.mcmeta new file mode 100644 index 0000000..4f0718a --- /dev/null +++ b/src/main/resources/assets/taintedmagic/textures/items/ItemFocusLumos.png.mcmeta @@ -0,0 +1,3 @@ +{ + "animation": {} +} \ No newline at end of file diff --git a/src/main/resources/assets/taintedmagic/textures/items/ItemFocusMageMace.png b/src/main/resources/assets/taintedmagic/textures/items/ItemFocusMageMace.png index 850ef69..807425e 100644 Binary files a/src/main/resources/assets/taintedmagic/textures/items/ItemFocusMageMace.png and b/src/main/resources/assets/taintedmagic/textures/items/ItemFocusMageMace.png differ diff --git a/src/main/resources/assets/taintedmagic/textures/items/ItemFocusTaintedBlast.png b/src/main/resources/assets/taintedmagic/textures/items/ItemFocusTaintedShockwave.png similarity index 100% rename from src/main/resources/assets/taintedmagic/textures/items/ItemFocusTaintedBlast.png rename to src/main/resources/assets/taintedmagic/textures/items/ItemFocusTaintedShockwave.png diff --git a/src/main/resources/assets/taintedmagic/textures/items/ItemFocusTaintedBlast.png.mcmeta b/src/main/resources/assets/taintedmagic/textures/items/ItemFocusTaintedShockwave.png.mcmeta similarity index 100% rename from src/main/resources/assets/taintedmagic/textures/items/ItemFocusTaintedBlast.png.mcmeta rename to src/main/resources/assets/taintedmagic/textures/items/ItemFocusTaintedShockwave.png.mcmeta diff --git a/src/main/resources/assets/taintedmagic/textures/items/ItemFocusTaintedBlast_orn.png b/src/main/resources/assets/taintedmagic/textures/items/ItemFocusTaintedShockwave_orn.png similarity index 100% rename from src/main/resources/assets/taintedmagic/textures/items/ItemFocusTaintedBlast_orn.png rename to src/main/resources/assets/taintedmagic/textures/items/ItemFocusTaintedShockwave_orn.png diff --git a/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial0.png b/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial0.png index 5f4e3c3..5f2241e 100644 Binary files a/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial0.png and b/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial0.png differ diff --git a/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial2.png b/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial2.png index 806422b..200a1c8 100644 Binary files a/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial2.png and b/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial2.png differ diff --git a/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial8.png b/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial8.png index d0c92aa..7a86cfd 100644 Binary files a/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial8.png and b/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial8.png differ diff --git a/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial9.png b/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial9.png new file mode 100644 index 0000000..bf35eb2 Binary files /dev/null and b/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial9.png differ diff --git a/src/main/resources/assets/taintedmagic/textures/items/ItemWandCap1.png b/src/main/resources/assets/taintedmagic/textures/items/ItemWandCap1.png index f245bc4..c7bb71c 100644 Binary files a/src/main/resources/assets/taintedmagic/textures/items/ItemWandCap1.png and b/src/main/resources/assets/taintedmagic/textures/items/ItemWandCap1.png differ diff --git a/src/main/resources/assets/taintedmagic/textures/models/ModelWAND_CAP_CRIMSON_CLOTH.png b/src/main/resources/assets/taintedmagic/textures/models/ModelWAND_CAP_CRIMSON_CLOTH.png index f7aab2b..988e8cd 100644 Binary files a/src/main/resources/assets/taintedmagic/textures/models/ModelWAND_CAP_CRIMSON_CLOTH.png and b/src/main/resources/assets/taintedmagic/textures/models/ModelWAND_CAP_CRIMSON_CLOTH.png differ