diff --git a/build.properties b/build.properties index 86384f3..f5e93e6 100644 --- a/build.properties +++ b/build.properties @@ -1,3 +1,3 @@ -mod_version=r7.81 +mod_version=r7.82 mod_name=Tainted-Magic minecraft_version=1.7.10 \ No newline at end of file diff --git a/src/main/java/taintedmagic/client/ClientProxy.java b/src/main/java/taintedmagic/client/ClientProxy.java index ac6b364..00df8e5 100644 --- a/src/main/java/taintedmagic/client/ClientProxy.java +++ b/src/main/java/taintedmagic/client/ClientProxy.java @@ -24,8 +24,16 @@ import cpw.mods.fml.common.FMLCommonHandler; public class ClientProxy extends CommonProxy { + @Override - public void initRenders () + public void registerClientHandlers () + { + MinecraftForge.EVENT_BUS.register(new HUDHandler()); + FMLCommonHandler.instance().bus().register(new HUDHandler()); + } + + @Override + public void registerRenderers () { // Entities RenderingRegistry.registerEntityRenderingHandler(EntityTaintBubble.class, new RenderEntityTaintBubble()); @@ -49,11 +57,4 @@ public class ClientProxy extends CommonProxy { return Minecraft.getMinecraft().theWorld; } - - @Override - public void registerClientHandlers () - { - MinecraftForge.EVENT_BUS.register(new HUDHandler()); - FMLCommonHandler.instance().bus().register(new HUDHandler()); - } } diff --git a/src/main/java/taintedmagic/client/model/ModelKatana.java b/src/main/java/taintedmagic/client/model/ModelKatana.java index 306601f..3de35ea 100644 --- a/src/main/java/taintedmagic/client/model/ModelKatana.java +++ b/src/main/java/taintedmagic/client/model/ModelKatana.java @@ -18,12 +18,15 @@ public class ModelKatana extends ModelBase { this.textureWidth = 32; this.textureHeight = 64; + this.grip2 = new ModelRenderer(this, 22, 0); this.grip2.setRotationPoint(0.0F, 0.0F, 0.0F); this.grip2.addBox(-1.0F, -12.0F, -1.5F, 2, 12, 3, 0.0F); + this.blade = new ModelRenderer(this, 0, 0); this.blade.setRotationPoint(0.0F, -40.0F, 0.0F); this.blade.addBox(-0.5F, 0.0F, -2.0F, 1, 48, 4, -0.75F); + this.grip1 = new ModelRenderer(this, 0, 52); this.grip1.setRotationPoint(0.0F, -40.0F, 0.0F); this.grip1.addBox(-2.5F, 0.0F, -3.5F, 5, 1, 7, 0.0F); diff --git a/src/main/java/taintedmagic/client/model/ModelSaya.java b/src/main/java/taintedmagic/client/model/ModelSaya.java index 207ac93..cfcd7d3 100644 --- a/src/main/java/taintedmagic/client/model/ModelSaya.java +++ b/src/main/java/taintedmagic/client/model/ModelSaya.java @@ -14,6 +14,7 @@ public class ModelSaya extends ModelBase { this.textureWidth = 32; this.textureHeight = 64; + this.saya = new ModelRenderer(this, 10, 0); this.saya.setRotationPoint(0.0F, -40.0F, 0.0F); this.saya.addBox(-1.0F, 0.5F, -2.0F, 2, 48, 4, 0.0F); diff --git a/src/main/java/taintedmagic/client/renderer/RenderEntityGlowpet.java b/src/main/java/taintedmagic/client/renderer/RenderEntityGlowpet.java index 1cabfc0..2546346 100644 --- a/src/main/java/taintedmagic/client/renderer/RenderEntityGlowpet.java +++ b/src/main/java/taintedmagic/client/renderer/RenderEntityGlowpet.java @@ -1,16 +1,16 @@ package taintedmagic.client.renderer; +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL12; + 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 org.lwjgl.opengl.GL12; - import taintedmagic.common.entities.EntityGlowpet; import thaumcraft.client.fx.ParticleEngine; +import thaumcraft.client.lib.UtilsFX; public class RenderEntityGlowpet extends Render { @@ -31,7 +31,7 @@ public class RenderEntityGlowpet extends Render GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - bindTexture(ParticleEngine.particleTexture); + UtilsFX.bindTexture(ParticleEngine.particleTexture); float f2 = (8 + e.ticksExisted % 8) / 16.0F; float f3 = f2 + 0.0625F; diff --git a/src/main/java/taintedmagic/client/renderer/RenderEntityHomingShard.java b/src/main/java/taintedmagic/client/renderer/RenderEntityHomingShard.java index 565f6e4..2bbb68a 100644 --- a/src/main/java/taintedmagic/client/renderer/RenderEntityHomingShard.java +++ b/src/main/java/taintedmagic/client/renderer/RenderEntityHomingShard.java @@ -1,18 +1,16 @@ package taintedmagic.client.renderer; -import java.util.Random; +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL12; 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 org.lwjgl.opengl.GL12; - import taintedmagic.common.entities.EntityHomingShard; import thaumcraft.client.fx.ParticleEngine; +import thaumcraft.client.lib.UtilsFX; /** * this class is based off of RenderHomingShard.class created by as @@ -37,7 +35,7 @@ public class RenderEntityHomingShard extends Render GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - bindTexture(ParticleEngine.particleTexture); + UtilsFX.bindTexture(ParticleEngine.particleTexture); float f2 = (8 + e.ticksExisted % 8) / 16.0F; float f3 = f2 + 0.0625F; diff --git a/src/main/java/taintedmagic/client/renderer/RenderEntityTaintBubble.java b/src/main/java/taintedmagic/client/renderer/RenderEntityTaintBubble.java index 1020a62..3517293 100644 --- a/src/main/java/taintedmagic/client/renderer/RenderEntityTaintBubble.java +++ b/src/main/java/taintedmagic/client/renderer/RenderEntityTaintBubble.java @@ -1,16 +1,13 @@ package taintedmagic.client.renderer; -import java.util.Random; +import org.lwjgl.opengl.GL11; -import net.minecraft.client.Minecraft; 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.EntityTaintBubble; +import thaumcraft.client.lib.UtilsFX; public class RenderEntityTaintBubble extends Render { @@ -36,7 +33,7 @@ public class RenderEntityTaintBubble extends Render GL11.glColor4f(e.red, e.green, e.blue, alpha); - Minecraft.getMinecraft().renderEngine.bindTexture(texture); + UtilsFX.bindTexture(texture); int p = 7 + e.ticksExisted % 8; float f2 = p / 16.0F; diff --git a/src/main/java/taintedmagic/client/renderer/RenderItemKatana.java b/src/main/java/taintedmagic/client/renderer/RenderItemKatana.java index cc86b40..39ed47e 100644 --- a/src/main/java/taintedmagic/client/renderer/RenderItemKatana.java +++ b/src/main/java/taintedmagic/client/renderer/RenderItemKatana.java @@ -1,5 +1,9 @@ package taintedmagic.client.renderer; +import org.lwjgl.opengl.GL11; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.Tessellator; @@ -7,14 +11,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; import net.minecraftforge.client.IItemRenderer; - -import org.lwjgl.opengl.GL11; - import taintedmagic.common.TaintedMagic; import taintedmagic.common.items.tools.ItemKatana; import thaumcraft.client.lib.UtilsFX; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly (Side.CLIENT) public class RenderItemKatana implements IItemRenderer @@ -39,13 +38,11 @@ public class RenderItemKatana implements IItemRenderer GL11.glPushMatrix(); GL11.glDisable(GL11.GL_CULL_FACE); - GL11.glScalef(1.4F, 1.4F, 1.4F); if ( (p.getHeldItem() == null || p.getHeldItem() != s) && t != ItemRenderType.EQUIPPED) { GL11.glPushMatrix(); - if (t == ItemRenderType.ENTITY) { GL11.glScalef(0.5F, 0.5F, 0.5F); @@ -63,8 +60,10 @@ public class RenderItemKatana implements IItemRenderer { GL11.glTranslatef(0.0F, -0.7F, 0.0F); } - Minecraft.getMinecraft().renderEngine.bindTexture(ItemKatana.getTexture(s)); + + UtilsFX.bindTexture(ItemKatana.getTexture(s)); ItemKatana.saya.render(0.0625F); + GL11.glPopMatrix(); } @@ -106,7 +105,7 @@ public class RenderItemKatana implements IItemRenderer GL11.glTranslatef(0.0F, 2F, 0.65F); } - Minecraft.getMinecraft().renderEngine.bindTexture(ItemKatana.getTexture(s)); + UtilsFX.bindTexture(ItemKatana.getTexture(s)); ItemKatana.katana.render(0.0625F); @@ -154,29 +153,38 @@ public class RenderItemKatana implements IItemRenderer public static void drawRune (double x, double y, double z, int rune, EntityPlayer player) { GL11.glPushMatrix(); + UtilsFX.bindTexture("textures/misc/script.png"); + float r = MathHelper.sin( (player.ticksExisted + rune * 5) / 5.0F) * 0.1F + 0.88F; float g = MathHelper.sin( (player.ticksExisted + rune * 5) / 7.0F) * 0.1F + 0.63F; float alpha = MathHelper.sin( (player.ticksExisted + rune * 5) / 10.0F) * 0.3F; GL11.glColor4f(r, g, 0.2F, alpha + 0.6F); + GL11.glRotated(90.0D, 0.0D, 0.0D, 1.0D); GL11.glTranslated(x, y, z); - Tessellator tessellator = Tessellator.instance; + Tessellator t = Tessellator.instance; + float f = 0.0625F * rune; float f1 = f + 0.0625F; float f2 = 0.0F; float f3 = 1.0F; - tessellator.startDrawingQuads(); - tessellator.setColorRGBA_F(r, g, 0.2F, alpha + 0.6F); - tessellator.addVertexWithUV(-0.06D - alpha / 40.0F, 0.06D + alpha / 40.0F, 0.0D, f1, f3); - tessellator.addVertexWithUV(0.06D + alpha / 40.0F, 0.06D + alpha / 40.0F, 0.0D, f1, f2); - tessellator.addVertexWithUV(0.06D + alpha / 40.0F, -0.06D - alpha / 40.0F, 0.0D, f, f2); - tessellator.addVertexWithUV(-0.06D - alpha / 40.0F, -0.06D - alpha / 40.0F, 0.0D, f, f3); - tessellator.draw(); + + t.startDrawingQuads(); + + t.setColorRGBA_F(r, g, 0.2F, alpha + 0.6F); + + t.addVertexWithUV(-0.06D - alpha / 40.0F, 0.06D + alpha / 40.0F, 0.0D, f1, f3); + t.addVertexWithUV(0.06D + alpha / 40.0F, 0.06D + alpha / 40.0F, 0.0D, f1, f2); + t.addVertexWithUV(0.06D + alpha / 40.0F, -0.06D - alpha / 40.0F, 0.0D, f, f2); + t.addVertexWithUV(-0.06D - alpha / 40.0F, -0.06D - alpha / 40.0F, 0.0D, f, f3); + + t.draw(); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GL11.glPopMatrix(); } } \ No newline at end of file diff --git a/src/main/java/taintedmagic/common/CommonProxy.java b/src/main/java/taintedmagic/common/CommonProxy.java index 756742b..be3d3b3 100644 --- a/src/main/java/taintedmagic/common/CommonProxy.java +++ b/src/main/java/taintedmagic/common/CommonProxy.java @@ -6,7 +6,11 @@ import net.minecraft.world.World; public class CommonProxy { - public void initRenders () + public void registerClientHandlers () + { + } + + public void registerRenderers () { } @@ -15,10 +19,6 @@ public class CommonProxy return null; } - public void registerClientHandlers () - { - } - public WorldClient getClientWorld () { return null; diff --git a/src/main/java/taintedmagic/common/TaintedMagic.java b/src/main/java/taintedmagic/common/TaintedMagic.java index d875c1c..f2e7218 100644 --- a/src/main/java/taintedmagic/common/TaintedMagic.java +++ b/src/main/java/taintedmagic/common/TaintedMagic.java @@ -82,7 +82,7 @@ public class TaintedMagic MinecraftForge.EVENT_BUS.register(taintedMagicEvents); FMLCommonHandler.instance().bus().register(taintedMagicEvents); - proxy.initRenders(); + proxy.registerRenderers(); } // Post init diff --git a/src/main/java/taintedmagic/common/TaintedMagicCreativeTab.java b/src/main/java/taintedmagic/common/TaintedMagicCreativeTab.java index d990cd8..eb49706 100644 --- a/src/main/java/taintedmagic/common/TaintedMagicCreativeTab.java +++ b/src/main/java/taintedmagic/common/TaintedMagicCreativeTab.java @@ -26,32 +26,32 @@ public class TaintedMagicCreativeTab extends CreativeTabs { super.displayAllReleventItems(l); ItemStack wand = new ItemStack(ConfigItems.itemWandCasting); - ItemWandCasting wand2 = (ItemWandCasting) wand.getItem(); + ItemWandCasting wandCasting = (ItemWandCasting) wand.getItem(); - wand2.setCap(wand, ItemRegistry.WAND_CAP_SHADOWMETAL); - wand2.setRod(wand, ItemRegistry.STAFF_ROD_WARPWOOD); - wand2.storeAllVis(wand, TaintedMagicHelper.getPrimals(50000)); + wandCasting.setCap(wand, ItemRegistry.WAND_CAP_SHADOWMETAL); + wandCasting.setRod(wand, ItemRegistry.STAFF_ROD_WARPWOOD); + wandCasting.storeAllVis(wand, TaintedMagicHelper.getPrimals(50000)); if (l != null) l.add(0, wand); - ItemStack wand3 = new ItemStack(ConfigItems.itemWandCasting); - ItemWandCasting wand4 = (ItemWandCasting) wand.getItem(); + wand = new ItemStack(ConfigItems.itemWandCasting); + wandCasting = (ItemWandCasting) wand.getItem(); - wand4.setCap(wand3, ItemRegistry.WAND_CAP_SHADOWMETAL); - wand4.setRod(wand3, ItemRegistry.WAND_ROD_WARPWOOD); - wand4.storeAllVis(wand3, TaintedMagicHelper.getPrimals(25000)); + wandCasting.setCap(wand, ItemRegistry.WAND_CAP_SHADOWMETAL); + wandCasting.setRod(wand, ItemRegistry.WAND_ROD_WARPWOOD); + wandCasting.storeAllVis(wand, TaintedMagicHelper.getPrimals(25000)); - if (l != null) l.add(1, wand3); + if (l != null) l.add(1, wand); } @Override public ItemStack getIconItemStack () { ItemStack wand = new ItemStack(ConfigItems.itemWandCasting); - ItemWandCasting wand2 = (ItemWandCasting) wand.getItem(); + ItemWandCasting wandCasting = (ItemWandCasting) wand.getItem(); - wand2.setCap(wand, ItemRegistry.WAND_CAP_SHADOWMETAL); - wand2.setRod(wand, ItemRegistry.WAND_ROD_WARPWOOD); + wandCasting.setCap(wand, ItemRegistry.WAND_CAP_SHADOWMETAL); + wandCasting.setRod(wand, ItemRegistry.WAND_ROD_WARPWOOD); return wand; } diff --git a/src/main/java/taintedmagic/common/lib/LibInfo.java b/src/main/java/taintedmagic/common/lib/LibInfo.java index 8eebf6c..3686b38 100644 --- a/src/main/java/taintedmagic/common/lib/LibInfo.java +++ b/src/main/java/taintedmagic/common/lib/LibInfo.java @@ -4,6 +4,6 @@ public class LibInfo { public static final String MODID = "TaintedMagic"; public static final String NAME = "Tainted Magic"; - public static final String VERSION = "r7.81"; + public static final String VERSION = "r7.82"; public static final String DEPENDENCIES = "required-after:Forge@[10.13.2.1291,);required-after:Thaumcraft@[4.2.3.5,);after:ThaumicTinkerer"; } diff --git a/src/main/java/taintedmagic/common/registry/ResearchRegistry.java b/src/main/java/taintedmagic/common/registry/ResearchRegistry.java index 68095fb..ee8b32e 100644 --- a/src/main/java/taintedmagic/common/registry/ResearchRegistry.java +++ b/src/main/java/taintedmagic/common/registry/ResearchRegistry.java @@ -59,7 +59,7 @@ public class ResearchRegistry new TaintedMagicResearchItem("CRIMSONROBES", TM, new AspectList().add(Aspect.CLOTH, 4).add(Aspect.EXCHANGE, 4).add(Aspect.ARMOR, 4), -2, -1, 0, new ItemStack(ItemRegistry.ItemMaterial, 1, 2)).setParents("CRYSTALDAGGER").setPages(new ResearchPage[]{ new ResearchPage("1"), new ResearchPage((IArcaneRecipe) recipes.get("ItemMaterial:2")), new ResearchPage((IArcaneRecipe) recipes.get("ItemHelmetCultistRobe")), new ResearchPage((IArcaneRecipe) recipes.get("ItemChestCultistRobe")), new ResearchPage((IArcaneRecipe) recipes.get("ItemLegsCultistRobe")), new ResearchPage((IArcaneRecipe) recipes.get("ItemBootsCultist")) }).setConcealed().registerResearchItem(); - new TaintedMagicResearchItem("VOIDFORTRESS", TM, new AspectList().add(Aspect.ARMOR, 5).add(Aspect.ELDRITCH, 3).add(Aspect.DARKNESS, 3).add(Aspect.VOID, 5), 5, -9, 0, new ItemStack(ItemRegistry.ItemVoidFortressHelmet)).setParentsHidden(new String[]{ "ARMORVOIDFORTRESS", "ARMORFORTRESS", }).setParents(new String[]{ "TMELDRITCHMAJOR" }).setConcealed().setSecondary().setPages(new ResearchPage[]{ new ResearchPage("1"), new ResearchPage((InfusionRecipe) recipes.get("ItemVoidFortressHelmet")), new ResearchPage((InfusionRecipe) recipes.get("ItemVoidFortressChestplate")), new ResearchPage((InfusionRecipe) recipes.get("ItemVoidFortressLeggings")) }).registerResearchItem(); + new TaintedMagicResearchItem("VOIDFORTRESS", TM, new AspectList().add(Aspect.ARMOR, 5).add(Aspect.ELDRITCH, 3).add(Aspect.DARKNESS, 3).add(Aspect.VOID, 5), 8, -9, 0, new ItemStack(ItemRegistry.ItemVoidFortressHelmet)).setParentsHidden(new String[]{ "ARMORVOIDFORTRESS", "ARMORFORTRESS", }).setParents(new String[]{ "TMELDRITCHMAJOR" }).setConcealed().setSecondary().setPages(new ResearchPage[]{ new ResearchPage("1"), new ResearchPage((InfusionRecipe) recipes.get("ItemVoidFortressHelmet")), new ResearchPage((InfusionRecipe) recipes.get("ItemVoidFortressChestplate")), new ResearchPage((InfusionRecipe) recipes.get("ItemVoidFortressLeggings")) }).registerResearchItem(); ThaumcraftApi.addWarpToResearch("VOIDFORTRESS", 2); new TaintedMagicResearchItem("WARPEDGOGGLES", TM, new AspectList().add(Aspect.ARMOR, 4).add(Aspect.ELDRITCH, 4).add(Aspect.DARKNESS, 4).add(Aspect.ARMOR, 4), 1, 4, 0, new ItemStack(ItemRegistry.ItemWarpedGoggles)).setParentsHidden(new String[]{ "TAINTEDMAGIC", "GOGGLES", }).setConcealed().setSecondary().setParents("SHADOWMETAL").setPages(new ResearchPage[]{ new ResearchPage("1"), new ResearchPage((InfusionRecipe) recipes.get("ItemWarpedGoggles")) }).registerResearchItem(); @@ -88,9 +88,9 @@ public class ResearchRegistry new TaintedMagicResearchItem("FOCUSWEATHER", TM, new AspectList().add(Aspect.FIRE, 4).add(Aspect.WATER, 8).add(Aspect.EARTH, 4).add(Aspect.AIR, 4).add(Aspect.ORDER, 4).add(Aspect.ENTROPY, 4).add(Aspect.WEATHER, 4), 13, -4, 0, new ItemStack(ItemRegistry.ItemFocusMeteorology)).setParentsHidden(new String[]{ "FOCUSFROST", "FOCUSSHOCK" }).setConcealed().setParents("CREATION").setComplexity(3).setPages(new ResearchPage[]{ new ResearchPage("1"), new ResearchPage((InfusionRecipe) recipes.get("ItemFocusMeteorology")) }).setSecondary().registerResearchItem(); - new TaintedMagicResearchItem("THAUMICDISASSEMBLER", TM, new AspectList().add(Aspect.METAL, 4).add(Aspect.WEAPON, 8).add(Aspect.TOOL, 4), 5, -7, 0, new ItemStack(ItemRegistry.ItemThaumicDisassembler)).setParentsHidden(new String[]{ "THAUMIUM", "VOIDMETAL", "PRIMPEARL" }).setConcealed().setParents("TMELDRITCHMAJOR").setComplexity(2).setPages(new ResearchPage[]{ new ResearchPage("1"), new ResearchPage((InfusionRecipe) recipes.get("ItemThaumicDisassembler")), new ResearchPage((IArcaneRecipe) recipes.get("ItemMaterial:6")), new ResearchPage("2") }).registerResearchItem(); + new TaintedMagicResearchItem("THAUMICDISASSEMBLER", TM, new AspectList().add(Aspect.METAL, 4).add(Aspect.WEAPON, 8).add(Aspect.TOOL, 4), 6, -9, 0, new ItemStack(ItemRegistry.ItemThaumicDisassembler)).setParentsHidden(new String[]{ "THAUMIUM", "VOIDMETAL", "PRIMPEARL" }).setConcealed().setParents("TMELDRITCHMAJOR").setComplexity(2).setPages(new ResearchPage[]{ new ResearchPage("1"), new ResearchPage((InfusionRecipe) recipes.get("ItemThaumicDisassembler")), new ResearchPage((IArcaneRecipe) recipes.get("ItemMaterial:6")), new ResearchPage("2") }).registerResearchItem(); - new TaintedMagicResearchItem("VOIDSASH", TM, new AspectList().add(Aspect.VOID, 4).add(Aspect.METAL, 8).add(Aspect.ARMOR, 4), 3, -5, 0, new ItemStack(ItemRegistry.ItemVoidwalkerSash)).setParentsHidden("PRIMPEARL").setParents("VOIDWALKERBOOTS").setPages(new ResearchPage[]{ new ResearchPage("1"), new ResearchPage((InfusionRecipe) recipes.get("ItemVoidwalkerSash")) }).setConcealed().setSecondary().registerResearchItem(); + new TaintedMagicResearchItem("VOIDSASH", TM, new AspectList().add(Aspect.VOID, 4).add(Aspect.METAL, 8).add(Aspect.ARMOR, 4), 3, -6, 0, new ItemStack(ItemRegistry.ItemVoidwalkerSash)).setParentsHidden("PRIMPEARL").setParents("VOIDWALKERBOOTS").setPages(new ResearchPage[]{ new ResearchPage("1"), new ResearchPage((InfusionRecipe) recipes.get("ItemVoidwalkerSash")) }).setConcealed().setSecondary().registerResearchItem(); ThaumcraftApi.addWarpToResearch("VOIDSASH", 4); new TaintedMagicResearchItem("MAGICFUNGUAR", TM, new AspectList().add(Aspect.MAGIC, 2).add(Aspect.HUNGER, 4).add(Aspect.PLANT, 2), 3, -3, 0, new ItemStack(ItemRegistry.ItemMagicFunguar)).setSecondary().setPages(new ResearchPage[]{ new ResearchPage("1"), new ResearchPage((IArcaneRecipe) recipes.get("ItemMagicFunguar")) }).setConcealed().registerResearchItem(); @@ -124,7 +124,7 @@ public class ResearchRegistry new TaintedMagicResearchItem("THAUMIUMKATANA", TM, new AspectList().add(Aspect.METAL, 8).add(Aspect.MAGIC, 4).add(Aspect.WEAPON, 6), 13, 1, 0, new ItemStack(ItemRegistry.ItemKatana, 1, 0)).setParents("TMARMORFORTRESS").setParentsHidden("ARMORFORTRESS").setConcealed().setPages(new ResearchPage[]{ new ResearchPage("1"), new ResearchPage((InfusionRecipe) recipes.get("ItemKatana:0")) }).registerResearchItem(); - new TaintedMagicResearchItem("VOIDMETALKATANA", TM, new AspectList().add(Aspect.METAL, 16).add(Aspect.MAGIC, 8).add(Aspect.WEAPON, 12).add(Aspect.VOID, 12), 3, -9, 0, new ItemStack(ItemRegistry.ItemKatana, 1, 1)).setParentsHidden("THAUMIUMKATANA").setParents("VOIDFORTRESS").setConcealed().setSecondary().setPages(new ResearchPage[]{ new ResearchPage("1"), new ResearchPage((InfusionRecipe) recipes.get("ItemKatana:1")) }).registerResearchItem(); + new TaintedMagicResearchItem("VOIDMETALKATANA", TM, new AspectList().add(Aspect.METAL, 16).add(Aspect.MAGIC, 8).add(Aspect.WEAPON, 12).add(Aspect.VOID, 12), 7, -10, 0, new ItemStack(ItemRegistry.ItemKatana, 1, 1)).setParentsHidden("THAUMIUMKATANA").setParents("VOIDFORTRESS").setConcealed().setSecondary().setPages(new ResearchPage[]{ new ResearchPage("1"), new ResearchPage((InfusionRecipe) recipes.get("ItemKatana:1")) }).registerResearchItem(); ThaumcraftApi.addWarpToResearch("VOIDMETALKATANA", 4); new TaintedMagicResearchItem("SHADOWMETALKATANA", TM, new AspectList().add(Aspect.METAL, 16).add(Aspect.MAGIC, 8).add(Aspect.WEAPON, 12).add(Aspect.VOID, 12).add(Aspect.DARKNESS, 14), 0, 6, 0, new ItemStack(ItemRegistry.ItemKatana, 1, 2)).setParentsHidden("VOIDMETALKATANA").setParents("SHADOWFORTRESSARMOR").setConcealed().setSecondary().setPages(new ResearchPage[]{ new ResearchPage("1"), new ResearchPage((InfusionRecipe) recipes.get("ItemKatana:2")) }).registerResearchItem(); diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index a6cb512..e6b561b 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -2,8 +2,8 @@ { "modid": "TaintedMagic", "name": "Tainted Magic", - "description": "A TC4 addon that brings you to the dark side of Thaumaturgy...", - "version": "r7.81", + "description": "An intercrete addon to Thaumcraft 4 that will elaborate the darker nuances of Thaumaturgy.", + "version": "r7.82", "mcversion": "1.7.10", "url": "http://bitly.com/1HV2VSK", "updateUrl": "", diff --git a/version.txt b/version.txt index 4d9fece..0f9796e 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -r7.81 \ No newline at end of file +r7.82 \ No newline at end of file