diff --git a/Formatters.xml b/Formatters.xml
new file mode 100644
index 0000000..378fe11
--- /dev/null
+++ b/Formatters.xml
@@ -0,0 +1,380 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/build.gradle b/build.gradle
index 2caf53b..a53090a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,14 +1,14 @@
-buildscript
+buildscript
{
- repositories
+ repositories
{
mavenCentral()
- maven
+ maven
{
name = "forge"
url = "http://files.minecraftforge.net/maven"
}
- maven
+ maven
{
name = "sonatype"
url = "https://oss.sonatype.org/content/repositories/snapshots/"
@@ -29,7 +29,7 @@ version = "${config.mod_version}"
group= "com.yorkeJohn.taintedmagic"
archivesBaseName = "${config.mod_name}"
-minecraft
+minecraft
{
version = "1.7.10-10.13.4.1448-1.7.10"
runDir = "run"
@@ -44,24 +44,24 @@ processResources
inputs.property "version", project.version
inputs.property "mcversion", project.minecraft.version
- from(sourceSets.main.resources.srcDirs)
+ from(sourceSets.main.resources.srcDirs)
{
include 'mcmod.info'
}
-
- from(sourceSets.main.resources.srcDirs)
+
+ from(sourceSets.main.resources.srcDirs)
{
exclude 'mcmod.info'
}
}
-def parseConfig(File config)
-{
- config.withReader
- {
- def prop = new Properties()
- prop.load(it)
- return (new ConfigSlurper().parse(prop))
- }
-}
\ No newline at end of file
+def parseConfig(File config)
+{
+ config.withReader
+ {
+ def prop = new Properties()
+ prop.load(it)
+ return (new ConfigSlurper().parse(prop))
+ }
+}
diff --git a/changelog.txt b/changelog.txt
new file mode 100644
index 0000000..cfb3d92
--- /dev/null
+++ b/changelog.txt
@@ -0,0 +1,159 @@
+
+#Tainted Magic Changelog
+
+------------------------------------------------------------ r7.0 --------------------------------------------------------------
+
+Initial release of Release 7. Significant changes from Release 6. Release 6 worlds are not compatible with this update.
+
+------------------------------------------------------------ r7.1 --------------------------------------------------------------
+
+- Bug fixes, fixed crashes.
+
+------------------------------------------------------------ r7.2 --------------------------------------------------------------
+
+Fixes:
+- Various bug fixes and texture improvements.
+- Fixed the Thaumic Disassembler text.
+- Fixed the Thaumonomicon entry for Shadowmetal Fortress armor, and Thaumium Fortress Blades.
+- Fixed a few recipes.
+
+Changes:
+- Tweaked the rendering, animation, and sfx for the Tainted Storm wand focus.
+- Tweaked some rendering for the Fortress Blades.
+
+Additions:
+- Upgrades to the Fortress Blades as inscriptions.
+- Hold down right click to charge a fortress blade, releasing a powered strike.
+
+------------------------------------------------------------ r7.3 --------------------------------------------------------------
+
+Fixes:
+- Fixed some Thaumonomicon entries.
+- Fixed some values.
+
+Additions:
+- Voidmetal Goggles of Revealing.
+
+------------------------------------------------------------ r7.4 --------------------------------------------------------------
+
+Fixes:
+- Fixed some Thaumonomicon entries.
+- Bug fixes.
+
+Changes:
+- HUD changes.
+- Changes to the Stormbound Inscription
+
+------------------------------------------------------------ r7.5 --------------------------------------------------------------
+
+- Bug fixes.
+
+------------------------------------------------------------ r7.6 --------------------------------------------------------------
+
+Fixes:
+- Fixed some oredict stuff.
+- Code cleanup.
+
+Changes:
+- Removed the stormbound inscription and replaced it with the undead inscription.
+- Changed the volcanic inscription to emit a single explosive fireball.
+- Balanced katana projectile damage.
+- Retextured some stuff
+- Made the Shard of Creation research secondary.
+
+Additions:
+- Added the Undead Inscription.
+- Added the Vis Shard focus from TC5.
+
+------------------------------------------------------------ r7.7 --------------------------------------------------------------
+
+Fixes:
+- Bug fixes and code cleanup.
+- Fixed various rendering problems... finally.
+
+Changes:
+- Adjusted damage values for the Fortress Blades and certain foci.
+- New thaumonomicon layout.
+- Reworked thaumonomicon prerequisites.
+- Texture changes.
+- New formula to calculate the recharge rate of the Warpwood Wand Rod / Staff Core
+- Some thaumonomicon entries were rewritten.
+- Recipe adjustments.
+- Reworked focus upgrades.
+- Reworked the Tainted Storm focus with a new renderer and movement physics.
+
+Additions:
+- Lumos focus.
+- Diffusion upgrade for the Dark Matter focus.
+- Shadowmetal nuggets.
+- Particles when using the Time and Meteorology foci.
+
+------------------------------------------------------------ r7.8 --------------------------------------------------------------
+
+Fixes:
+- Fixed bugs where servers would crash under certain conditions.
+- Other bug fixes.
+
+Changes:
+- Improved some particle effects.
+- Texture improvements.
+- Made adjustments to recipes.
+- Made adjustments to research and prerequisites.
+
+Additions:
+- Flyte Charm.
+- New materials (stolen from Thaumcraft 6)
+
+----------------------------------------------------------- r7.81 --------------------------------------------------------------
+
+- Bug fixes.
+
+----------------------------------------------------------- r7.82 --------------------------------------------------------------
+
+- Bug fixes.
+- Thaumonomicon layout improvements.
+
+----------------------------------------------------------- r8.0 ---------------------------------------------------------------
+
+Fixes:
+- Fixed a bug in which foci could not be upgraded when playing on a server.
+- Fixed a bug where a Kanata with the Volcanic Inscription would deal damage within an ungodly radius.
+- Fixed a bug where the Lumos focus would replace nodes.
+
+Changes:
+- Shadowmetal -> Shadow Metal.
+- Changed the system for obtaining materials to make Crimson Cult equipment.
+- Replaced the Crystal Dagger with the Hollow Dagger.
+- Replaced Phial of Crystal Blood with Phial of Crimson Blood.
+- To obtain Phials of Crimson Blood the player must kill entities with a Hollow Dagger and must have empty Glass Phials in their inventory.
+- Removed the "Bloodlust" attribute from weapons with which Crystal Blood was previously obtainable. Phials of Crimson Blood now may only be obtained with a Hollow Dagger.
+- Replaced the Tainted Shockwave focus with the Shockwave Focus, see additions for details. The crafting recipe for this item was changed significantly as well.
+- Replaced the Tainted Storm focus with the Taint Swarm focus. Complete overhaul, see additions.
+- Removed the Glowpet and Lumos Maxima upgrades to the Lumos focus. To replace the functionality of the Glowpet upgrade, the Ring of Lumos has been added. See additions for details.
+- Lumos light sources now have a hitbox.
+- Removed the Meteorology and Time foci, replaced with Salis Tempestas and Salis Aevus respectively. See additions for details.
+- Warpwood Saplings can no longer be crafted via infusion. Warping Fertilizer must be used on a Silverwood Sapling to create a Warpwood Sapling.
+- Changed how Warpwood trees grow, as well as the leaf and log textures. They now are shaped like Silverwood trees.
+- Changed the formula with which the Warpwood Wand/Staff's vis replenishment rate is calculated.
+- Slightly changed the visual effects for Lumos light sources.
+- Voidsent Blood can now be applied to any armour.
+- The player now must first research the diffusion upgrade before they can apply it to the Dark Matter Focus.
+- Replaced the Tainted Kanata Inscription with the Shockwave inscription. Works like a mini Shockwave focus.
+- Significantly changed recipes for Crimson Cult Equipment.
+- Changed many recipes to make them more balanced. Some recipes were weirdly difficult.
+- Changed textures.
+- Significantly changed Thaumonomicon entries and research.
+
+Additions:
+- Re-added the old particles when walking with the Boots of the Voidwalker. Not as invasive as the original.
+- Added Atropa Belladona plants which grow at the base of Warpwood Trees, dropping Nightshade Berries when broken.
+- Added Nightshade Berries. Instant kill if eaten. Used in crafting. More uses to be added in the future.
+- Added Warping Fertilizer.
+- Added the Fragment of Creation. Sub unit of the Shard of Creation. 1 shard can be broken down into 9 fragments. Used for crafting recipes that require some creation-y goodness but where an entire shard would be too expensive.
+- Added Salis Tempestas and Salis Aevus. Salis Mundus-style powders. When thrown they change the weather or time respectively, the same way that the Meterology and Time foci did in previous versions. Single use but not overly difficult to craft.
+- Added the Shockwave Focus. Works the same as the Tainted Shockwave used to, but attacks them with lightning instead.
+- Added the Taint Swarm focus. The focus summons a tamed Taint Swarm to fight for the player. The player must be looking at a valid target to summon a swarm. The swarm will path find to this target and will only attack this target. The swarm dies when the target dies. The focus can be used on cooldown to summon multiple swarms.
+- Added a way to synthetically product Vishrooms. Why? No idea. Probably the warp made me add it.
+- Added a config option to define how powerful the Mage's Mace focus is.
+- Added a way to display info to the player temporarily on the hud instead of via chat messages. Used in various places.
+- Added the Celestial Gatekey. Bind it to a location to return to that location from anywhere within the same dimension. One location per key, bound location is permanent.
diff --git a/src/main/resources/assets/taintedmagic/lang/ja_JP.lang b/old_lang/ja_JP.lang
similarity index 100%
rename from src/main/resources/assets/taintedmagic/lang/ja_JP.lang
rename to old_lang/ja_JP.lang
diff --git a/src/main/resources/assets/taintedmagic/lang/zh_CN.lang b/old_lang/zh_CN.lang
similarity index 100%
rename from src/main/resources/assets/taintedmagic/lang/zh_CN.lang
rename to old_lang/zh_CN.lang
diff --git a/zh_CN.lang b/old_lang/zh_CN_2.lang
similarity index 100%
rename from zh_CN.lang
rename to old_lang/zh_CN_2.lang
diff --git a/src/main/java/taintedmagic/api/IHeldItemHUD.java b/src/main/java/taintedmagic/api/IHeldItemHUD.java
index 805bc14..ee81c39 100644
--- a/src/main/java/taintedmagic/api/IHeldItemHUD.java
+++ b/src/main/java/taintedmagic/api/IHeldItemHUD.java
@@ -6,5 +6,5 @@ import net.minecraft.item.ItemStack;
public interface IHeldItemHUD
{
- abstract void renderHUD (ScaledResolution res, EntityPlayer p, ItemStack s, float partialTicks, float fract);
+ abstract void renderHUD (ScaledResolution res, EntityPlayer p, ItemStack s, float partialTicks, float fract);
}
diff --git a/src/main/java/taintedmagic/api/RecipeVoidsentBlood.java b/src/main/java/taintedmagic/api/RecipeVoidsentBlood.java
index 9ca3b1e..7d87e2e 100644
--- a/src/main/java/taintedmagic/api/RecipeVoidsentBlood.java
+++ b/src/main/java/taintedmagic/api/RecipeVoidsentBlood.java
@@ -13,57 +13,60 @@ import taintedmagic.common.items.ItemVoidsentBlood;
*/
public class RecipeVoidsentBlood implements IRecipe
{
- @Override
- public boolean matches (InventoryCrafting inv, World w)
- {
- boolean foundBlood = false;
- boolean foundArmor = false;
+ @Override
+ public boolean matches (InventoryCrafting inv, World w)
+ {
+ boolean foundBlood = false;
+ boolean foundArmor = false;
- for (int i = 0; i < inv.getSizeInventory(); i++)
- {
- ItemStack s = inv.getStackInSlot(i);
+ for (int i = 0; i < inv.getSizeInventory(); i++)
+ {
+ ItemStack s = inv.getStackInSlot(i);
- if (s != null)
- {
- if (s.getItem() instanceof ItemVoidsentBlood && !foundBlood) foundBlood = true;
- else if (s.getItem() instanceof ItemArmor && !foundArmor) foundArmor = true;
+ if (s != null)
+ {
+ if (s.getItem() instanceof ItemVoidsentBlood && !foundBlood) foundBlood = true;
+ else if (s.getItem() instanceof ItemArmor && !foundArmor) foundArmor = true;
- else return false;
- }
- }
- return foundBlood && foundArmor;
- }
+ else return false;
+ }
+ }
+ return foundBlood && foundArmor;
+ }
- @Override
- public ItemStack getCraftingResult (InventoryCrafting inv)
- {
- ItemStack copy = null;
- ItemStack armor = null;
- ItemStack blood = null;
+ @Override
+ public ItemStack getCraftingResult (InventoryCrafting inv)
+ {
+ ItemStack copy = null;
+ ItemStack armor = null;
+ ItemStack blood = null;
- for (int i = 0; i < inv.getSizeInventory(); i++)
- {
- if (inv.getStackInSlot(i) != null && inv.getStackInSlot(i).getItem() instanceof ItemArmor) armor = inv.getStackInSlot(i);
- else if (inv.getStackInSlot(i) != null && inv.getStackInSlot(i).getItem() instanceof ItemVoidsentBlood) blood = inv.getStackInSlot(i);
- }
- if (armor != null && blood != null && (armor.getTagCompound() == null || (armor.getTagCompound() != null && !armor.getTagCompound().getBoolean("voidtouched"))))
- {
- copy = armor.copy();
- if (copy.getTagCompound() == null) copy.setTagCompound(new NBTTagCompound());
- if (copy.getTagCompound() != null) copy.getTagCompound().setBoolean("voidtouched", true);
- }
- return copy;
- }
+ for (int i = 0; i < inv.getSizeInventory(); i++)
+ {
+ if (inv.getStackInSlot(i) != null && inv.getStackInSlot(i).getItem() instanceof ItemArmor) armor = inv
+ .getStackInSlot(i);
+ else if (inv.getStackInSlot(i) != null && inv.getStackInSlot(i).getItem() instanceof ItemVoidsentBlood) blood = inv
+ .getStackInSlot(i);
+ }
+ if (armor != null && blood != null && (armor.getTagCompound() == null || (armor.getTagCompound() != null && !armor
+ .getTagCompound().getBoolean("voidtouched"))))
+ {
+ copy = armor.copy();
+ if (copy.getTagCompound() == null) copy.setTagCompound(new NBTTagCompound());
+ if (copy.getTagCompound() != null) copy.getTagCompound().setBoolean("voidtouched", true);
+ }
+ return copy;
+ }
- @Override
- public int getRecipeSize ()
- {
- return 10;
- }
+ @Override
+ public int getRecipeSize ()
+ {
+ return 10;
+ }
- @Override
- public ItemStack getRecipeOutput ()
- {
- return null;
- }
+ @Override
+ public ItemStack getRecipeOutput ()
+ {
+ return null;
+ }
}
diff --git a/src/main/java/taintedmagic/client/ClientProxy.java b/src/main/java/taintedmagic/client/ClientProxy.java
index 207cbbb..93c0227 100644
--- a/src/main/java/taintedmagic/client/ClientProxy.java
+++ b/src/main/java/taintedmagic/client/ClientProxy.java
@@ -2,6 +2,7 @@ package taintedmagic.client;
import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.client.registry.RenderingRegistry;
+import cpw.mods.fml.common.FMLCommonHandler;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World;
@@ -21,35 +22,36 @@ import thaumcraft.client.renderers.entity.RenderEldritchOrb;
public class ClientProxy extends CommonProxy
{
+ @Override
+ public void registerClientHandlers ()
+ {
+ MinecraftForge.EVENT_BUS.register(new HUDHandler());
- @Override
- public void registerClientHandlers ()
- {
- MinecraftForge.EVENT_BUS.register(new HUDHandler());
- MinecraftForge.EVENT_BUS.register(new ClientHandler());
- }
+ FMLCommonHandler.instance().bus().register(new ClientHandler());
+ MinecraftForge.EVENT_BUS.register(new ClientHandler());
+ }
- @Override
- public void registerRenderers ()
- {
- // Entities
- RenderingRegistry.registerEntityRenderingHandler(EntityDarkMatter.class, new RenderEldritchOrb());
- RenderingRegistry.registerEntityRenderingHandler(EntityHomingShard.class, new RenderEntityHomingShard());
- RenderingRegistry.registerEntityRenderingHandler(EntityDiffusion.class, new RenderEntityDiffusion());
+ @Override
+ public void registerRenderers ()
+ {
+ // Entities
+ RenderingRegistry.registerEntityRenderingHandler(EntityDarkMatter.class, new RenderEldritchOrb());
+ RenderingRegistry.registerEntityRenderingHandler(EntityHomingShard.class, new RenderEntityHomingShard());
+ RenderingRegistry.registerEntityRenderingHandler(EntityDiffusion.class, new RenderEntityDiffusion());
- // Items
- MinecraftForgeClient.registerItemRenderer(ItemRegistry.ItemKatana, new RenderItemKatana());
- }
+ // Items
+ MinecraftForgeClient.registerItemRenderer(ItemRegistry.ItemKatana, new RenderItemKatana());
+ }
- @Override
- public EntityPlayer getClientPlayer ()
- {
- return Minecraft.getMinecraft().thePlayer;
- }
+ @Override
+ public EntityPlayer getClientPlayer ()
+ {
+ return Minecraft.getMinecraft().thePlayer;
+ }
- @Override
- public World getClientWorld ()
- {
- return FMLClientHandler.instance().getClient().theWorld;
- }
+ @Override
+ public World getClientWorld ()
+ {
+ return FMLClientHandler.instance().getClient().theWorld;
+ }
}
diff --git a/src/main/java/taintedmagic/client/handler/ClientHandler.java b/src/main/java/taintedmagic/client/handler/ClientHandler.java
index 2c6d56f..61f9704 100644
--- a/src/main/java/taintedmagic/client/handler/ClientHandler.java
+++ b/src/main/java/taintedmagic/client/handler/ClientHandler.java
@@ -4,6 +4,9 @@ import java.util.ArrayList;
import java.util.List;
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;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@@ -11,28 +14,41 @@ import net.minecraft.potion.Potion;
import net.minecraftforge.client.event.RenderPlayerEvent;
import taintedmagic.api.IRenderInventoryItem;
+@SideOnly (Side.CLIENT)
public class ClientHandler
{
- /*
- * Render items implementing IRenderInventoryItem
- */
- @SubscribeEvent
- public void onPlayerRender (RenderPlayerEvent.Specials.Post event)
- {
- EntityPlayer p = event.entityPlayer;
- if (p.getActivePotionEffect(Potion.invisibility) != null) return;
-
- ItemStack[] inv = p.inventory.mainInventory;
- List- rendering = new ArrayList
- ();
- for (int i = 0; i < 36; i++)
- {
- ItemStack s = inv[i];
- if (s != null && s.getItem() instanceof IRenderInventoryItem && !rendering.contains(s.getItem()))
- {
- ((IRenderInventoryItem) s.getItem()).render(p, s, event.partialRenderTick);
- rendering.add(s.getItem());
- }
- if (i == 36) rendering.clear();
- }
- }
+ public static int ticks;
+
+ @SubscribeEvent
+ public void tickEnd (TickEvent event)
+ {
+ if (event.phase == TickEvent.Phase.END)
+ {
+ HUDHandler.updateTicks();
+ ticks++;
+ }
+ }
+
+ /*
+ * Render items implementing IRenderInventoryItem
+ */
+ @SubscribeEvent
+ public void onPlayerRender (RenderPlayerEvent.Specials.Post event)
+ {
+ EntityPlayer p = event.entityPlayer;
+ if (p.getActivePotionEffect(Potion.invisibility) != null) return;
+
+ ItemStack[] inv = p.inventory.mainInventory;
+ List
- rendering = new ArrayList
- ();
+ for (int i = 0; i < 36; i++)
+ {
+ ItemStack s = inv[i];
+ if (s != null && s.getItem() instanceof IRenderInventoryItem && !rendering.contains(s.getItem()))
+ {
+ ((IRenderInventoryItem) s.getItem()).render(p, s, event.partialRenderTick);
+ rendering.add(s.getItem());
+ }
+ if (i == 36) rendering.clear();
+ }
+ }
}
diff --git a/src/main/java/taintedmagic/client/handler/HUDHandler.java b/src/main/java/taintedmagic/client/handler/HUDHandler.java
index 935656d..2640d29 100644
--- a/src/main/java/taintedmagic/client/handler/HUDHandler.java
+++ b/src/main/java/taintedmagic/client/handler/HUDHandler.java
@@ -1,11 +1,19 @@
package taintedmagic.client.handler;
+import java.awt.Color;
+
+import org.lwjgl.opengl.GL11;
+
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.gui.ScaledResolution;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.MathHelper;
import net.minecraftforge.client.event.RenderGameOverlayEvent;
import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType;
import taintedmagic.api.IHeldItemHUD;
@@ -14,40 +22,90 @@ import taintedmagic.common.TaintedMagic;
@SideOnly (Side.CLIENT)
public class HUDHandler
{
- float ticksEquipped = 0.0F;
- ItemStack s = null;
- ItemStack last = null;
-
@SubscribeEvent
- public void onDrawScreen (RenderGameOverlayEvent.Post event)
+ public void renderGameOverlayEvent (RenderGameOverlayEvent.Post event)
{
if (event.type == ElementType.ALL)
{
- EntityPlayer p = TaintedMagic.proxy.getClientPlayer();
- float partialTicks = event.partialTicks;
- if (s != null && s.getItem() instanceof IHeldItemHUD) last = s.copy();
- s = p.getCurrentEquippedItem();
+ renderHeldItemHUD(event.partialTicks);
+ renderString();
+ }
+ }
- if (Minecraft.getMinecraft().currentScreen == null)
+ private static float ticksEquipped = 0.0F;
+ private static ItemStack s = null;
+ private static ItemStack last = null;
+
+ private void renderHeldItemHUD (float pt)
+ {
+ EntityPlayer p = TaintedMagic.proxy.getClientPlayer();
+ Minecraft mc = Minecraft.getMinecraft();
+ ScaledResolution res = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight);
+
+ if (s != null && s.getItem() instanceof IHeldItemHUD) last = s.copy();
+ s = p.getCurrentEquippedItem();
+
+ boolean b = false;
+ if (s != null && s.getItem() instanceof IHeldItemHUD) b = true;
+ else b = false;
+
+ float time = 30.0F;
+ if (b) ticksEquipped = Math.min(time, ticksEquipped + pt);
+ else ticksEquipped = Math.max(0F, ticksEquipped - pt);
+
+ float fract = ticksEquipped / time;
+
+ if (b) ((IHeldItemHUD) s.getItem()).renderHUD(res, p, s, pt, fract);
+ else if (!b && ticksEquipped != 0) ((IHeldItemHUD) last.getItem()).renderHUD(res, p, last, pt, fract);
+ }
+
+ private static String currentStr;
+ private static int start;
+ private static int ticks;
+ private static boolean gay;
+
+ public static void displayStringRainbow (String str, int display)
+ {
+ }
+
+ public static void displayString (String str, int duration, boolean rainbow)
+ {
+ currentStr = str;
+ ticks = start = duration;
+ gay = rainbow;
+ }
+
+ public static void updateTicks ()
+ {
+ if (ticks > 0) ticks--;
+ }
+
+ private void renderString ()
+ {
+ if (ticks > 0 && !MathHelper.stringNullOrLengthZero(currentStr))
+ {
+ Minecraft mc = Minecraft.getMinecraft();
+ ScaledResolution res = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight);
+ int x = res.getScaledWidth();
+ int y = res.getScaledHeight();
+ FontRenderer font = mc.fontRenderer;
+
+ int startX = (x - font.getStringWidth(currentStr)) / 2;
+ int startY = y - 72;
+
+ int opacity = ticks > ((float) start * 0.25F) ? 255 : (int) (255F * ((float) ticks / ((float) start * 0.25F)));
+ if (opacity < 5) opacity = 0;
+
+ int rgb = Color.HSBtoRGB( ((float) (start - ticks) / (float) start), 1.0F, 1.0F);
+
+ if (opacity > 0)
{
- boolean b = false;
- if (s != null && s.getItem() instanceof IHeldItemHUD) b = true;
- else b = false;
-
- float time = 30F;
- if (b) ticksEquipped = Math.min(time, ticksEquipped + partialTicks);
- else ticksEquipped = Math.max(0F, ticksEquipped - partialTicks);
-
- float fract = ticksEquipped / time;
-
- if (b)
- {
- ((IHeldItemHUD) s.getItem()).renderHUD(event.resolution, p, s, partialTicks, fract);
- }
- if (!b && ticksEquipped != 0)
- {
- ((IHeldItemHUD) last.getItem()).renderHUD(event.resolution, p, last, partialTicks, fract);
- }
+ GL11.glPushMatrix();
+ GL11.glEnable(GL11.GL_BLEND);
+ GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
+ font.drawStringWithShadow(currentStr, startX, startY, (gay ? rgb : 0xFFFFFF) + (opacity << 24));
+ GL11.glDisable(GL11.GL_BLEND);
+ GL11.glPopMatrix();
}
}
}
diff --git a/src/main/java/taintedmagic/common/CommonProxy.java b/src/main/java/taintedmagic/common/CommonProxy.java
index 582407c..b49b401 100644
--- a/src/main/java/taintedmagic/common/CommonProxy.java
+++ b/src/main/java/taintedmagic/common/CommonProxy.java
@@ -1,25 +1,26 @@
package taintedmagic.common;
import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
public class CommonProxy
{
- public void registerClientHandlers ()
- {
- }
-
- public void registerRenderers ()
- {
- }
+ public void registerClientHandlers ()
+ {
+ }
- public EntityPlayer getClientPlayer ()
- {
- return null;
- }
+ public void registerRenderers ()
+ {
+ }
- public World getClientWorld ()
- {
- return null;
- }
+ public EntityPlayer getClientPlayer ()
+ {
+ return null;
+ }
+
+ public World getClientWorld ()
+ {
+ return null;
+ }
}
diff --git a/src/main/java/taintedmagic/common/TaintedMagic.java b/src/main/java/taintedmagic/common/TaintedMagic.java
index 589c789..b2e634c 100644
--- a/src/main/java/taintedmagic/common/TaintedMagic.java
+++ b/src/main/java/taintedmagic/common/TaintedMagic.java
@@ -65,10 +65,9 @@ public class TaintedMagic
BlockRegistry.initTiles();
ModEntityRegistry.init();
RecipeRegistry.init();
-
OreDictionaryRegistry.init();
- if (configHandler.useUpdateHandler) UpdateHandler.init();
+ if (configHandler.UPDATE_HANDLER) UpdateHandler.init();
}
// Init
diff --git a/src/main/java/taintedmagic/common/TaintedMagicCreativeTab.java b/src/main/java/taintedmagic/common/TaintedMagicCreativeTab.java
index eb49706..3ae2ddf 100644
--- a/src/main/java/taintedmagic/common/TaintedMagicCreativeTab.java
+++ b/src/main/java/taintedmagic/common/TaintedMagicCreativeTab.java
@@ -6,6 +6,7 @@ import java.util.List;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagByte;
import taintedmagic.common.helper.TaintedMagicHelper;
import taintedmagic.common.lib.LibInfo;
import taintedmagic.common.registry.ItemRegistry;
@@ -25,23 +26,32 @@ public class TaintedMagicCreativeTab extends CreativeTabs
public void displayAllReleventItems (List l)
{
super.displayAllReleventItems(l);
- ItemStack wand = new ItemStack(ConfigItems.itemWandCasting);
- ItemWandCasting wandCasting = (ItemWandCasting) wand.getItem();
+
+ ItemStack s = new ItemStack(ConfigItems.itemWandCasting);
+ ItemWandCasting wand = (ItemWandCasting) s.getItem();
- wandCasting.setCap(wand, ItemRegistry.WAND_CAP_SHADOWMETAL);
- wandCasting.setRod(wand, ItemRegistry.STAFF_ROD_WARPWOOD);
- wandCasting.storeAllVis(wand, TaintedMagicHelper.getPrimals(50000));
+ wand.setCap(s, ItemRegistry.WAND_CAP_SHADOWMETAL);
+ wand.setRod(s, ItemRegistry.STAFF_ROD_WARPWOOD);
+ wand.storeAllVis(s, TaintedMagicHelper.getPrimals(wand.getMaxVis(s)));
- if (l != null) l.add(0, wand);
+ if (l != null) l.add(0, s);
- wand = new ItemStack(ConfigItems.itemWandCasting);
- wandCasting = (ItemWandCasting) wand.getItem();
+ ItemStack s2 = s.copy();
+ ItemWandCasting wand2 = (ItemWandCasting) s2.getItem();
- wandCasting.setCap(wand, ItemRegistry.WAND_CAP_SHADOWMETAL);
- wandCasting.setRod(wand, ItemRegistry.WAND_ROD_WARPWOOD);
- wandCasting.storeAllVis(wand, TaintedMagicHelper.getPrimals(25000));
+
+ wand2.setRod(s2, ItemRegistry.WAND_ROD_WARPWOOD);
+ wand2.storeAllVis(s2, TaintedMagicHelper.getPrimals(wand2.getMaxVis(s2)));
- if (l != null) l.add(1, wand);
+ if (l != null) l.add(1, s2);
+
+ ItemStack s3 = s2.copy();
+ ItemWandCasting wand3 = (ItemWandCasting) s3.getItem();
+
+ s3.setTagInfo("sceptre", new NBTTagByte((byte) 1));
+ wand3.storeAllVis(s3, TaintedMagicHelper.getPrimals(wand3.getMaxVis(s3)));
+
+ if (l != null) l.add(2, s3);
}
@Override
diff --git a/src/main/java/taintedmagic/common/blocks/BlockNightshadeBush.java b/src/main/java/taintedmagic/common/blocks/BlockNightshadeBush.java
new file mode 100644
index 0000000..746aa7d
--- /dev/null
+++ b/src/main/java/taintedmagic/common/blocks/BlockNightshadeBush.java
@@ -0,0 +1,60 @@
+package taintedmagic.common.blocks;
+
+import java.util.Random;
+
+import net.minecraft.block.BlockBush;
+import net.minecraft.block.material.Material;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.item.Item;
+import net.minecraft.potion.Potion;
+import net.minecraft.potion.PotionEffect;
+import net.minecraft.util.DamageSource;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
+import taintedmagic.common.TaintedMagic;
+import taintedmagic.common.registry.ItemRegistry;
+
+public class BlockNightshadeBush extends BlockBush
+{
+ public BlockNightshadeBush ()
+ {
+ super(Material.plants);
+ this.setBlockName("BlockNightshadeBush");
+ this.setBlockTextureName("taintedmagic:BlockNightshadeBush");
+ this.setCreativeTab(TaintedMagic.tabTaintedMagic);
+ this.setStepSound(soundTypeGrass);
+ }
+
+ public Item getItemDropped (int a, Random r, int b)
+ {
+ return ItemRegistry.ItemNightshadeBerries;
+ }
+
+ public int quantityDropped (Random r)
+ {
+ return 1 + r.nextInt(3);
+ }
+
+ public void onEntityCollidedWithBlock (World w, int x, int y, int z, Entity e)
+ {
+ super.onEntityCollidedWithBlock(w, x, y, z, e);
+
+ if (e instanceof EntityLivingBase)
+ {
+ e.attackEntityFrom(new DamageSource("nightshade"), 1.0F);
+ ((EntityLivingBase) e).addPotionEffect(new PotionEffect(Potion.poison.id, 100, 0));
+ }
+ }
+
+ public int getFlammability (IBlockAccess w, int x, int y, int z, ForgeDirection face)
+ {
+ return 100;
+ }
+
+ public int getFireSpreadSpeed (IBlockAccess w, int x, int y, int z, ForgeDirection face)
+ {
+ return 60;
+ }
+}
diff --git a/src/main/java/taintedmagic/common/blocks/BlockWarpwoodLeaves.java b/src/main/java/taintedmagic/common/blocks/BlockWarpwoodLeaves.java
index 00fd4f5..3dd358f 100644
--- a/src/main/java/taintedmagic/common/blocks/BlockWarpwoodLeaves.java
+++ b/src/main/java/taintedmagic/common/blocks/BlockWarpwoodLeaves.java
@@ -34,7 +34,7 @@ public class BlockWarpwoodLeaves extends Block implements IShearable
this.setCreativeTab(TaintedMagic.tabTaintedMagic);
this.setLightOpacity(0);
this.setHardness(0.1F);
- this.setStepSound(ConfigBlocks.blockTaint.stepSound);
+ this.setStepSound(soundTypeGrass);
this.setBlockName("BlockWarpwoodLeaves");
}
diff --git a/src/main/java/taintedmagic/common/blocks/BlockWarpwoodSapling.java b/src/main/java/taintedmagic/common/blocks/BlockWarpwoodSapling.java
index 7050929..455c00e 100644
--- a/src/main/java/taintedmagic/common/blocks/BlockWarpwoodSapling.java
+++ b/src/main/java/taintedmagic/common/blocks/BlockWarpwoodSapling.java
@@ -8,6 +8,7 @@ import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.BlockSapling;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
@@ -27,20 +28,17 @@ public class BlockWarpwoodSapling extends BlockSapling
}
@Override
- public void func_149878_d (World world, int x, int y, int z, Random rand)
+ public void func_149878_d (World w, int x, int y, int z, Random rand)
{
- if (!world.isRemote)
+ if (!w.isRemote)
{
- int meta = world.getBlockMetadata(x, y, z);
+ int meta = w.getBlockMetadata(x, y, z);
- world.setBlockToAir(x, y, z);
+ w.setBlockToAir(x, y, z);
- WorldGenWarpwoodTree tree = new WorldGenWarpwoodTree(true, BlockRegistry.BlockWarpwoodLog, BlockRegistry.BlockWarpwoodLeaves);
+ WorldGenWarpwoodTree tree = new WorldGenWarpwoodTree(true, 7, 5);
- if (!tree.generate(world, rand, x, y, z))
- {
- world.setBlock(x, y, z, this, meta, 2);
- }
+ if (!tree.generate(w, rand, x, y, z)) w.setBlock(x, y, z, this, meta, 2);
}
}
diff --git a/src/main/java/taintedmagic/common/handler/ConfigHandler.java b/src/main/java/taintedmagic/common/handler/ConfigHandler.java
index d93230a..4a4e91d 100644
--- a/src/main/java/taintedmagic/common/handler/ConfigHandler.java
+++ b/src/main/java/taintedmagic/common/handler/ConfigHandler.java
@@ -2,15 +2,18 @@ package taintedmagic.common.handler;
import net.minecraftforge.common.config.Configuration;
import taintedmagic.common.TaintedMagic;
+import thaumcraft.api.wands.FocusUpgradeType;
public class ConfigHandler
{
public static Configuration config;
- public static boolean useUpdateHandler = true;
- public static boolean researchTags = true;
- public static boolean useCustomResearchTabBackground = false;
- public static double baseMaceDamageIncrease = 8.0D;
+ public static boolean UPDATE_HANDLER = true;
+ public static boolean RESEARCH_TAGS = true;
+ public static boolean CUSTOM_RESEARCH_TAB_BACK = false;
+ public static double MAGE_MACE_DMG_INC_BASE = 8.0D;
+ public static float WARP_WAND_REFRESH_BASE = 10000.0F;
+ public static int FOCUS_UPGRADES_START_ID = 64;
public static void init ()
{
@@ -18,11 +21,20 @@ public class ConfigHandler
config.load();
- useUpdateHandler = config.getBoolean("use_update_handler", "misc", true, "Should update notifications be enabled?");
- researchTags = config.getBoolean("research_tags", "research", true, "Setting this to false will disable the '[TaintedMagic]' tag on the research");
- useCustomResearchTabBackground = config.getBoolean("use_custom_research_tab_background", "research", false, "Setting this to true will enable the old custom tab background");
- baseMaceDamageIncrease = (double) config
- .getFloat("mage_mace_damage_increase_base", "misc", 8.0F, 1.0F, 100.0F, "Defines the base amount of damage to increase wand / staff attack damage by when the Mage's Mace focus is equipped.");
+ UPDATE_HANDLER = config.getBoolean("UPDATE_HANDLER", "misc", true, "Setting this to false will disable ingame chat Tainted Magic update notifications.");
+
+ RESEARCH_TAGS = config.getBoolean("RESEARCH_TAGS", "research", true, "Setting this to false will disable the '[categoryTM]' tag on Tainted Magic research items.");
+
+ CUSTOM_RESEARCH_TAB_BACK = config.getBoolean("CUSTOM_RESEARCH_TAB_BACK", "research", false, "Setting this to true will bring back the old Tainted Magic research tab background.");
+
+ MAGE_MACE_DMG_INC_BASE = (double) config
+ .getFloat("MAGE_MACE_DMG_INC_BASE", "misc", 8.0F, 1.0F, 100.0F, "Defines the base amount of damage to increase wand / staff attack damage by when the Mage's Mace focus is equipped.");
+
+ WARP_WAND_REFRESH_BASE = config
+ .getFloat("WARP_WAND_REFRESH_BASE", "misc", 10000.0F, 100.0F, 100000.0F, "Defines the base refresh period in ticks for the Warpwood Wand. The delay period between refreshs is calculated by dividing this number by the amount of permanant warp the player has accumulated.");
+
+ FOCUS_UPGRADES_START_ID = config.getInt("FOCUS_UPGRADES_START_ID", "misc", 64, FocusUpgradeType.types.length + 1, Short.MAX_VALUE
+ - 1, "Defines the starting ID for categoryTM focus upgrades. The first upgrade will be registered under this ID, the next under this ID +1, etc.");
config.save();
}
diff --git a/src/main/java/taintedmagic/common/handler/TMEventHandler.java b/src/main/java/taintedmagic/common/handler/TMEventHandler.java
index 812cd34..43454a4 100644
--- a/src/main/java/taintedmagic/common/handler/TMEventHandler.java
+++ b/src/main/java/taintedmagic/common/handler/TMEventHandler.java
@@ -3,13 +3,17 @@ package taintedmagic.common.handler;
import java.util.Random;
import java.util.UUID;
+import org.lwjgl.input.Keyboard;
+
import baubles.api.BaublesApi;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.gameevent.PlayerEvent;
import cpw.mods.fml.common.gameevent.PlayerEvent.ItemCraftedEvent;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.client.Minecraft;
import net.minecraft.entity.SharedMonsterAttributes;
import net.minecraft.entity.ai.attributes.AttributeModifier;
-import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.init.Blocks;
@@ -22,9 +26,10 @@ import net.minecraft.potion.PotionEffect;
import net.minecraft.util.ChatComponentText;
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 net.minecraftforge.event.entity.player.PlayerInteractEvent;
+import taintedmagic.common.items.ItemMaterial;
import taintedmagic.common.items.equipment.ItemLumosRing;
import taintedmagic.common.items.tools.ItemHollowDagger;
import taintedmagic.common.items.wand.foci.ItemFocusMageMace;
@@ -35,7 +40,10 @@ import thaumcraft.api.aspects.Aspect;
import thaumcraft.api.aspects.AspectList;
import thaumcraft.api.wands.StaffRod;
import thaumcraft.api.wands.WandRod;
+import thaumcraft.client.fx.ParticleEngine;
+import thaumcraft.client.fx.particles.FXSparkle;
import thaumcraft.common.Thaumcraft;
+import thaumcraft.common.blocks.BlockCustomPlant;
import thaumcraft.common.config.Config;
import thaumcraft.common.items.ItemEssence;
import thaumcraft.common.items.wands.ItemWandCasting;
@@ -43,268 +51,300 @@ import thaumcraft.common.lib.network.playerdata.PacketResearchComplete;
public class TMEventHandler
{
- Random randy = new Random();
+ Random random = new Random();
- @SubscribeEvent
- public void playerTick (LivingEvent.LivingUpdateEvent event)
- {
- if (event.entity instanceof EntityPlayer)
- {
- EntityPlayer p = (EntityPlayer) event.entity;
- modifyAttackDamage(p);
+ @SubscribeEvent
+ public void playerTick (LivingEvent.LivingUpdateEvent event)
+ {
+ if (event.entity instanceof EntityPlayer)
+ {
+ if (Keyboard.getEventKey() == Keyboard.KEY_T && Keyboard.isKeyDown(Keyboard.KEY_DELETE))
+ Minecraft.getMinecraft().refreshResources();
- /**
- * Repair voidtouched items
- */
- for (int i = 0; i < p.inventory.getSizeInventory(); i++)
- {
- ItemStack s = p.inventory.getStackInSlot(i);
- if (s != null)
- {
- if (s.stackTagCompound != null && s.stackTagCompound.getBoolean("voidtouched"))
- {
- if (!p.worldObj.isRemote && s.isItemDamaged() && p.ticksExisted % 20 == 0)
- {
- s.setItemDamage(s.getItemDamage() - 1);
- }
- }
- }
- }
+ EntityPlayer p = (EntityPlayer) event.entity;
- /**
- * Create lumos blocks when the player is holding a wand or staff
- * with the lumos focus equipped or when the Lumos ring is equipped.
- */
- if (p.getHeldItem() != null && p.getHeldItem().getItem() instanceof ItemWandCasting)
- {
- ItemStack s = p.getHeldItem();
- ItemWandCasting wand = (ItemWandCasting) s.getItem();
+ modifyAttackDamage(p);
+
+ /**
+ * Repair voidtouched items
+ */
+ for (int i = 0; i < p.inventory.getSizeInventory(); i++)
+ {
+ ItemStack s = p.inventory.getStackInSlot(i);
+ if (s != null)
+ {
+ if (s.stackTagCompound != null && s.stackTagCompound.getBoolean("voidtouched"))
+ {
+ if (!p.worldObj.isRemote && s.isItemDamaged() && p.ticksExisted % 20 == 0)
+ {
+ s.setItemDamage(s.getItemDamage() - 1);
+ }
+ }
+ }
+ }
- if (wand.getFocus(s) != null && wand.getFocus(s) == ItemRegistry.ItemFocusLumos && !p.worldObj.isRemote) createLumos(p, 1);
- }
- IInventory baub = BaublesApi.getBaubles(p);
- if ( (baub.getStackInSlot(1) != null && baub.getStackInSlot(1).getItem() instanceof ItemLumosRing)
- || (baub.getStackInSlot(2) != null && baub.getStackInSlot(2).getItem() instanceof ItemLumosRing))
- createLumos(p, 2);
- }
- }
+ /**
+ * Create lumos blocks when the player is holding a wand or staff
+ * with the lumos focus equipped or when the Lumos ring is equipped.
+ */
+ if (p.getHeldItem() != null && p.getHeldItem().getItem() instanceof ItemWandCasting)
+ {
+ ItemStack s = p.getHeldItem();
+ ItemWandCasting wand = (ItemWandCasting) s.getItem();
- /**
- * Creates lumos lightsource blocks.
- */
- public void createLumos (EntityPlayer p, int meta)
- {
- int x = Math.round((float) p.posX);
- int y = Math.round((float) p.posY) + 1;
- int z = Math.round((float) p.posZ);
+ if (wand.getFocus(s) != null && wand.getFocus(s) == ItemRegistry.ItemFocusLumos && !p.worldObj.isRemote)
+ createLumos(p, 1);
+ }
+ IInventory baub = BaublesApi.getBaubles(p);
+ if ( (baub.getStackInSlot(1) != null && baub.getStackInSlot(1).getItem() instanceof ItemLumosRing)
+ || (baub.getStackInSlot(2) != null && baub.getStackInSlot(2).getItem() instanceof ItemLumosRing))
+ createLumos(p, 2);
+ }
+ }
- if (p.worldObj.getBlock(x, y, z) == Blocks.air) p.worldObj.setBlock(x, y, z, BlockRegistry.BlockLumos, meta, 3);
- }
+ /**
+ * Creates lumos lightsource blocks.
+ */
+ public void createLumos (EntityPlayer p, int meta)
+ {
+ int x = (int) Math.floor(p.posX);
+ int y = (int) Math.floor(p.posY + 1);
+ int z = (int) Math.floor(p.posZ);
- /*
- * Some hacky code to make the mage's mace work...
- */
- public void modifyAttackDamage (EntityPlayer p)
- {
- if (!p.worldObj.isRemote)
- {
- IInventory inv = p.inventory;
+ if (p.worldObj.getBlock(x, y, z) == Blocks.air) p.worldObj.setBlock(x, y, z, BlockRegistry.BlockLumos, meta, 3);
+ }
- for (int i = 0; i < inv.getSizeInventory(); i++)
- {
- if (inv.getStackInSlot(i) != null && inv.getStackInSlot(i).getItem() instanceof ItemWandCasting)
- {
- ItemStack s = inv.getStackInSlot(i);
- ItemWandCasting wand = (ItemWandCasting) inv.getStackInSlot(i).getItem();
+ /*
+ * Some hacky code to make the mage's mace work...
+ */
+ public void modifyAttackDamage (EntityPlayer p)
+ {
+ if (!p.worldObj.isRemote)
+ {
+ IInventory inv = p.inventory;
- if (wand.getFocus(s) != null && wand.getFocus(s) == ItemRegistry.ItemFocusMageMace && wand.getRod(s) instanceof WandRod)
- {
- NBTTagList tags = new NBTTagList();
- NBTTagCompound tag = new NBTTagCompound();
- tag.setString("AttributeName", SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName());
+ for (int i = 0; i < inv.getSizeInventory(); i++)
+ {
+ if (inv.getStackInSlot(i) != null && inv.getStackInSlot(i).getItem() instanceof ItemWandCasting)
+ {
+ ItemStack s = inv.getStackInSlot(i);
+ ItemWandCasting wand = (ItemWandCasting) inv.getStackInSlot(i).getItem();
- UUID u = UUID.fromString("CB3F55D3-645C-4F38-A497-9C13A33DB5CF");
- AttributeModifier am = new AttributeModifier(u, "Weapon modifier", ConfigHandler.baseMaceDamageIncrease + wand.getFocusPotency(s), 0);
+ if (wand.getFocus(s) != null && wand.getFocus(s) == ItemRegistry.ItemFocusMageMace
+ && wand.getRod(s) instanceof WandRod)
+ {
+ NBTTagList tags = new NBTTagList();
+ NBTTagCompound tag = new NBTTagCompound();
+ tag.setString("AttributeName", SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName());
- tag.setString("Name", am.getName());
- tag.setDouble("Amount", am.getAmount());
- tag.setInteger("Operation", am.getOperation());
- tag.setLong("UUIDMost", am.getID().getMostSignificantBits());
- tag.setLong("UUIDLeast", am.getID().getLeastSignificantBits());
+ UUID u = UUID.fromString("CB3F55D3-645C-4F38-A497-9C13A33DB5CF");
+ AttributeModifier am = new AttributeModifier(u, "Weapon modifier",
+ ConfigHandler.MAGE_MACE_DMG_INC_BASE + wand.getFocusPotency(s), 0);
- tags.appendTag(tag);
- s.stackTagCompound.setTag("AttributeModifiers", tags);
- }
- else if (wand.getRod(s) instanceof WandRod)
- {
- if (!s.hasTagCompound())
- {
- s.setTagCompound(new NBTTagCompound());
- }
- s.stackTagCompound.removeTag("AttributeModifiers");
- }
- if (wand.getFocus(s) != null && wand.getFocus(s) == ItemRegistry.ItemFocusMageMace && wand.getRod(s) instanceof StaffRod)
- {
- NBTTagList tags = new NBTTagList();
- NBTTagCompound tag = new NBTTagCompound();
- tag.setString("AttributeName", SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName());
+ tag.setString("Name", am.getName());
+ tag.setDouble("Amount", am.getAmount());
+ tag.setInteger("Operation", am.getOperation());
+ tag.setLong("UUIDMost", am.getID().getMostSignificantBits());
+ tag.setLong("UUIDLeast", am.getID().getLeastSignificantBits());
- UUID u = UUID.fromString("CB3F55D3-645C-4F38-A497-9C13A33DB5CF");
- AttributeModifier am = new AttributeModifier(u, "Weapon modifier", 6.0D + ConfigHandler.baseMaceDamageIncrease + wand.getFocusPotency(s), 0);
+ tags.appendTag(tag);
+ s.stackTagCompound.setTag("AttributeModifiers", tags);
+ }
+ else if (wand.getRod(s) instanceof WandRod)
+ {
+ if (!s.hasTagCompound())
+ {
+ s.setTagCompound(new NBTTagCompound());
+ }
+ s.stackTagCompound.removeTag("AttributeModifiers");
+ }
+ if (wand.getFocus(s) != null && wand.getFocus(s) == ItemRegistry.ItemFocusMageMace
+ && wand.getRod(s) instanceof StaffRod)
+ {
+ NBTTagList tags = new NBTTagList();
+ NBTTagCompound tag = new NBTTagCompound();
+ tag.setString("AttributeName", SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName());
- tag.setString("Name", am.getName());
- tag.setDouble("Amount", am.getAmount());
- tag.setInteger("Operation", am.getOperation());
- tag.setLong("UUIDMost", am.getID().getMostSignificantBits());
- tag.setLong("UUIDLeast", am.getID().getLeastSignificantBits());
+ UUID u = UUID.fromString("CB3F55D3-645C-4F38-A497-9C13A33DB5CF");
+ AttributeModifier am = new AttributeModifier(u, "Weapon modifier",
+ 5.0D + ConfigHandler.MAGE_MACE_DMG_INC_BASE + wand.getFocusPotency(s), 0);
- tags.appendTag(tag);
- s.stackTagCompound.setTag("AttributeModifiers", tags);
- }
- else if (wand.getRod(s) instanceof StaffRod)
- {
- NBTTagList tags = new NBTTagList();
- NBTTagCompound tag = new NBTTagCompound();
- tag.setString("AttributeName", SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName());
+ tag.setString("Name", am.getName());
+ tag.setDouble("Amount", am.getAmount());
+ tag.setInteger("Operation", am.getOperation());
+ tag.setLong("UUIDMost", am.getID().getMostSignificantBits());
+ tag.setLong("UUIDLeast", am.getID().getLeastSignificantBits());
- UUID u = UUID.fromString("CB3F55D3-645C-4F38-A497-9C13A33DB5CF");
- AttributeModifier am = new AttributeModifier(u, "Weapon modifier", 6.0D, 0);
+ tags.appendTag(tag);
+ s.stackTagCompound.setTag("AttributeModifiers", tags);
+ }
+ else if (wand.getRod(s) instanceof StaffRod)
+ {
+ NBTTagList tags = new NBTTagList();
+ NBTTagCompound tag = new NBTTagCompound();
+ tag.setString("AttributeName", SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName());
- tag.setString("Name", am.getName());
- tag.setDouble("Amount", am.getAmount());
- tag.setInteger("Operation", am.getOperation());
- tag.setLong("UUIDMost", am.getID().getMostSignificantBits());
- tag.setLong("UUIDLeast", am.getID().getLeastSignificantBits());
+ UUID u = UUID.fromString("CB3F55D3-645C-4F38-A497-9C13A33DB5CF");
+ AttributeModifier am = new AttributeModifier(u, "Weapon modifier", 6.0D, 0);
- tags.appendTag(tag);
- s.stackTagCompound.setTag("AttributeModifiers", tags);
- }
- }
- }
- }
- }
+ tag.setString("Name", am.getName());
+ tag.setDouble("Amount", am.getAmount());
+ tag.setInteger("Operation", am.getOperation());
+ tag.setLong("UUIDMost", am.getID().getMostSignificantBits());
+ tag.setLong("UUIDLeast", am.getID().getLeastSignificantBits());
- @SubscribeEvent
- public void entityAttacked (LivingAttackEvent event)
- {
- if (event.source.getEntity() instanceof EntityPlayer)
- {
- EntityPlayer p = (EntityPlayer) event.source.getEntity();
+ tags.appendTag(tag);
+ s.stackTagCompound.setTag("AttributeModifiers", tags);
+ }
+ }
+ }
+ }
+ }
- /**
- * Consume vis for Mage's Mace hits
- */
- if (p.getHeldItem() != null && p.getHeldItem().getItem() instanceof ItemWandCasting)
- {
- ItemStack s = p.getHeldItem();
- ItemWandCasting wand = (ItemWandCasting) s.getItem();
+ @SubscribeEvent
+ public void playerInteract (PlayerInteractEvent event)
+ {
+ EntityPlayer p = event.entityPlayer;
+ if (p != null)
+ {
+ if (p.getHeldItem() != null && p.getHeldItem().getItem() instanceof ItemMaterial
+ && p.getHeldItem().getItemDamage() == 12 && event.action == event.action.RIGHT_CLICK_BLOCK
+ && event.world.getBlock(event.x, event.y, event.z) instanceof BlockCustomPlant
+ && event.world.getBlockMetadata(event.x, event.y, event.z) == 1)
+ {
+ p.inventory.decrStackSize(p.inventory.currentItem, 1);
+ event.world.setBlock(event.x, event.y, event.z, BlockRegistry.BlockWarpwoodSapling);
+ event.world.playSoundAtEntity(p, "thaumcraft:ice", 0.5F + ((float) Math.random() * 0.5F), 1.0F);
- if (wand.getFocus(s) != null && wand.getFocus(s) instanceof ItemFocusMageMace)
- {
- final AspectList aspects = new AspectList().add(Aspect.EARTH, 20).add(Aspect.ENTROPY, 20).add(Aspect.ORDER, 20);
- if (wand.consumeAllVis(s, p, aspects, true, false))
- {
- wand.consumeAllVis(s, p, aspects, true, false);
- }
- else
- {
- event.setCanceled(true);
- }
- }
- }
+ if (event.world.isRemote) warpSapParticles(event);
+ }
+ }
+ }
- /**
- * Fill phials with blood when an entity is hit with the Hollow
- * Dagger
- */
- if (p.getHeldItem() != null && p.getHeldItem().getItem() instanceof ItemHollowDagger)
- {
- for (int i = 0; i < p.inventory.getSizeInventory(); i++)
- {
- if (p.inventory.getStackInSlot(i) != null && p.inventory.getStackInSlot(i).getItem() instanceof ItemEssence && p.inventory.getStackInSlot(i).getItemDamage() == 0)
- {
- p.inventory.decrStackSize(i, 1);
+ @SideOnly (Side.CLIENT)
+ public void warpSapParticles (PlayerInteractEvent event)
+ {
+ for (int a = 0; a < 9; a++)
+ {
+ FXSparkle fx =
+ new FXSparkle(event.world, event.x + event.world.rand.nextFloat(), event.y + event.world.rand.nextFloat(),
+ event.z + event.world.rand.nextFloat(), 1.75F, 6, 3 + event.world.rand.nextInt(3));
+ fx.setGravity(0.1F);
+ ParticleEngine.instance.addEffect(event.world, fx);
+ }
+ }
- if (p.inventory.addItemStackToInventory(new ItemStack(ItemRegistry.ItemMaterial, 1, 7)) == false)
- if (!p.worldObj.isRemote) p.entityDropItem(new ItemStack(ItemRegistry.ItemMaterial, 1, 7), 2.0F);
- }
- }
- }
- }
- }
+ @SubscribeEvent
+ public void entityAttacked (LivingAttackEvent event)
+ {
+ if (event.source.getEntity() instanceof EntityPlayer)
+ {
+ EntityPlayer p = (EntityPlayer) event.source.getEntity();
- @SubscribeEvent
- public void onPlayerLogin (PlayerEvent.PlayerLoggedInEvent event)
- {
- if (UpdateHandler.show) event.player.addChatMessage(new ChatComponentText(UpdateHandler.updateStatus));
- }
+ /**
+ * Consume vis for Mage's Mace hits
+ */
+ if (p.getHeldItem() != null && p.getHeldItem().getItem() instanceof ItemWandCasting)
+ {
+ ItemStack s = p.getHeldItem();
+ ItemWandCasting wand = (ItemWandCasting) s.getItem();
- @SubscribeEvent
- public void onCrafting (ItemCraftedEvent event)
- {
- if (event.crafting.getItem() == ItemRegistry.ItemMaterial && event.crafting.getItemDamage() == 5) giveResearch(event.player);
- }
+ if (wand.getFocus(s) != null && wand.getFocus(s) instanceof ItemFocusMageMace)
+ {
+ final AspectList aspects =
+ new AspectList().add(Aspect.EARTH, 20).add(Aspect.ENTROPY, 20).add(Aspect.ORDER, 20);
+ if (wand.consumeAllVis(s, p, aspects, true, false))
+ {
+ wand.consumeAllVis(s, p, aspects, true, false);
+ }
+ else
+ {
+ event.setCanceled(true);
+ }
+ }
+ }
- public void giveResearch (EntityPlayer p)
- {
- if (!p.worldObj.isRemote)
- {
- if (!ThaumcraftApiHelper.isResearchComplete(p.getCommandSenderName(), "CREATION") && ThaumcraftApiHelper.isResearchComplete(p.getCommandSenderName(), "CREATIONSHARD"))
- {
- Thaumcraft.proxy.getResearchManager().completeResearch(p, "CREATION");
- thaumcraft.common.lib.network.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);
+ /**
+ * Fill phials with blood when an entity is hit with the Hollow
+ * Dagger
+ */
+ if (p.getHeldItem() != null && p.getHeldItem().getItem() instanceof ItemHollowDagger)
+ {
+ for (int i = 0; i < p.inventory.getSizeInventory(); i++)
+ {
+ if (p.inventory.getStackInSlot(i) != null && p.inventory.getStackInSlot(i).getItem() instanceof ItemEssence
+ && p.inventory.getStackInSlot(i).getItemDamage() == 0)
+ {
+ p.inventory.decrStackSize(i, 1);
- if (!ThaumcraftApiHelper.isResearchComplete(p.getCommandSenderName(), "OUTERREV") && ThaumcraftApiHelper.isResearchComplete(p.getCommandSenderName(), "CREATION"))
- {
- Thaumcraft.proxy.getResearchManager().completeResearch(p, "OUTERREV");
- thaumcraft.common.lib.network.PacketHandler.INSTANCE.sendTo(new PacketResearchComplete("OUTERREV"), (EntityPlayerMP) p);
- }
+ if (p.inventory.addItemStackToInventory(new ItemStack(ItemRegistry.ItemCrimsonBlood)) == false)
+ if (!p.worldObj.isRemote) p.entityDropItem(new ItemStack(ItemRegistry.ItemCrimsonBlood), 2.0F);
+ }
+ }
+ }
+ }
+ }
- try
- {
- p.addPotionEffect(new PotionEffect(Potion.blindness.id, 80, 0));
- p.addPotionEffect(new PotionEffect(Config.potionBlurredID, 200, 0));
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
- }
- }
- }
+ @SubscribeEvent
+ public void onPlayerLogin (PlayerEvent.PlayerLoggedInEvent event)
+ {
+ if (UpdateHandler.show) event.player.addChatMessage(new ChatComponentText(UpdateHandler.updateStatus));
+ }
- @SubscribeEvent
- public void livingDrop (LivingDropsEvent event)
- {
- if (event.source.getEntity() instanceof EntityPlayer)
- {
- EntityPlayer p = (EntityPlayer) event.source.getEntity();
+ @SubscribeEvent
+ public void onCrafting (ItemCraftedEvent event)
+ {
+ if (event.crafting.getItem() == ItemRegistry.ItemMaterial && event.crafting.getItemDamage() == 5)
+ giveResearch(event.player);
+ }
- // Currently unused
- }
- }
+ public void giveResearch (EntityPlayer p)
+ {
+ if (!p.worldObj.isRemote)
+ {
+ if (!ThaumcraftApiHelper.isResearchComplete(p.getCommandSenderName(), "CREATION")
+ && ThaumcraftApiHelper.isResearchComplete(p.getCommandSenderName(), "CREATIONSHARD"))
+ {
+ Thaumcraft.proxy.getResearchManager().completeResearch(p, "CREATION");
+ thaumcraft.common.lib.network.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);
- public void addDropItem (LivingDropsEvent event, ItemStack drop)
- {
- EntityItem entityitem = new EntityItem(event.entityLiving.worldObj, event.entityLiving.posX, event.entityLiving.posY, event.entityLiving.posZ, drop);
- entityitem.delayBeforeCanPickup = 10;
- event.drops.add(entityitem);
- }
+ if (!ThaumcraftApiHelper.isResearchComplete(p.getCommandSenderName(), "OUTERREV")
+ && ThaumcraftApiHelper.isResearchComplete(p.getCommandSenderName(), "CREATION"))
+ {
+ Thaumcraft.proxy.getResearchManager().completeResearch(p, "OUTERREV");
+ thaumcraft.common.lib.network.PacketHandler.INSTANCE.sendTo(new PacketResearchComplete("OUTERREV"),
+ (EntityPlayerMP) p);
+ }
- @SubscribeEvent
- public void tooltipEvent (ItemTooltipEvent event)
- {
- if (event.itemStack.getItem() instanceof ItemFocusMageMace)
- {
- if (event.toolTip.contains(StatCollector.translateToLocal("item.Focus.cost1")))
- {
- event.toolTip.remove(StatCollector.translateToLocal("item.Focus.cost1"));
- event.toolTip.add(1, StatCollector.translateToLocal("item.Focus.cost3"));
- }
- }
+ try
+ {
+ p.addPotionEffect(new PotionEffect(Potion.blindness.id, 80, 0));
+ p.addPotionEffect(new PotionEffect(Config.potionBlurredID, 200, 0));
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
+ }
+ }
+ }
- if (event.itemStack.stackTagCompound != null && event.itemStack.stackTagCompound.getBoolean("voidtouched")) event.toolTip.add("\u00A75" + StatCollector.translateToLocal("text.voidtouched"));
- }
+ @SubscribeEvent
+ public void tooltipEvent (ItemTooltipEvent event)
+ {
+ if (event.itemStack.getItem() instanceof ItemFocusMageMace)
+ {
+ if (event.toolTip.contains(StatCollector.translateToLocal("item.Focus.cost1")))
+ {
+ event.toolTip.remove(StatCollector.translateToLocal("item.Focus.cost1"));
+ event.toolTip.add(1, StatCollector.translateToLocal("item.Focus.cost3"));
+ }
+ }
+
+ 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/WandHandler.java b/src/main/java/taintedmagic/common/handler/WandHandler.java
index 63b8f1c..dd3dd83 100644
--- a/src/main/java/taintedmagic/common/handler/WandHandler.java
+++ b/src/main/java/taintedmagic/common/handler/WandHandler.java
@@ -11,9 +11,7 @@ import thaumcraft.common.items.wands.ItemWandCasting;
public class WandHandler implements IWandRodOnUpdate
{
- Aspect aspect;
Aspect primals[] = Aspect.getPrimalAspects().toArray(new Aspect[0]);
- private static final String TAG_PERIOD = "period";
public void onUpdate (ItemStack s, EntityPlayer p)
{
@@ -21,29 +19,16 @@ public class WandHandler implements IWandRodOnUpdate
{
int permwarp = Thaumcraft.proxy.getPlayerKnowledge().getWarpPerm(p.getCommandSenderName());
- if (permwarp == 0)
- {
- if (s.stackTagCompound == null) s.stackTagCompound = new NBTTagCompound();
- s.getTagCompound().setInteger(TAG_PERIOD, 0);
- return;
- }
+ if (permwarp == 0) return;
- // exponential decay at rate of mul / warp (1 / x)
- float mul = 10000.0F;
- float T = mul / (float) permwarp;
+ // refresh period of base/warp (1/x type relationship)
+ float base = ConfigHandler.WARP_WAND_REFRESH_BASE;
+ float T = base / (float) permwarp;
- int rT = Math.round(T);
+ int rT = (T < 1.0F) ? 1 : Math.round(T);
- if (s.stackTagCompound == null) s.stackTagCompound = new NBTTagCompound();
- s.getTagCompound().setInteger(TAG_PERIOD, rT);
-
- if (p.ticksExisted % rT == 0)
- {
- for (int i = 0; i < primals.length; i++)
- {
- ((ItemWandCasting) s.getItem()).addVis(s, this.primals[i], 1, true);
- }
- }
+ if (p.ticksExisted % rT == 0) for (int i = 0; i < primals.length; i++)
+ ((ItemWandCasting) s.getItem()).addVis(s, this.primals[i], 1, true);
}
}
}
diff --git a/src/main/java/taintedmagic/common/items/ItemCrimsonBlood.java b/src/main/java/taintedmagic/common/items/ItemCrimsonBlood.java
new file mode 100644
index 0000000..269bbc7
--- /dev/null
+++ b/src/main/java/taintedmagic/common/items/ItemCrimsonBlood.java
@@ -0,0 +1,37 @@
+package taintedmagic.common.items;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.client.Minecraft;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.EnumAction;
+import net.minecraft.item.EnumRarity;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemFood;
+import net.minecraft.item.ItemStack;
+import net.minecraft.potion.Potion;
+import net.minecraft.potion.PotionEffect;
+import net.minecraft.util.DamageSource;
+import net.minecraft.world.Explosion;
+import net.minecraft.world.World;
+import taintedmagic.common.TaintedMagic;
+import taintedmagic.common.registry.ItemRegistry;
+import thaumcraft.common.config.Config;
+import thaumcraft.common.config.ConfigItems;
+
+public class ItemCrimsonBlood extends Item
+{
+ public ItemCrimsonBlood ()
+ {
+ this.setCreativeTab(TaintedMagic.tabTaintedMagic);
+ this.setTextureName("taintedmagic:ItemCrimsonBlood");
+ this.setUnlocalizedName("ItemCrimsonBlood");
+ this.setContainerItem(ConfigItems.itemEssence);
+ }
+
+ @SideOnly (Side.CLIENT)
+ public EnumRarity getRarity (ItemStack s)
+ {
+ return EnumRarity.uncommon;
+ }
+}
diff --git a/src/main/java/taintedmagic/common/items/ItemGatekey.java b/src/main/java/taintedmagic/common/items/ItemGatekey.java
new file mode 100644
index 0000000..97bcdb1
--- /dev/null
+++ b/src/main/java/taintedmagic/common/items/ItemGatekey.java
@@ -0,0 +1,233 @@
+package taintedmagic.common.items;
+
+import java.awt.Color;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.lwjgl.opengl.GL11;
+import org.lwjgl.opengl.GL12;
+
+import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.client.gui.ScaledResolution;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.EnumAction;
+import net.minecraft.item.EnumRarity;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.potion.Potion;
+import net.minecraft.potion.PotionEffect;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.IIcon;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.StatCollector;
+import net.minecraft.world.World;
+import net.minecraft.world.WorldProvider;
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.event.entity.player.PlayerInteractEvent;
+import taintedmagic.api.IHeldItemHUD;
+import taintedmagic.client.handler.ClientHandler;
+import taintedmagic.client.handler.HUDHandler;
+import taintedmagic.common.TaintedMagic;
+import thaumcraft.api.IWarpingGear;
+import thaumcraft.client.fx.ParticleEngine;
+import thaumcraft.client.fx.particles.FXSparkle;
+import thaumcraft.client.lib.UtilsFX;
+
+public class ItemGatekey extends Item implements IWarpingGear
+{
+ IIcon icon;
+ IIcon overlay;
+
+ private static final String TAG_X = "posX";
+ private static final String TAG_Y = "posY";
+ private static final String TAG_Z = "posZ";
+ private static final String TAG_DIM = "dimID";
+ private static final String TAG_COLOUR = "colour";
+
+ public ItemGatekey ()
+ {
+ this.setCreativeTab(TaintedMagic.tabTaintedMagic);
+ this.setUnlocalizedName("ItemGatekey");
+ this.setMaxStackSize(1);
+ }
+
+ @SideOnly (Side.CLIENT)
+ public EnumRarity getRarity (ItemStack s)
+ {
+ return TaintedMagic.rarityCreation;
+ }
+
+ @SideOnly (Side.CLIENT)
+ public void registerIcons (IIconRegister ir)
+ {
+ this.icon = ir.registerIcon("taintedmagic:ItemGatekey");
+ this.overlay = ir.registerIcon("taintedmagic:ItemGatekey_overlay");
+ }
+
+ @SideOnly (Side.CLIENT)
+ public boolean requiresMultipleRenderPasses ()
+ {
+ return true;
+ }
+
+ @SideOnly (Side.CLIENT)
+ public int getRenderPasses (int m)
+ {
+ return 2;
+ }
+
+ @Override
+ @SideOnly (Side.CLIENT)
+ public IIcon getIconFromDamageForRenderPass (int meta, int pass)
+ {
+ return (pass == 1) ? this.overlay : this.icon;
+ }
+
+ @Override
+ public int getColorFromItemStack (ItemStack s, int pass)
+ {
+ if (pass == 1 && s.stackTagCompound != null)
+ {
+ return Color.HSBtoRGB((float) s.stackTagCompound.getInteger(TAG_COLOUR) / 360F, 1.0F,
+ 0.2F * (float) Math.sin((double) ClientHandler.ticks / 150D) + 0.8F);
+ }
+ return 0xFFFFFF;
+ }
+
+ @Override
+ public int getWarp (ItemStack s, EntityPlayer p)
+ {
+ return 3;
+ }
+
+ @Override
+ public void addInformation (ItemStack s, EntityPlayer p, List l, boolean b)
+ {
+ if (s.stackTagCompound != null)
+ {
+ l.add(EnumChatFormatting.GREEN + StatCollector.translateToLocal("gatekey.bound"));
+
+ int dim = s.stackTagCompound.getInteger(TAG_DIM);
+ l.add(WorldProvider.getProviderForDimension(dim).getDimensionName());
+
+ int x = s.stackTagCompound.getInteger(TAG_X);
+ int y = s.stackTagCompound.getInteger(TAG_Y);
+ int z = s.stackTagCompound.getInteger(TAG_Z);
+ l.add(x + ", " + y + ", " + z);
+ }
+ else l.add(EnumChatFormatting.RED + StatCollector.translateToLocal("gatekey.inactive"));
+ }
+
+ @Override
+ public EnumAction getItemUseAction (ItemStack s)
+ {
+ return EnumAction.bow;
+ }
+
+ @Override
+ public int getMaxItemUseDuration (ItemStack s)
+ {
+ return 40;
+ }
+
+ @Override
+ public ItemStack onItemRightClick (ItemStack s, World w, EntityPlayer p)
+ {
+ if (s.stackTagCompound != null) p.setItemInUse(s, getMaxItemUseDuration(s));
+ return s;
+ }
+
+ @Override
+ public boolean onItemUse (ItemStack s, EntityPlayer p, World w, int x, int y, int z, int face, float hitX, float hitY,
+ float hitZ)
+ {
+ if (s.stackTagCompound == null)
+ {
+ s.stackTagCompound = new NBTTagCompound();
+
+ s.stackTagCompound.setInteger(TAG_COLOUR, w.rand.nextInt(360) + 1);
+
+ s.stackTagCompound.setInteger(TAG_X, x);
+ s.stackTagCompound.setInteger(TAG_Y, y + 1);
+ s.stackTagCompound.setInteger(TAG_Z, z);
+ s.stackTagCompound.setInteger(TAG_DIM, w.provider.dimensionId);
+
+ w.playSoundAtEntity(p, "thaumcraft:wand", 0.5F + ((float) Math.random() * 0.5F), 1.0F);
+
+ if (w.isRemote)
+ {
+ p.swingItem();
+ for (int a = 0; a < 9; a++)
+ sparkle(w, x + 0.5D, y, z + 0.5D);
+ }
+ }
+ return false;
+ }
+
+ @SideOnly (Side.CLIENT)
+ public void sparkle (World w, double x, double y, double z)
+ {
+ FXSparkle fx = new FXSparkle(w, x + 0.33F * w.rand.nextGaussian(), y + 0.5D + w.rand.nextFloat(),
+ z + 0.33F * w.rand.nextGaussian(), 1.75F, 6, 3 + w.rand.nextInt(3));
+ fx.setGravity(0.1F);
+ ParticleEngine.instance.addEffect(w, fx);
+ }
+
+ @Override
+ public void onUsingTick (ItemStack s, EntityPlayer p, int i)
+ {
+ super.onUsingTick(s, p, i);
+
+ if (p.worldObj.isRemote) sparkle(p.worldObj, p.posX, p.boundingBox.minY, p.posZ);
+
+ float f = 1.0F + ((float) Math.random() * 0.25F);
+ if (p.ticksExisted % 5 == 0) p.worldObj.playSoundAtEntity(p, "thaumcraft:wind", f * 0.1F, f);
+ }
+
+ @Override
+ public ItemStack onEaten (ItemStack s, World w, EntityPlayer p)
+ {
+ super.onEaten(s, w, p);
+ if (s.stackTagCompound != null)
+ {
+ int x = s.stackTagCompound.getInteger(TAG_X);
+ int y = s.stackTagCompound.getInteger(TAG_Y);
+ int z = s.stackTagCompound.getInteger(TAG_Z);
+ int dim = s.stackTagCompound.getInteger(TAG_DIM);
+
+ if (y > -1 && dim == w.provider.dimensionId && w.getBlock(x, y, z) == Blocks.air
+ && w.getBlock(x, y + 1, z) == Blocks.air)
+ {
+ if (!w.isRemote)
+ {
+ if (p instanceof EntityPlayerMP)
+ ((EntityPlayerMP) p).playerNetServerHandler.setPlayerLocation((double) x + 0.5D, (double) y,
+ (double) z + 0.5D, p.rotationYaw, p.rotationPitch);
+ w.playSoundAtEntity(p, "mob.endermen.portal", 5.0F, 1.0F);
+ }
+ try
+ {
+ p.addPotionEffect(new PotionEffect(Potion.confusion.id, 140, 1));
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
+ }
+ else if (dim != w.provider.dimensionId) HUDHandler
+ .displayString(EnumChatFormatting.RED + StatCollector.translateToLocal("gatekey.invaliddim"), 300, false);
+ else HUDHandler.displayString(EnumChatFormatting.RED + StatCollector.translateToLocal("gatekey.error"), 300, false);
+ }
+ return s;
+ }
+}
diff --git a/src/main/java/taintedmagic/common/items/ItemMaterial.java b/src/main/java/taintedmagic/common/items/ItemMaterial.java
index 364b0da..9d0c842 100644
--- a/src/main/java/taintedmagic/common/items/ItemMaterial.java
+++ b/src/main/java/taintedmagic/common/items/ItemMaterial.java
@@ -14,6 +14,7 @@ import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.IIcon;
import net.minecraft.util.StatCollector;
import taintedmagic.common.TaintedMagic;
+import thaumcraft.common.config.ConfigItems;
public class ItemMaterial extends Item
{
@@ -51,13 +52,13 @@ public class ItemMaterial extends Item
case 8 :
return EnumRarity.uncommon;
case 9 :
- return EnumRarity.uncommon;
+ return EnumRarity.epic;
case 10 :
return EnumRarity.epic;
case 11 :
- return EnumRarity.epic;
- case 12 :
return TaintedMagic.rarityCreation;
+ case 12:
+ return EnumRarity.uncommon;
}
return EnumRarity.common;
}
@@ -82,8 +83,7 @@ public class ItemMaterial extends Item
if (s.getItemDamage() == 5)
{
- l.add(EnumChatFormatting.DARK_PURPLE + StatCollector.translateToLocal("text.shard.1"));
- l.add(EnumChatFormatting.DARK_PURPLE + StatCollector.translateToLocal("text.shard.2"));
+ l.add(EnumChatFormatting.LIGHT_PURPLE + StatCollector.translateToLocal("text.shard.1"));
}
}
diff --git a/src/main/java/taintedmagic/common/items/ItemNightshadeBerries.java b/src/main/java/taintedmagic/common/items/ItemNightshadeBerries.java
new file mode 100644
index 0000000..b735bbc
--- /dev/null
+++ b/src/main/java/taintedmagic/common/items/ItemNightshadeBerries.java
@@ -0,0 +1,36 @@
+package taintedmagic.common.items;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.EnumRarity;
+import net.minecraft.item.ItemFood;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.DamageSource;
+import net.minecraft.world.World;
+import taintedmagic.common.TaintedMagic;
+
+public class ItemNightshadeBerries extends ItemFood
+{
+ public ItemNightshadeBerries (int i, float j, boolean k)
+ {
+ super(i, j, k);
+ this.setCreativeTab(TaintedMagic.tabTaintedMagic);
+ this.setUnlocalizedName("ItemNightshadeBerries");
+ this.setTextureName("taintedmagic:ItemNightshadeBerries");
+ this.setAlwaysEdible();
+ }
+
+ @SideOnly (Side.CLIENT)
+ public EnumRarity getRarity (ItemStack s)
+ {
+ return EnumRarity.uncommon;
+ }
+
+ @Override
+ protected void onFoodEaten (ItemStack s, World w, EntityPlayer p)
+ {
+ super.onFoodEaten(s, w, p);
+ if (!w.isRemote) p.attackEntityFrom(new DamageSource("nightshade"), Float.MAX_VALUE);
+ }
+}
diff --git a/src/main/java/taintedmagic/common/items/ItemSalis.java b/src/main/java/taintedmagic/common/items/ItemSalis.java
index 0847dc8..c9e121d 100644
--- a/src/main/java/taintedmagic/common/items/ItemSalis.java
+++ b/src/main/java/taintedmagic/common/items/ItemSalis.java
@@ -19,93 +19,90 @@ import thaumcraft.client.fx.particles.FXSparkle;
public class ItemSalis extends Item
{
- public int SUBTYPES = 2;
- public IIcon[] icons = new IIcon[SUBTYPES];
+ public int SUBTYPES = 2;
+ public IIcon[] icons = new IIcon[SUBTYPES];
- public ItemSalis ()
- {
- this.setCreativeTab(TaintedMagic.tabTaintedMagic);
- this.hasSubtypes = true;
- this.setUnlocalizedName("ItemSalis");
- }
+ public ItemSalis ()
+ {
+ this.setCreativeTab(TaintedMagic.tabTaintedMagic);
+ this.hasSubtypes = true;
+ this.setUnlocalizedName("ItemSalis");
+ }
- @Override
- public EnumRarity getRarity (ItemStack s)
- {
- return TaintedMagic.rarityCreation;
- }
+ @Override
+ public EnumRarity getRarity (ItemStack s)
+ {
+ return TaintedMagic.rarityCreation;
+ }
- @SideOnly (Side.CLIENT)
- public void registerIcons (IIconRegister ir)
- {
- for (int i = 0; i < icons.length; i++)
- this.icons[i] = ir.registerIcon("taintedmagic:ItemSalis" + i);
- }
+ @SideOnly (Side.CLIENT)
+ public void registerIcons (IIconRegister ir)
+ {
+ for (int i = 0; i < icons.length; i++)
+ this.icons[i] = ir.registerIcon("taintedmagic:ItemSalis" + i);
+ }
- @SideOnly (Side.CLIENT)
- public IIcon getIconFromDamage (int i)
- {
- return this.icons[i];
- }
+ @SideOnly (Side.CLIENT)
+ public IIcon getIconFromDamage (int i)
+ {
+ return this.icons[i];
+ }
- @SideOnly (Side.CLIENT)
- public void getSubItems (Item item, CreativeTabs c, List l)
- {
- for (int i = 0; i < SUBTYPES; i++)
- l.add(new ItemStack(this, 1, i));
- }
+ @SideOnly (Side.CLIENT)
+ public void getSubItems (Item item, CreativeTabs c, List l)
+ {
+ for (int i = 0; i < SUBTYPES; i++)
+ l.add(new ItemStack(this, 1, i));
+ }
- public String getUnlocalizedName (ItemStack s)
- {
- return super.getUnlocalizedName() + "." + s.getItemDamage();
- }
+ public String getUnlocalizedName (ItemStack s)
+ {
+ return super.getUnlocalizedName() + "." + s.getItemDamage();
+ }
- @Override
- public ItemStack onItemRightClick (ItemStack s, World w, EntityPlayer p)
- {
- int m = s.getItemDamage();
- switch (m)
- {
- // Weather
- case 0 :
- {
- w.getWorldInfo().setRainTime(w.isRaining() ? 24000 : 0);
- w.getWorldInfo().setRaining(!w.isRaining());
- p.playSound("thaumcraft:wind", 0.3F, 1.0F + w.rand.nextFloat() * 0.5F);
- p.inventory.decrStackSize(p.inventory.currentItem, 1);
- for (int a = 0; a < 15; a++)
- {
- FXSparkle fx = new FXSparkle(w, p.posX + (w.rand.nextDouble() - w.rand.nextDouble()) * 0.2D, p.boundingBox.minY + 1.25D + (w.rand.nextDouble() - w.rand.nextDouble()) * 0.2D,
- p.posZ + (w.rand.nextDouble() - w.rand.nextDouble()) * 0.2D, 1.75F, 7, 3 + w.rand.nextInt(3));
- Vec3 look = p.getLookVec();
- fx.motionX += (look.xCoord * 0.25D) + w.rand.nextGaussian() * 0.0075D * 5.0D;
- fx.motionY += (look.yCoord * 0.25D) + w.rand.nextGaussian() * 0.0075D * 5.0D;
- fx.motionZ += (look.zCoord * 0.25D) + w.rand.nextGaussian() * 0.0075D * 5.0D;
- fx.setGravity(0.5F);
- ParticleEngine.instance.addEffect(w, fx);
- }
- return s;
- }
- // Time
- case 1 :
- {
- w.setWorldTime(w.isDaytime() ? 14000 : 24000);
- p.playSound("thaumcraft:wind", 0.3F, 1.0F + w.rand.nextFloat() * 0.5F);
- p.inventory.decrStackSize(p.inventory.currentItem, 1);
- for (int a = 0; a < 15; a++)
- {
- FXSparkle fx = new FXSparkle(w, p.posX + (w.rand.nextDouble() - w.rand.nextDouble()) * 0.2D, p.boundingBox.minY + 1.25D + (w.rand.nextDouble() - w.rand.nextDouble()) * 0.2D,
- p.posZ + (w.rand.nextDouble() - w.rand.nextDouble()) * 0.2D, 1.75F, 6, 3 + w.rand.nextInt(3));
- Vec3 look = p.getLookVec();
- fx.motionX += (look.xCoord * 0.25D) + w.rand.nextGaussian() * 0.0075D * 5.0D;
- fx.motionY += (look.yCoord * 0.25D) + w.rand.nextGaussian() * 0.0075D * 5.0D;
- fx.motionZ += (look.zCoord * 0.25D) + w.rand.nextGaussian() * 0.0075D * 5.0D;
- fx.setGravity(0.5F);
- ParticleEngine.instance.addEffect(w, fx);
- }
- return s;
- }
- }
- return s;
- }
+ @Override
+ public ItemStack onItemRightClick (ItemStack s, World w, EntityPlayer p)
+ {
+ int m = s.getItemDamage();
+ switch (m)
+ {
+ // Weather
+ case 0 :
+ {
+ w.getWorldInfo().setRainTime(w.isRaining() ? 24000 : 0);
+ w.getWorldInfo().setRaining(!w.isRaining());
+ p.playSound("thaumcraft:wind", 0.3F, 1.0F + w.rand.nextFloat() * 0.5F);
+ throwParticles(w, p, 7);
+ p.inventory.decrStackSize(p.inventory.currentItem, 1);
+ return s;
+ }
+ // Time
+ case 1 :
+ {
+ w.setWorldTime(w.isDaytime() ? 14000 : 24000);
+ p.playSound("thaumcraft:wind", 0.3F, 1.0F + w.rand.nextFloat() * 0.5F);
+ throwParticles(w, p, 6);
+ p.inventory.decrStackSize(p.inventory.currentItem, 1);
+ return s;
+ }
+ }
+ return s;
+ }
+
+ @SideOnly (Side.CLIENT)
+ private void throwParticles (World w, EntityPlayer p, int colour)
+ {
+ for (int a = 0; a < 15; a++)
+ {
+ FXSparkle fx = new FXSparkle(w, p.posX + (w.rand.nextDouble() - w.rand.nextDouble()) * 0.2D,
+ p.boundingBox.minY + 1.25D + (w.rand.nextDouble() - w.rand.nextDouble()) * 0.2D,
+ p.posZ + (w.rand.nextDouble() - w.rand.nextDouble()) * 0.2D, 1.75F, colour, 3 + w.rand.nextInt(3));
+ Vec3 look = p.getLookVec();
+ fx.motionX += (look.xCoord * 0.5D) + (w.rand.nextGaussian() * 0.05D);
+ fx.motionY += (look.yCoord * 0.5D) + (w.rand.nextGaussian() * 0.05D);
+ fx.motionZ += (look.zCoord * 0.5D) + (w.rand.nextGaussian() * 0.05D);
+ fx.setGravity(0.5F);
+ ParticleEngine.instance.addEffect(w, fx);
+ }
+ }
}
diff --git a/src/main/java/taintedmagic/common/items/ItemVoidsentBlood.java b/src/main/java/taintedmagic/common/items/ItemVoidsentBlood.java
index 1c06940..566843f 100644
--- a/src/main/java/taintedmagic/common/items/ItemVoidsentBlood.java
+++ b/src/main/java/taintedmagic/common/items/ItemVoidsentBlood.java
@@ -3,13 +3,19 @@ package taintedmagic.common.items;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.EnumAction;
import net.minecraft.item.EnumRarity;
import net.minecraft.item.Item;
+import net.minecraft.item.ItemFood;
+import net.minecraft.item.ItemPotion;
import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
import net.minecraftforge.oredict.RecipeSorter;
import net.minecraftforge.oredict.RecipeSorter.Category;
import taintedmagic.api.RecipeVoidsentBlood;
import taintedmagic.common.TaintedMagic;
+import thaumcraft.common.config.ConfigItems;
public class ItemVoidsentBlood extends Item
{
@@ -18,14 +24,15 @@ public class ItemVoidsentBlood extends Item
this.setCreativeTab(TaintedMagic.tabTaintedMagic);
this.setTextureName("taintedmagic:ItemVoidsentBlood");
this.setUnlocalizedName("ItemVoidsentBlood");
+ this.setContainerItem(ConfigItems.itemEssence);
GameRegistry.addRecipe(new RecipeVoidsentBlood());
RecipeSorter.register("taintedmagic:ItemVoidsentBlood", RecipeVoidsentBlood.class, Category.SHAPELESS, "");
}
-
+
@SideOnly (Side.CLIENT)
public EnumRarity getRarity (ItemStack s)
{
- return EnumRarity.uncommon;
+ return EnumRarity.rare;
}
}
diff --git a/src/main/java/taintedmagic/common/items/equipment/ItemVoidwalkerBoots.java b/src/main/java/taintedmagic/common/items/equipment/ItemVoidwalkerBoots.java
index e9bb5e7..76fe2aa 100644
--- a/src/main/java/taintedmagic/common/items/equipment/ItemVoidwalkerBoots.java
+++ b/src/main/java/taintedmagic/common/items/equipment/ItemVoidwalkerBoots.java
@@ -3,6 +3,8 @@ package taintedmagic.common.items.equipment;
import java.util.List;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
@@ -28,148 +30,158 @@ import thaumcraft.client.fx.particles.FXWispEG;
import thaumcraft.common.Thaumcraft;
import thaumcraft.common.items.armor.Hover;
-public class ItemVoidwalkerBoots extends ItemArmor implements IVisDiscountGear, IWarpingGear, IRunicArmor, IRepairable, ISpecialArmor
+public class ItemVoidwalkerBoots extends ItemArmor
+ implements IVisDiscountGear, IWarpingGear, IRunicArmor, IRepairable, ISpecialArmor
{
- public ItemVoidwalkerBoots (ArmorMaterial m, int j, int k)
- {
- super(m, j, k);
- this.setCreativeTab(TaintedMagic.tabTaintedMagic);
- this.setUnlocalizedName("ItemVoidwalkerBoots");
- this.setTextureName("taintedmagic:ItemVoidwalkerBoots");
+ public ItemVoidwalkerBoots (ArmorMaterial m, int j, int k)
+ {
+ super(m, j, k);
+ this.setCreativeTab(TaintedMagic.tabTaintedMagic);
+ this.setUnlocalizedName("ItemVoidwalkerBoots");
+ this.setTextureName("taintedmagic:ItemVoidwalkerBoots");
- MinecraftForge.EVENT_BUS.register(this);
- }
+ MinecraftForge.EVENT_BUS.register(this);
+ }
- public String getArmorTexture (ItemStack s, Entity e, int slot, String t)
- {
- return "taintedmagic:textures/models/ModelVoidwalkerBoots.png";
- }
+ public String getArmorTexture (ItemStack s, Entity e, int slot, String t)
+ {
+ return "taintedmagic:textures/models/ModelVoidwalkerBoots.png";
+ }
- public EnumRarity getRarity (ItemStack s)
- {
- return EnumRarity.epic;
- }
+ public EnumRarity getRarity (ItemStack s)
+ {
+ return EnumRarity.epic;
+ }
- @Override
- public int getRunicCharge (ItemStack s)
- {
- return 0;
- }
+ @Override
+ public int getRunicCharge (ItemStack s)
+ {
+ return 0;
+ }
- @Override
- public int getWarp (ItemStack s, EntityPlayer p)
- {
- return 5;
- }
+ @Override
+ public int getWarp (ItemStack s, EntityPlayer p)
+ {
+ return 5;
+ }
- @Override
- public int getVisDiscount (ItemStack s, EntityPlayer p, Aspect a)
- {
- return 5;
- }
+ @Override
+ public int getVisDiscount (ItemStack s, EntityPlayer p, Aspect a)
+ {
+ return 5;
+ }
- @Override
- public ISpecialArmor.ArmorProperties getProperties (EntityLivingBase e, ItemStack s, DamageSource source, double dmg, int slot)
- {
- int priority = 0;
- double ratio = this.damageReduceAmount / 90.0D;
+ @Override
+ public ISpecialArmor.ArmorProperties getProperties (EntityLivingBase e, ItemStack s, DamageSource source, double dmg,
+ int slot)
+ {
+ int priority = 0;
+ double ratio = this.damageReduceAmount / 90.0D;
- if (source.isMagicDamage() == true)
- {
- priority = 1;
- ratio = this.damageReduceAmount / 80.0D;
- }
- else if ( (source.isFireDamage() == true) || (source.isExplosion()))
- {
- priority = 1;
- ratio = this.damageReduceAmount / 80.0D;
- }
- else if (source.isUnblockable())
- {
- priority = 0;
- ratio = 0.0D;
- }
- return new ISpecialArmor.ArmorProperties(priority, ratio, s.getMaxDamage() + 1 - s.getItemDamage());
- }
+ if (source.isMagicDamage() == true)
+ {
+ priority = 1;
+ ratio = this.damageReduceAmount / 80.0D;
+ }
+ else if ( (source.isFireDamage() == true) || (source.isExplosion()))
+ {
+ priority = 1;
+ ratio = this.damageReduceAmount / 80.0D;
+ }
+ else if (source.isUnblockable())
+ {
+ priority = 0;
+ ratio = 0.0D;
+ }
+ return new ISpecialArmor.ArmorProperties(priority, ratio, s.getMaxDamage() + 1 - s.getItemDamage());
+ }
- @Override
- public int getArmorDisplay (EntityPlayer p, ItemStack s, int slot)
- {
- return this.damageReduceAmount;
- }
+ @Override
+ public int getArmorDisplay (EntityPlayer p, ItemStack s, int slot)
+ {
+ return this.damageReduceAmount;
+ }
- @Override
- public void damageArmor (EntityLivingBase e, ItemStack s, DamageSource source, int dmg, int slot)
- {
- if (source != DamageSource.fall) s.damageItem(dmg, e);
- }
+ @Override
+ public void damageArmor (EntityLivingBase e, ItemStack s, DamageSource source, int dmg, int slot)
+ {
+ if (source != DamageSource.fall) s.damageItem(dmg, e);
+ }
- @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) + "%");
- }
+ @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)
- {
- super.onUpdate(s, w, e, j, k);
+ public void onUpdate (ItemStack s, World w, Entity e, int j, boolean k)
+ {
+ super.onUpdate(s, w, e, j, k);
- if ( (!w.isRemote) && (s.isItemDamaged()) && (e.ticksExisted % 20 == 0) && ( (e instanceof EntityLivingBase))) s.damageItem(-1, (EntityLivingBase) e);
- }
+ if ( (!w.isRemote) && (s.isItemDamaged()) && (e.ticksExisted % 20 == 0) && ( (e instanceof EntityLivingBase)))
+ s.damageItem(-1, (EntityLivingBase) e);
+ }
- public void onArmorTick (World w, EntityPlayer p, ItemStack s)
- {
- super.onArmorTick(w, p, s);
- if ( (!w.isRemote) && (s.getItemDamage() > 0) && (p.ticksExisted % 20 == 0)) s.damageItem(-1, p);
+ public void onArmorTick (World w, EntityPlayer p, ItemStack s)
+ {
+ super.onArmorTick(w, p, s);
+ if ( (!w.isRemote) && (s.getItemDamage() > 0) && (p.ticksExisted % 20 == 0)) s.damageItem(-1, p);
- double motion = Math.abs(p.motionX) + Math.abs(p.motionZ) + Math.abs(0.5 * p.motionY);
- if ( w.isRemote && (motion > .1D || !p.onGround) && w.rand.nextInt(5) == 0)
- {
- FXWispEG ef = new FXWispEG(w, (double) (p.posX + ( (Math.random() - Math.random()) * 0.5F)), (double) (p.boundingBox.minY + .05F + ( (Math.random() - Math.random()) * 0.1F)), (double) (p.posZ + ( (Math.random() - Math.random()) * 0.5F)), p);
- ParticleEngine.instance.addEffect(w, ef);
- }
+ double motion = Math.abs(p.motionX) + Math.abs(p.motionZ) + Math.abs(0.5 * p.motionY);
+ if (w.isRemote && (motion > .1D || !p.onGround) && w.rand.nextInt(5) == 0) particles(w, p);
- if (p.moveForward > 0.0F)
- {
- if ( (p.worldObj.isRemote) && (!p.isSneaking()))
- {
- if (!Thaumcraft.instance.entityEventHandler.prevStep.containsKey(Integer.valueOf(p.getEntityId())))
- {
- Thaumcraft.instance.entityEventHandler.prevStep.put(Integer.valueOf(p.getEntityId()), Float.valueOf(p.stepHeight));
- }
- p.stepHeight = 1.0F;
- }
+ if (p.moveForward > 0.0F)
+ {
+ if ( (p.worldObj.isRemote) && (!p.isSneaking()))
+ {
+ if (!Thaumcraft.instance.entityEventHandler.prevStep.containsKey(Integer.valueOf(p.getEntityId())))
+ {
+ Thaumcraft.instance.entityEventHandler.prevStep.put(Integer.valueOf(p.getEntityId()),
+ Float.valueOf(p.stepHeight));
+ }
+ p.stepHeight = 1.0F;
+ }
- if (p.onGround || p.capabilities.isFlying)
- {
- float bonus = 0.20F;
- p.moveFlying(0.0F, 1.0F, p.capabilities.isFlying ? (bonus - 0.075F) : bonus);
- p.jumpMovementFactor = 0.00002F;
- }
- else if (Hover.getHover(p.getEntityId()))
- {
- p.jumpMovementFactor = 0.03F;
+ if (p.onGround || p.capabilities.isFlying)
+ {
+ float bonus = 0.20F;
+ p.moveFlying(0.0F, 1.0F, p.capabilities.isFlying ? (bonus - 0.075F) : bonus);
+ p.jumpMovementFactor = 0.00002F;
+ }
+ else if (Hover.getHover(p.getEntityId()))
+ {
+ p.jumpMovementFactor = 0.03F;
+ }
+ else
+ {
+ p.jumpMovementFactor = 0.05F;
+ }
+ }
+ if (p.fallDistance > 3.0F) p.fallDistance = 0.0F;
+ }
- }
- else
- {
- p.jumpMovementFactor = 0.05F;
- }
- }
- if (p.fallDistance > 3.0F) p.fallDistance = 0.0F;
- }
+ @SubscribeEvent
+ public void playerJumps (LivingEvent.LivingJumpEvent event)
+ {
+ if (event.entity instanceof EntityPlayer)
+ {
+ EntityPlayer player = (EntityPlayer) event.entity;
- @SubscribeEvent
- public void playerJumps (LivingEvent.LivingJumpEvent event)
- {
- if (event.entity instanceof EntityPlayer)
- {
- EntityPlayer player = (EntityPlayer) event.entity;
+ if (player.inventory.armorItemInSlot(0) != null
+ && player.inventory.armorItemInSlot(0).getItem() == ItemRegistry.ItemVoidwalkerBoots)
+ {
+ event.entityLiving.motionY += 0.35D;
+ }
+ }
+ }
- if (player.inventory.armorItemInSlot(0) != null && player.inventory.armorItemInSlot(0).getItem() == ItemRegistry.ItemVoidwalkerBoots)
- {
- event.entityLiving.motionY += 0.35D;
- }
- }
- }
+ @SideOnly (Side.CLIENT)
+ private void particles (World w, EntityPlayer p)
+ {
+ FXWispEG ef = new FXWispEG(w, (double) (p.posX + ( (Math.random() - Math.random()) * 0.5F)),
+ (double) (p.boundingBox.minY + .05F + ( (Math.random() - Math.random()) * 0.1F)),
+ (double) (p.posZ + ( (Math.random() - Math.random()) * 0.5F)), p);
+ ParticleEngine.instance.addEffect(w, ef);
+ }
}
diff --git a/src/main/java/taintedmagic/common/items/equipment/ItemVoidwalkerSash.java b/src/main/java/taintedmagic/common/items/equipment/ItemVoidwalkerSash.java
index ce2b8f5..e4ce07f 100644
--- a/src/main/java/taintedmagic/common/items/equipment/ItemVoidwalkerSash.java
+++ b/src/main/java/taintedmagic/common/items/equipment/ItemVoidwalkerSash.java
@@ -12,10 +12,12 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumRarity;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.entity.living.LivingEvent;
+import taintedmagic.client.handler.HUDHandler;
import taintedmagic.common.TaintedMagic;
import thaumcraft.api.IRunicArmor;
import thaumcraft.api.IWarpingGear;
@@ -89,7 +91,7 @@ public class ItemVoidwalkerSash extends ItemRunic implements IRunicArmor, IWarpi
public void addInformation (ItemStack s, EntityPlayer p, List l, boolean b)
{
- l.add("\u00A78" + StatCollector.translateToLocal("text.sash.mode") + (hasSpeedBoost(s) ? " \u00A7a" : " \u00A7c") + StatCollector.translateToLocal(hasSpeedBoost(s) ? "text.sash.on" : "text.sash.off"));
+ l.add( (hasSpeedBoost(s) ? EnumChatFormatting.GREEN : EnumChatFormatting.RED) + StatCollector.translateToLocal("text.sash.mode"));
}
@Override
@@ -113,7 +115,7 @@ public class ItemVoidwalkerSash extends ItemRunic implements IRunicArmor, IWarpi
if (p.onGround || p.capabilities.isFlying)
{
- float bonus = 0.4F;
+ float bonus = 0.25F;
p.moveFlying(0.0F, 1.0F, p.capabilities.isFlying ? (bonus - 0.050F) : bonus);
}
else if (Hover.getHover(p.getEntityId()))
@@ -162,7 +164,12 @@ public class ItemVoidwalkerSash extends ItemRunic implements IRunicArmor, IWarpi
s.setTagCompound(new NBTTagCompound());
s.stackTagCompound.setBoolean(TAG_MODE, false);
}
- if (s.stackTagCompound != null) s.stackTagCompound.setBoolean(TAG_MODE, !s.stackTagCompound.getBoolean(TAG_MODE));
+ if (s.stackTagCompound != null)
+ {
+ s.stackTagCompound.setBoolean(TAG_MODE, !s.stackTagCompound.getBoolean(TAG_MODE));
+ HUDHandler.displayString( (hasSpeedBoost(s) ? EnumChatFormatting.GREEN : EnumChatFormatting.RED) + StatCollector.translateToLocal("text.sash.mode") + " "
+ + StatCollector.translateToLocal(hasSpeedBoost(s) ? "text.sash.on" : "text.sash.off"), 300, true);
+ }
}
return s;
}
diff --git a/src/main/java/taintedmagic/common/items/tools/ItemKatana.java b/src/main/java/taintedmagic/common/items/tools/ItemKatana.java
index 415042f..c213b45 100644
--- a/src/main/java/taintedmagic/common/items/tools/ItemKatana.java
+++ b/src/main/java/taintedmagic/common/items/tools/ItemKatana.java
@@ -14,39 +14,39 @@ import net.minecraft.client.gui.ScaledResolution;
import net.minecraft.client.renderer.OpenGlHelper;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.SharedMonsterAttributes;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumAction;
import net.minecraft.item.EnumRarity;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
import net.minecraft.server.MinecraftServer;
+import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.DamageSource;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.MathHelper;
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 taintedmagic.api.IHeldItemHUD;
import taintedmagic.api.IRenderInventoryItem;
import taintedmagic.client.model.ModelKatana;
import taintedmagic.client.model.ModelSaya;
import taintedmagic.common.TaintedMagic;
+import taintedmagic.common.helper.TaintedMagicHelper;
+import taintedmagic.common.items.wand.foci.ItemFocusShockwave;
import taintedmagic.common.network.PacketHandler;
import taintedmagic.common.network.PacketKatanaAttack;
import thaumcraft.api.IRepairable;
import thaumcraft.api.IWarpingGear;
import thaumcraft.client.lib.UtilsFX;
+import thaumcraft.codechicken.lib.vec.Vector3;
import thaumcraft.common.config.Config;
-import thaumcraft.common.entities.monster.EntityTaintSwarm;
import thaumcraft.common.entities.projectile.EntityExplosiveOrb;
-import thaumcraft.common.lib.utils.EntityUtils;
public class ItemKatana extends Item implements IWarpingGear, IRepairable, IRenderInventoryItem, IHeldItemHUD
{
@@ -106,7 +106,7 @@ public class ItemKatana extends Item implements IWarpingGear, IRepairable, IRend
try
{
- e.addPotionEffect(new PotionEffect(Config.potionTaintPoisonID, 100));
+ e.addPotionEffect(new PotionEffect(Potion.weakness.id, 160));
}
catch (Exception ex)
{
@@ -190,7 +190,7 @@ public class ItemKatana extends Item implements IWarpingGear, IRepairable, IRend
case 0 :
return 14.25F;
case 1 :
- return 17.55F;
+ return 17.5F;
case 2 :
return 20.75F;
}
@@ -259,19 +259,25 @@ public class ItemKatana extends Item implements IWarpingGear, IRepairable, IRend
}
case 1 :
{
- Entity look = EntityUtils.getPointedEntity(w, p, 0.0D, 32.0D, 1.1F);
- if (look != null && look instanceof EntityLivingBase)
+ List ents = w
+ .getEntitiesWithinAABB(EntityLivingBase.class, AxisAlignedBB.getBoundingBox(p.posX, p.posY, p.posZ, p.posX + 1, p.posY + 1, p.posZ + 1).expand(10.0D, 10.0D, 10.0D));
+ if (ents != null && ents.size() > 0)
{
- EntityTaintSwarm e = new EntityTaintSwarm(w);
- Vec3 v = p.getLookVec();
- e.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);
- e.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(this.getAttackDamage(s) * 2);
- e.getEntityAttribute(SharedMonsterAttributes.attackDamage).setBaseValue(this.getAttackDamage(s));
- e.setTarget(look);
- e.setIsSummoned(true);
- if (!w.isRemote) w.spawnEntityInWorld(e);
+ for (int a = 0; a < ents.size(); a++)
+ {
+ EntityLivingBase e = ents.get(a);
+ if (e != p && e.isEntityAlive() && !e.isEntityInvulnerable())
+ {
+ double dist = TaintedMagicHelper.getDistanceTo(e.posX, e.posY, e.posZ, p);
+ e.attackEntityFrom(DamageSource.magic, getAttackDamage(s) * 0.25F);
+ Vector3 movement = TaintedMagicHelper.getVectorBetweenEntities(e, p);
+ e.addVelocity(movement.x * 5.0D, 1.5D, movement.z * 5.0D);
+ if (w.isRemote) ItemFocusShockwave.spawnParticles(w, p, e);
+ }
+ }
}
+ w.playSoundAtEntity(p, "taintedmagic:shockwave", 5.0F, 1.5F * (float) Math.random());
p.swingItem();
break;
}
diff --git a/src/main/java/taintedmagic/common/items/tools/ItemThaumicDisassembler.java b/src/main/java/taintedmagic/common/items/tools/ItemThaumicDisassembler.java
index aa1d601..651fb47 100644
--- a/src/main/java/taintedmagic/common/items/tools/ItemThaumicDisassembler.java
+++ b/src/main/java/taintedmagic/common/items/tools/ItemThaumicDisassembler.java
@@ -19,15 +19,17 @@ import net.minecraft.item.Item;
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 taintedmagic.api.IHeldItemHUD;
+import taintedmagic.client.handler.HUDHandler;
import taintedmagic.common.TaintedMagic;
import thaumcraft.api.aspects.Aspect;
import thaumcraft.api.aspects.AspectList;
import thaumcraft.common.items.wands.WandManager;
-public class ItemThaumicDisassembler extends Item implements IHeldItemHUD
+public class ItemThaumicDisassembler extends Item
{
public static final String TAG_MODE = "mode";
public static List data = new ArrayList();
@@ -52,8 +54,8 @@ public class ItemThaumicDisassembler extends Item implements IHeldItemHUD
{
super.addInformation(s, p, l, b);
- 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(StatCollector.translateToLocal("text.disassembler.mode") + ": " + getModeName(s));
+ l.add(StatCollector.translateToLocal("text.disassembler.efficiency") + ": " + (getMode(s) == 3 ? "\u00A7c" : "\u00A7a") + getEfficiency(s));
l.add(" ");
l.add("\u00A79" + "+20 " + StatCollector.translateToLocal("text.attackdamage"));
}
@@ -111,7 +113,16 @@ public class ItemThaumicDisassembler extends Item implements IHeldItemHUD
@Override
public ItemStack onItemRightClick (ItemStack s, World w, EntityPlayer p)
{
- if (!w.isRemote && p.isSneaking()) toggleMode(s);
+ if (!w.isRemote && p.isSneaking())
+ {
+ if (s.stackTagCompound == null) s.setTagCompound(new NBTTagCompound());
+ s.stackTagCompound.setInteger(TAG_MODE, getMode(s) < 3 ? getMode(s) + 1 : 0);
+
+ int mode = getMode(s);
+ String str = EnumChatFormatting.GRAY + StatCollector.translateToLocal("text.disassembler.mode") + ": " + getModeName(mode) + (mode == 3 ? "\u00A7c" : "\u00A7a") + " ("
+ + getEfficiency(mode) + ")";
+ HUDHandler.displayString(str, 300, false);
+ }
return s;
}
@@ -164,12 +175,6 @@ public class ItemThaumicDisassembler extends Item implements IHeldItemHUD
return getModeName(getMode(s));
}
- public void toggleMode (ItemStack s)
- {
- if (s.stackTagCompound == null) s.setTagCompound(new NBTTagCompound());
- s.stackTagCompound.setInteger(TAG_MODE, getMode(s) < 3 ? getMode(s) + 1 : 0);
- }
-
public void onUpdate (ItemStack s, World w, Entity e, int i, boolean b)
{
super.onUpdate(s, w, e, i, b);
@@ -182,42 +187,4 @@ public class ItemThaumicDisassembler extends Item implements IHeldItemHUD
}
}
}
-
- @Override
- public void renderHUD (ScaledResolution res, EntityPlayer p, ItemStack s, float partialTicks, float fract)
- {
- if (data.isEmpty())
- {
- data.add(getMode(s));
- }
-
- if (!data.isEmpty() && getMode(s) != data.get(0))
- {
- data.clear();
- data.add(getMode(s));
- }
-
- int mode = data.get(0);
- String str = "\u00A78" + StatCollector.translateToLocal("text.disassembler.mode") + ": " + getModeName(mode) + (mode == 3 ? "\u00A7c" : "\u00A7a") + " (" + getEfficiency(mode) + ")";
-
- GL11.glPushMatrix();
-
- GL11.glEnable(GL11.GL_BLEND);
- GL11.glEnable(GL12.GL_RESCALE_NORMAL);
-
- GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
-
- GL11.glTranslated(40.0F, -15.0F, 0.0F);
- GL11.glTranslatef(-fract * 40.0F, 0.0F, 0.0F);
-
- GL11.glScalef(0.8F, 0.8F, 0.8F);
-
- FontRenderer f = Minecraft.getMinecraft().fontRenderer;
- f.drawStringWithShadow(str, res.getScaledWidth() / 2 + 100, res.getScaledHeight() / 2 + (p.capabilities.isCreativeMode ? 230 : 212), 0xFFFFFF);
-
- GL11.glDisable(GL11.GL_BLEND);
- GL11.glDisable(GL12.GL_RESCALE_NORMAL);
-
- GL11.glPopMatrix();
- }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/taintedmagic/common/items/wand/foci/FocusUpgrades.java b/src/main/java/taintedmagic/common/items/wand/foci/FocusUpgrades.java
index 6ba54b5..90438f9 100644
--- a/src/main/java/taintedmagic/common/items/wand/foci/FocusUpgrades.java
+++ b/src/main/java/taintedmagic/common/items/wand/foci/FocusUpgrades.java
@@ -1,6 +1,7 @@
package taintedmagic.common.items.wand.foci;
import net.minecraft.util.ResourceLocation;
+import taintedmagic.common.handler.ConfigHandler;
import thaumcraft.api.aspects.Aspect;
import thaumcraft.api.aspects.AspectList;
import thaumcraft.api.wands.FocusUpgradeType;
@@ -15,20 +16,20 @@ public class FocusUpgrades
public static void init ()
{
- int idx = 63;
- sanity = new FocusUpgradeType(idx++, new ResourceLocation("taintedmagic:textures/foci/IconSanity.png"), "focus.upgrade.sanity.name", "focus.upgrade.sanity.text",
+ int id = ConfigHandler.FOCUS_UPGRADES_START_ID;
+ 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));
- antibody = new FocusUpgradeType(idx++, new ResourceLocation("taintedmagic:textures/foci/IconAntibody.png"), "focus.upgrade.antibody.name", "focus.upgrade.antibody.text",
+ 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));
- corrosive = new FocusUpgradeType(idx++, new ResourceLocation("taintedmagic:textures/foci/IconCorrosive.png"), "focus.upgrade.corrosive.name", "focus.upgrade.corrosive.text",
+ 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));
- persistent = new FocusUpgradeType(idx++, new ResourceLocation("taintedmagic:textures/foci/IconPersistent.png"), "focus.upgrade.persistent.name", "focus.upgrade.persistent.text",
+ 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));
- diffusion = new FocusUpgradeType(idx++, new ResourceLocation("taintedmagic:textures/foci/IconDiffusion.png"), "focus.upgrade.diffusion.name", "focus.upgrade.diffusion.text",
+ 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, 2).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
index 923b11f..e1c1cfd 100644
--- a/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusDarkMatter.java
+++ b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusDarkMatter.java
@@ -1,20 +1,30 @@
package taintedmagic.common.items.wand.foci;
+import org.lwjgl.opengl.GL11;
+
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.IIcon;
import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.util.ResourceLocation;
import net.minecraft.world.World;
+import taintedmagic.api.IRenderInventoryItem;
import taintedmagic.common.TaintedMagic;
import taintedmagic.common.entities.EntityDarkMatter;
import taintedmagic.common.entities.EntityDiffusion;
+import thaumcraft.api.ThaumcraftApiHelper;
import thaumcraft.api.aspects.Aspect;
import thaumcraft.api.aspects.AspectList;
import thaumcraft.api.wands.FocusUpgradeType;
import thaumcraft.api.wands.ItemFocusBasic;
+import thaumcraft.client.lib.UtilsFX;
import thaumcraft.common.Thaumcraft;
import thaumcraft.common.items.wands.ItemWandCasting;
@@ -179,4 +189,9 @@ public class ItemFocusDarkMatter extends ItemFocusBasic
}
return null;
}
+
+ public boolean canApplyUpgrade (ItemStack s, EntityPlayer p, FocusUpgradeType t, int rank)
+ {
+ return (!t.equals(FocusUpgrades.diffusion)) || (ThaumcraftApiHelper.isResearchComplete(p.getCommandSenderName(), "DIFFUSIONUPGRADE"));
+ }
}
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 d118209..882171f 100644
--- a/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusMageMace.java
+++ b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusMageMace.java
@@ -13,6 +13,7 @@ import net.minecraft.util.MovingObjectPosition;
import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
import taintedmagic.common.TaintedMagic;
+import taintedmagic.common.handler.ConfigHandler;
import thaumcraft.api.aspects.Aspect;
import thaumcraft.api.aspects.AspectList;
import thaumcraft.api.wands.FocusUpgradeType;
@@ -68,7 +69,7 @@ public class ItemFocusMageMace extends ItemFocusBasic
public int getFocusColor (ItemStack s)
{
- return 0x5F6166;
+ return 0xACA9B5;
}
public AspectList getVisCost (ItemStack s)
@@ -101,7 +102,7 @@ public class ItemFocusMageMace extends ItemFocusBasic
{
super.addInformation(s, p, l, b);
l.add(" ");
- l.add(EnumChatFormatting.BLUE + "+" + new String(this.isUpgradedWith(s, FocusUpgradeType.potency) ? Integer.toString(15 + this.getUpgradeLevel(s, FocusUpgradeType.potency)) : "15") + " "
+ l.add(EnumChatFormatting.BLUE + "+" + String.valueOf(ConfigHandler.MAGE_MACE_DMG_INC_BASE + (double) this.getUpgradeLevel(s, FocusUpgradeType.potency)) + " "
+ StatCollector.translateToLocal("text.attackdamageequipped"));
}
diff --git a/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusShockwave.java b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusShockwave.java
index 05c98a3..6037a06 100644
--- a/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusShockwave.java
+++ b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusShockwave.java
@@ -86,7 +86,8 @@ public class ItemFocusShockwave extends ItemFocusBasic
{
super.addInformation(s, p, l, b);
l.add(" ");
- l.add(EnumChatFormatting.BLUE + "+" + new String(this.isUpgradedWith(s, FocusUpgradeType.enlarge) ? Integer.toString(15 + this.getUpgradeLevel(s, FocusUpgradeType.enlarge)) : "15") + " " + StatCollector.translateToLocal("text.radius"));
+ l.add(EnumChatFormatting.BLUE + "+" + new String(this.isUpgradedWith(s, FocusUpgradeType.enlarge) ? Integer.toString(15 + this.getUpgradeLevel(s, FocusUpgradeType.enlarge)) : "15") + " "
+ + StatCollector.translateToLocal("text.radius"));
}
public ItemStack onFocusRightClick (ItemStack s, World w, EntityPlayer p, MovingObjectPosition mop)
@@ -96,7 +97,8 @@ public class ItemFocusShockwave extends ItemFocusBasic
int pot = wand.getFocusPotency(s);
if (wand.consumeAllVis(s, p, getVisCost(s), true, false))
{
- List ents = w.getEntitiesWithinAABB(EntityLivingBase.class, AxisAlignedBB.getBoundingBox(p.posX, p.posY, p.posZ, p.posX + 1, p.posY + 1, p.posZ + 1).expand(15.0D + this.getUpgradeLevel(s, FocusUpgradeType.enlarge), 15.0D + this.getUpgradeLevel(s, FocusUpgradeType.enlarge), 15.0D + this.getUpgradeLevel(s, FocusUpgradeType.enlarge)));
+ List ents = w.getEntitiesWithinAABB(EntityLivingBase.class, AxisAlignedBB.getBoundingBox(p.posX, p.posY, p.posZ, p.posX + 1, p.posY + 1, p.posZ + 1).expand(15.0D
+ + this.getUpgradeLevel(s, FocusUpgradeType.enlarge), 15.0D + this.getUpgradeLevel(s, FocusUpgradeType.enlarge), 15.0D + this.getUpgradeLevel(s, FocusUpgradeType.enlarge)));
if (ents != null && ents.size() > 0)
{
for (int a = 0; a < ents.size(); a++)
@@ -106,9 +108,10 @@ public class ItemFocusShockwave extends ItemFocusBasic
if (e != p && e.isEntityAlive() && !e.isEntityInvulnerable())
{
double dist = TaintedMagicHelper.getDistanceTo(e.posX, e.posY, e.posZ, p);
- if (dist < 7.0D) e.attackEntityFrom(DamageSource.magic, 2.0F);
+ if (dist < 7.0D) e.attackEntityFrom(DamageSource.magic, 2.0F + this.getUpgradeLevel(s, FocusUpgradeType.potency));
Vector3 movement = TaintedMagicHelper.getVectorBetweenEntities(e, p);
- e.addVelocity(movement.x * 5.0D, 1.5D, movement.z * 5.0D);
+ e.addVelocity(movement.x * (5.0D + this.getUpgradeLevel(s, FocusUpgradeType.potency)), 1.5D + (this.getUpgradeLevel(s, FocusUpgradeType.potency) * 0.1D), movement.z
+ * (5.0D + this.getUpgradeLevel(s, FocusUpgradeType.potency)));
if (w.isRemote) spawnParticles(w, p, e);
}
}
@@ -120,7 +123,7 @@ public class ItemFocusShockwave extends ItemFocusBasic
}
@SideOnly (Side.CLIENT)
- public void spawnParticles (World w, EntityPlayer p, Entity e)
+ public static void spawnParticles (World w, EntityPlayer p, Entity e)
{
FXLightningBolt bolt = new FXLightningBolt(w, p, e, w.rand.nextLong(), 4);
@@ -130,7 +133,8 @@ public class ItemFocusShockwave extends ItemFocusBasic
bolt.finalizeBolt();
for (int a = 0; a < 5; a++)
{
- Thaumcraft.proxy.sparkle((float) e.posX + (p.worldObj.rand.nextFloat() - p.worldObj.rand.nextFloat()) * 0.6F, (float) e.posY + (p.worldObj.rand.nextFloat() - p.worldObj.rand.nextFloat()) * 0.6F, (float) e.posZ + (p.worldObj.rand.nextFloat() - p.worldObj.rand.nextFloat()) * 0.6F, 2.0F + p.worldObj.rand.nextFloat(), 2, 0.05F + p.worldObj.rand.nextFloat() * 0.05F);
+ Thaumcraft.proxy.sparkle((float) e.posX + (p.worldObj.rand.nextFloat() - p.worldObj.rand.nextFloat()) * 0.6F, (float) e.posY + (p.worldObj.rand.nextFloat() - p.worldObj.rand.nextFloat())
+ * 0.6F, (float) e.posZ + (p.worldObj.rand.nextFloat() - p.worldObj.rand.nextFloat()) * 0.6F, 2.0F + p.worldObj.rand.nextFloat(), 2, 0.05F + p.worldObj.rand.nextFloat() * 0.05F);
}
}
@@ -139,15 +143,15 @@ public class ItemFocusShockwave extends ItemFocusBasic
switch (rank)
{
case 1 :
- return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.enlarge };
+ return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.enlarge, FocusUpgradeType.potency };
case 2 :
- return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.enlarge };
+ return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.enlarge, FocusUpgradeType.potency };
case 3 :
- return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.enlarge };
+ return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.enlarge, FocusUpgradeType.potency };
case 4 :
- return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.enlarge };
+ return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.enlarge, FocusUpgradeType.potency };
case 5 :
- return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.enlarge };
+ return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.enlarge, FocusUpgradeType.potency };
}
return null;
}
diff --git a/src/main/java/taintedmagic/common/lib/LibToolMaterials.java b/src/main/java/taintedmagic/common/lib/LibToolMaterials.java
index 803ebc4..fa63d0d 100644
--- a/src/main/java/taintedmagic/common/lib/LibToolMaterials.java
+++ b/src/main/java/taintedmagic/common/lib/LibToolMaterials.java
@@ -12,6 +12,7 @@ public class LibToolMaterials
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 376c01f..e06600e 100644
--- a/src/main/java/taintedmagic/common/network/PacketHandler.java
+++ b/src/main/java/taintedmagic/common/network/PacketHandler.java
@@ -7,11 +7,10 @@ import taintedmagic.common.lib.LibInfo;
public class PacketHandler
{
- public static final SimpleNetworkWrapper INSTANCE = NetworkRegistry.INSTANCE.newSimpleChannel(LibInfo.MODID.toLowerCase());
+ public static final SimpleNetworkWrapper INSTANCE = NetworkRegistry.INSTANCE.newSimpleChannel(LibInfo.MODID.toLowerCase());
- public static void init ()
- {
- int idx = 0;
- INSTANCE.registerMessage(PacketKatanaAttack.class, PacketKatanaAttack.class, idx++, Side.SERVER);
- }
+ public static void init ()
+ {
+ INSTANCE.registerMessage(PacketKatanaAttack.class, PacketKatanaAttack.class, 0, Side.SERVER);
+ }
}
diff --git a/src/main/java/taintedmagic/common/registry/BlockRegistry.java b/src/main/java/taintedmagic/common/registry/BlockRegistry.java
index 7873344..3c6c73d 100644
--- a/src/main/java/taintedmagic/common/registry/BlockRegistry.java
+++ b/src/main/java/taintedmagic/common/registry/BlockRegistry.java
@@ -3,6 +3,7 @@ package taintedmagic.common.registry;
import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraft.block.Block;
import taintedmagic.common.blocks.BlockLumos;
+import taintedmagic.common.blocks.BlockNightshadeBush;
import taintedmagic.common.blocks.BlockShadowOre;
import taintedmagic.common.blocks.BlockShadowmetal;
import taintedmagic.common.blocks.BlockWarpwoodLeaves;
@@ -15,43 +16,6 @@ import taintedmagic.common.items.blocks.ItemBlockWarpwoodSapling;
public class BlockRegistry
{
- public static void init ()
- {
- // Shadow Ore
- BlockShadowOre = new BlockShadowOre();
- GameRegistry.registerBlock(BlockShadowOre, ItemBlockShadowOre.class, "BlockShadowOre");
-
- // Warpwood Log
- BlockWarpwoodLog = new BlockWarpwoodLog();
- GameRegistry.registerBlock(BlockWarpwoodLog, "BlockWarpwoodLog");
-
- // Block of Shadowmetal
- BlockShadowmetal = new BlockShadowmetal();
- GameRegistry.registerBlock(BlockShadowmetal, "BlockShadowmetal");
-
- // Warpwood Planks
- BlockWarpwoodPlanks = new BlockWarpwoodPlanks();
- GameRegistry.registerBlock(BlockWarpwoodPlanks, "BlockWarpwoodPlanks");
-
- // Warpwood Leaves
- BlockWarpwoodLeaves = new BlockWarpwoodLeaves();
- GameRegistry.registerBlock(BlockWarpwoodLeaves, "BlockWarpwoodLeaves");
-
- // Warpwood Sapling
- BlockWarpwoodSapling = new BlockWarpwoodSapling();
- GameRegistry.registerBlock(BlockWarpwoodSapling, ItemBlockWarpwoodSapling.class, "BlockWarpwoodSapling");
-
- // Lumos sparkles
- BlockLumos = new BlockLumos();
- GameRegistry.registerBlock(BlockLumos, "BlockLumos");
- }
-
- public static void initTiles ()
- {
- // Lumos
- GameRegistry.registerTileEntity(TileLumos.class, "TileLumos");
- }
-
public static Block BlockShadowOre;
public static Block BlockWarpwoodLog;
public static Block BlockWarpwoodLeaves;
@@ -59,4 +23,37 @@ public class BlockRegistry
public static Block BlockShadowmetal;
public static Block BlockWarpwoodPlanks;
public static Block BlockLumos;
+ public static Block BlockNightshadeBush;
+
+ public static void init ()
+ {
+ BlockShadowOre = new BlockShadowOre();
+ GameRegistry.registerBlock(BlockShadowOre, ItemBlockShadowOre.class, "BlockShadowOre");
+
+ BlockWarpwoodLog = new BlockWarpwoodLog();
+ GameRegistry.registerBlock(BlockWarpwoodLog, "BlockWarpwoodLog");
+
+ BlockShadowmetal = new BlockShadowmetal();
+ GameRegistry.registerBlock(BlockShadowmetal, "BlockShadowmetal");
+
+ BlockWarpwoodPlanks = new BlockWarpwoodPlanks();
+ GameRegistry.registerBlock(BlockWarpwoodPlanks, "BlockWarpwoodPlanks");
+
+ BlockWarpwoodLeaves = new BlockWarpwoodLeaves();
+ GameRegistry.registerBlock(BlockWarpwoodLeaves, "BlockWarpwoodLeaves");
+
+ BlockWarpwoodSapling = new BlockWarpwoodSapling();
+ GameRegistry.registerBlock(BlockWarpwoodSapling, ItemBlockWarpwoodSapling.class, "BlockWarpwoodSapling");
+
+ BlockLumos = new BlockLumos();
+ GameRegistry.registerBlock(BlockLumos, "BlockLumos");
+
+ BlockNightshadeBush = new BlockNightshadeBush();
+ GameRegistry.registerBlock(BlockNightshadeBush, "BlockNightshadeBush");
+ }
+
+ public static void initTiles ()
+ {
+ GameRegistry.registerTileEntity(TileLumos.class, "TileLumos");
+ }
}
\ No newline at end of file
diff --git a/src/main/java/taintedmagic/common/registry/ItemRegistry.java b/src/main/java/taintedmagic/common/registry/ItemRegistry.java
index 2ee2ea9..617fc8a 100644
--- a/src/main/java/taintedmagic/common/registry/ItemRegistry.java
+++ b/src/main/java/taintedmagic/common/registry/ItemRegistry.java
@@ -11,9 +11,12 @@ import net.minecraft.item.ItemStack;
import net.minecraft.item.ItemSword;
import net.minecraft.util.ResourceLocation;
import taintedmagic.common.handler.WandHandler;
+import taintedmagic.common.items.ItemCrimsonBlood;
import taintedmagic.common.items.ItemFlyteCharm;
+import taintedmagic.common.items.ItemGatekey;
import taintedmagic.common.items.ItemMagicFunguar;
import taintedmagic.common.items.ItemMaterial;
+import taintedmagic.common.items.ItemNightshadeBerries;
import taintedmagic.common.items.ItemSalis;
import taintedmagic.common.items.ItemVoidsentBlood;
import taintedmagic.common.items.equipment.ItemLumosRing;
@@ -47,186 +50,207 @@ import thaumcraft.api.wands.WandRod;
public class ItemRegistry
{
- public static void init ()
- {
- ItemMaterial = new ItemMaterial();
- GameRegistry.registerItem(ItemMaterial, "ItemMaterial");
+ public static Item ItemMagicFunguar;
+ public static Item ItemNightshadeBerries;
+ public static Item ItemMaterial;
+ public static Item ItemVoidsentBlood;
+ public static Item ItemCrimsonBlood;
+ public static Item ItemFlyteCharm;
+ public static Item ItemSalis;
+ public static Item ItemGatekey;
- ItemVoidsentBlood = new ItemVoidsentBlood();
- GameRegistry.registerItem(ItemVoidsentBlood, "ItemVoidsentBlood");
+ // Wand
+ public static Item ItemWandRod;
- ItemMagicFunguar = new ItemMagicFunguar(5, 1.0F, false);
- GameRegistry.registerItem(ItemMagicFunguar, "ItemMagicFunguar");
+ public static WandRod WAND_ROD_WARPWOOD;
+ public static StaffRod STAFF_ROD_WARPWOOD;
- ItemFlyteCharm = new ItemFlyteCharm();
- GameRegistry.registerItem(ItemFlyteCharm, "ItemFlyteCharm");
+ public static Item ItemWandCap;
- ItemSalis = new ItemSalis();
- GameRegistry.registerItem(ItemSalis, "ItemSalis");
+ public static WandCap WAND_CAP_SHADOWMETAL;
+ public static WandCap WAND_CAP_CLOTH;
+ public static WandCap WAND_CAP_CRIMSON_CLOTH;
+ public static WandCap WAND_CAP_SHADOW_CLOTH;
- // Armor and Baubles
- ItemWarpedGoggles = new ItemWarpedGoggles(LibToolMaterials.armorMatSpecial, 4, 0);
- GameRegistry.registerItem(ItemWarpedGoggles, "ItemWarpedGoggles");
+ // Foci
+ public static Item ItemFocusTaintSwarm;
+ public static Item ItemFocusDarkMatter;
+ public static Item ItemFocusMageMace;
+ public static Item ItemFocusShockwave;
+ public static Item ItemFocusVisShard;
+ public static Item ItemFocusLumos;
- ItemVoidFortressHelmet = new ItemVoidFortressArmor(LibToolMaterials.armorMatVoidFortress, 4, 0).setUnlocalizedName("ItemVoidFortressHelmet");
- GameRegistry.registerItem(ItemVoidFortressHelmet, "ItemVoidFortressHelmet");
+ // Armor and Baubles
+ public static Item ItemWarpedGoggles;
+ public static Item ItemVoidmetalGoggles;
- ItemVoidFortressChestplate = new ItemVoidFortressArmor(LibToolMaterials.armorMatVoidFortress, 4, 1).setUnlocalizedName("ItemVoidFortressChestplate");
- GameRegistry.registerItem(ItemVoidFortressChestplate, "ItemVoidFortressChestplate");
+ public static Item ItemVoidwalkerBoots;
+ public static Item ItemVoidwalkerSash;
- ItemVoidFortressLeggings = new ItemVoidFortressArmor(LibToolMaterials.armorMatVoidFortress, 4, 2).setUnlocalizedName("ItemVoidFortressLeggings");
- GameRegistry.registerItem(ItemVoidFortressLeggings, "ItemVoidFortressLeggings");
+ public static Item ItemVoidFortressHelmet;
+ public static Item ItemVoidFortressChestplate;
+ public static Item ItemVoidFortressLeggings;
- ItemVoidwalkerBoots = new ItemVoidwalkerBoots(LibToolMaterials.armorMatSpecial, 4, 3).setUnlocalizedName("ItemVoidwalkerBoots");
- GameRegistry.registerItem(ItemVoidwalkerBoots, "ItemVoidwalkerBoots");
+ public static Item ItemShadowFortressHelmet;
+ public static Item ItemShadowFortressChestplate;
+ public static Item ItemShadowFortressLeggings;
- ItemVoidwalkerSash = new ItemVoidwalkerSash();
- GameRegistry.registerItem(ItemVoidwalkerSash, "ItemVoidwalkerSash");
+ public static Item ItemLumosRing;
- ItemShadowFortressHelmet = new ItemShadowFortressArmor(LibToolMaterials.armorMatShadowFortress, 4, 0).setUnlocalizedName("ItemShadowFortressHelmet");
- GameRegistry.registerItem(ItemShadowFortressHelmet, "ItemShadowFortressHelmet");
+ // Tools
+ public static Item ItemThaumicDisassembler;
+ public static Item ItemHollowDagger;
- ItemShadowFortressChestplate = new ItemShadowFortressArmor(LibToolMaterials.armorMatShadowFortress, 4, 1).setUnlocalizedName("ItemShadowFortressChestplate");
- GameRegistry.registerItem(ItemShadowFortressChestplate, "ItemShadowFortressChestplate");
+ public static ItemHoe ItemShadowmetalHoe;
+ public static ItemPickaxe ItemShadowmetalPick;
+ public static ItemSpade ItemShadowmetalSpade;
+ public static ItemAxe ItemShadowmetalAxe;
+ public static ItemSword ItemShadowmetalSword;
- ItemShadowFortressLeggings = new ItemShadowFortressArmor(LibToolMaterials.armorMatShadowFortress, 4, 2).setUnlocalizedName("ItemShadowFortressLeggings");
- GameRegistry.registerItem(ItemShadowFortressLeggings, "ItemShadowFortressLeggings");
+ public static ItemSword ItemPrimordialEdge;
- ItemVoidmetalGoggles = new ItemVoidmetalGoggles(ArmorMaterial.IRON, 4, 0);
- GameRegistry.registerItem(ItemVoidmetalGoggles, "ItemVoidmetalGoggles");
+ public static Item ItemKatana;
- ItemLumosRing = new ItemLumosRing();
- GameRegistry.registerItem(ItemLumosRing, "ItemLumosRing");
+ public static void init ()
+ {
+ ItemMaterial = new ItemMaterial();
+ GameRegistry.registerItem(ItemMaterial, "ItemMaterial");
- // Wands and Staves
- ItemWandRod = new ItemWandRod();
- GameRegistry.registerItem(ItemWandRod, "ItemWandRod");
+ ItemVoidsentBlood = new ItemVoidsentBlood();
+ GameRegistry.registerItem(ItemVoidsentBlood, "ItemVoidsentBlood");
- WAND_ROD_WARPWOOD = new WandRod("warpwood", 250, new ItemStack(ItemWandRod, 1, 0), 16, new WandHandler(), new ResourceLocation("taintedmagic:textures/models/ModelWAND_ROD_WARPWOOD.png"));
- WAND_ROD_WARPWOOD.setGlowing(true);
+ ItemCrimsonBlood = new ItemCrimsonBlood();
+ GameRegistry.registerItem(ItemCrimsonBlood, "ItemCrimsonBlood");
- STAFF_ROD_WARPWOOD = new StaffRod("warpwood", 500, new ItemStack(ItemWandRod, 1, 1), 20, new WandHandler(), new ResourceLocation("taintedmagic:textures/models/ModelWAND_ROD_WARPWOOD.png"));
- STAFF_ROD_WARPWOOD.setRunes(true);
- STAFF_ROD_WARPWOOD.setGlowing(true);
+ ItemMagicFunguar = new ItemMagicFunguar(5, 1.0F, false);
+ GameRegistry.registerItem(ItemMagicFunguar, "ItemMagicFunguar");
- ItemWandCap = new ItemWandCap();
- GameRegistry.registerItem(ItemWandCap, "ItemWandCap");
+ ItemNightshadeBerries = new ItemNightshadeBerries(0, 0.0F, false);
+ GameRegistry.registerItem(ItemNightshadeBerries, "ItemNightshadeBerries");
- WAND_CAP_SHADOWMETAL = new WandCap("shadowmetal", 0.70F, new ItemStack(ItemWandCap, 1, 0), 12);
- WAND_CAP_SHADOWMETAL.setTexture(new ResourceLocation("taintedmagic:textures/models/ModelWAND_CAP_SHADOWMETAL.png"));
+ ItemFlyteCharm = new ItemFlyteCharm();
+ GameRegistry.registerItem(ItemFlyteCharm, "ItemFlyteCharm");
- WAND_CAP_CLOTH = new WandCap("cloth", 0.95F, new ItemStack(ItemWandCap, 1, 1), 3);
- WAND_CAP_CLOTH.setTexture(new ResourceLocation("taintedmagic:textures/models/ModelWAND_CAP_CLOTH.png"));
+ ItemSalis = new ItemSalis();
+ GameRegistry.registerItem(ItemSalis, "ItemSalis");
- WAND_CAP_CRIMSON_CLOTH = new WandCap("crimsoncloth", 0.85F, new ItemStack(ItemWandCap, 1, 2), 5);
- WAND_CAP_CRIMSON_CLOTH.setTexture(new ResourceLocation("taintedmagic:textures/models/ModelWAND_CAP_CRIMSON_CLOTH.png"));
+ ItemGatekey = new ItemGatekey();
+ GameRegistry.registerItem(ItemGatekey, "ItemGatekey");
- WAND_CAP_SHADOW_CLOTH = new WandCap("shadowcloth", 0.90F, new ItemStack(ItemWandCap, 1, 3), 3);
- WAND_CAP_SHADOW_CLOTH.setTexture(new ResourceLocation("taintedmagic:textures/models/ModelWAND_CAP_SHADOW_CLOTH.png"));
+ // Armor and Baubles
+ ItemWarpedGoggles = new ItemWarpedGoggles(LibToolMaterials.armorMatSpecial, 4, 0);
+ GameRegistry.registerItem(ItemWarpedGoggles, "ItemWarpedGoggles");
- // Foci
- ItemFocusTaintSwarm = new ItemFocusTaintSwarm();
- GameRegistry.registerItem(ItemFocusTaintSwarm, "ItemFocusTaintSwarm");
+ ItemVoidFortressHelmet = new ItemVoidFortressArmor(LibToolMaterials.armorMatVoidFortress, 4, 0)
+ .setUnlocalizedName("ItemVoidFortressHelmet");
+ GameRegistry.registerItem(ItemVoidFortressHelmet, "ItemVoidFortressHelmet");
- ItemFocusDarkMatter = new ItemFocusDarkMatter();
- GameRegistry.registerItem(ItemFocusDarkMatter, "ItemFocusDarkMatter");
+ ItemVoidFortressChestplate = new ItemVoidFortressArmor(LibToolMaterials.armorMatVoidFortress, 4, 1)
+ .setUnlocalizedName("ItemVoidFortressChestplate");
+ GameRegistry.registerItem(ItemVoidFortressChestplate, "ItemVoidFortressChestplate");
- ItemFocusMageMace = new ItemFocusMageMace();
- GameRegistry.registerItem(ItemFocusMageMace, "ItemFocusMageMace");
+ ItemVoidFortressLeggings = new ItemVoidFortressArmor(LibToolMaterials.armorMatVoidFortress, 4, 2)
+ .setUnlocalizedName("ItemVoidFortressLeggings");
+ GameRegistry.registerItem(ItemVoidFortressLeggings, "ItemVoidFortressLeggings");
- ItemFocusShockwave = new ItemFocusShockwave();
- GameRegistry.registerItem(ItemFocusShockwave, "ItemFocusShockwave");
+ ItemVoidwalkerBoots =
+ new ItemVoidwalkerBoots(LibToolMaterials.armorMatSpecial, 4, 3).setUnlocalizedName("ItemVoidwalkerBoots");
+ GameRegistry.registerItem(ItemVoidwalkerBoots, "ItemVoidwalkerBoots");
- ItemFocusVisShard = new ItemFocusVisShard();
- GameRegistry.registerItem(ItemFocusVisShard, "ItemFocusVisShard");
+ ItemVoidwalkerSash = new ItemVoidwalkerSash();
+ GameRegistry.registerItem(ItemVoidwalkerSash, "ItemVoidwalkerSash");
- ItemFocusLumos = new ItemFocusLumos();
- GameRegistry.registerItem(ItemFocusLumos, "ItemFocusLumos");
+ ItemShadowFortressHelmet = new ItemShadowFortressArmor(LibToolMaterials.armorMatShadowFortress, 4, 0)
+ .setUnlocalizedName("ItemShadowFortressHelmet");
+ GameRegistry.registerItem(ItemShadowFortressHelmet, "ItemShadowFortressHelmet");
- // Tools
- ItemThaumicDisassembler = new ItemThaumicDisassembler();
- GameRegistry.registerItem(ItemThaumicDisassembler, "ItemThaumicDisassembler");
+ ItemShadowFortressChestplate = new ItemShadowFortressArmor(LibToolMaterials.armorMatShadowFortress, 4, 1)
+ .setUnlocalizedName("ItemShadowFortressChestplate");
+ GameRegistry.registerItem(ItemShadowFortressChestplate, "ItemShadowFortressChestplate");
- ItemHollowDagger = new ItemHollowDagger(LibToolMaterials.toolMatHollow);
- GameRegistry.registerItem(ItemHollowDagger, "ItemHollowDagger");
+ ItemShadowFortressLeggings = new ItemShadowFortressArmor(LibToolMaterials.armorMatShadowFortress, 4, 2)
+ .setUnlocalizedName("ItemShadowFortressLeggings");
+ GameRegistry.registerItem(ItemShadowFortressLeggings, "ItemShadowFortressLeggings");
- ItemShadowmetalHoe = new ItemShadowmetalHoe(LibToolMaterials.toolMatShadow);
- GameRegistry.registerItem(ItemShadowmetalHoe, "ItemShadowmetalHoe");
+ ItemVoidmetalGoggles = new ItemVoidmetalGoggles(ArmorMaterial.IRON, 4, 0);
+ GameRegistry.registerItem(ItemVoidmetalGoggles, "ItemVoidmetalGoggles");
- ItemShadowmetalPick = new ItemShadowmetalPick(LibToolMaterials.toolMatShadow);
- GameRegistry.registerItem(ItemShadowmetalPick, "ItemShadowmetalPick");
+ ItemLumosRing = new ItemLumosRing();
+ GameRegistry.registerItem(ItemLumosRing, "ItemLumosRing");
- ItemShadowmetalAxe = new ItemShadowmetalAxe(LibToolMaterials.toolMatShadow);
- GameRegistry.registerItem(ItemShadowmetalAxe, "ItemShadowmetalAxe");
+ // Wands and Staves
+ ItemWandRod = new ItemWandRod();
+ GameRegistry.registerItem(ItemWandRod, "ItemWandRod");
- ItemShadowmetalSpade = new ItemShadowmetalSpade(LibToolMaterials.toolMatShadow);
- GameRegistry.registerItem(ItemShadowmetalSpade, "ItemShadowmetalSpade");
+ WAND_ROD_WARPWOOD = new WandRod("warpwood", 250, new ItemStack(ItemWandRod, 1, 0), 16, new WandHandler(),
+ new ResourceLocation("taintedmagic:textures/models/ModelWAND_ROD_WARPWOOD.png"));
+ WAND_ROD_WARPWOOD.setGlowing(true);
- ItemShadowmetalSword = new ItemShadowmetalSword(LibToolMaterials.toolMatShadow);
- GameRegistry.registerItem(ItemShadowmetalSword, "ItemShadowmetalSword");
+ STAFF_ROD_WARPWOOD = new StaffRod("warpwood", 500, new ItemStack(ItemWandRod, 1, 1), 20, new WandHandler(),
+ new ResourceLocation("taintedmagic:textures/models/ModelWAND_ROD_WARPWOOD.png"));
+ STAFF_ROD_WARPWOOD.setRunes(true);
+ STAFF_ROD_WARPWOOD.setGlowing(true);
- ItemPrimordialEdge = new ItemPrimordialEdge(LibToolMaterials.toolMatPrimal);
- GameRegistry.registerItem(ItemPrimordialEdge, "ItemPrimordialEdge");
+ ItemWandCap = new ItemWandCap();
+ GameRegistry.registerItem(ItemWandCap, "ItemWandCap");
- ItemKatana = new ItemKatana();
- GameRegistry.registerItem(ItemKatana, "ItemKatana");
- }
+ WAND_CAP_SHADOWMETAL = new WandCap("shadowmetal", 0.70F, new ItemStack(ItemWandCap, 1, 0), 12);
+ WAND_CAP_SHADOWMETAL.setTexture(new ResourceLocation("taintedmagic:textures/models/ModelWAND_CAP_SHADOWMETAL.png"));
- public static Item ItemMagicFunguar;
- public static Item ItemMaterial;
- public static Item ItemVoidsentBlood;
- public static Item ItemFlyteCharm;
- public static Item ItemSalis;
+ WAND_CAP_CLOTH = new WandCap("cloth", 0.95F, new ItemStack(ItemWandCap, 1, 1), 3);
+ WAND_CAP_CLOTH.setTexture(new ResourceLocation("taintedmagic:textures/models/ModelWAND_CAP_CLOTH.png"));
- // Wand
- public static Item ItemWandRod;
+ WAND_CAP_CRIMSON_CLOTH = new WandCap("crimsoncloth", 0.85F, new ItemStack(ItemWandCap, 1, 2), 5);
+ WAND_CAP_CRIMSON_CLOTH.setTexture(new ResourceLocation("taintedmagic:textures/models/ModelWAND_CAP_CRIMSON_CLOTH.png"));
- public static WandRod WAND_ROD_WARPWOOD;
- public static StaffRod STAFF_ROD_WARPWOOD;
+ WAND_CAP_SHADOW_CLOTH = new WandCap("shadowcloth", 0.90F, new ItemStack(ItemWandCap, 1, 3), 3);
+ WAND_CAP_SHADOW_CLOTH.setTexture(new ResourceLocation("taintedmagic:textures/models/ModelWAND_CAP_SHADOW_CLOTH.png"));
- public static Item ItemWandCap;
+ // Foci
+ ItemFocusTaintSwarm = new ItemFocusTaintSwarm();
+ GameRegistry.registerItem(ItemFocusTaintSwarm, "ItemFocusTaintSwarm");
- public static WandCap WAND_CAP_SHADOWMETAL;
- public static WandCap WAND_CAP_CLOTH;
- public static WandCap WAND_CAP_CRIMSON_CLOTH;
- public static WandCap WAND_CAP_SHADOW_CLOTH;
+ ItemFocusDarkMatter = new ItemFocusDarkMatter();
+ GameRegistry.registerItem(ItemFocusDarkMatter, "ItemFocusDarkMatter");
- // Foci
- public static Item ItemFocusTaintSwarm;
- public static Item ItemFocusDarkMatter;
- public static Item ItemFocusMageMace;
- public static Item ItemFocusShockwave;
- public static Item ItemFocusVisShard;
- public static Item ItemFocusLumos;
+ ItemFocusMageMace = new ItemFocusMageMace();
+ GameRegistry.registerItem(ItemFocusMageMace, "ItemFocusMageMace");
- // Armor and Baubles
- public static Item ItemWarpedGoggles;
- public static Item ItemVoidmetalGoggles;
+ ItemFocusShockwave = new ItemFocusShockwave();
+ GameRegistry.registerItem(ItemFocusShockwave, "ItemFocusShockwave");
- public static Item ItemVoidwalkerBoots;
- public static Item ItemVoidwalkerSash;
+ ItemFocusVisShard = new ItemFocusVisShard();
+ GameRegistry.registerItem(ItemFocusVisShard, "ItemFocusVisShard");
- public static Item ItemVoidFortressHelmet;
- public static Item ItemVoidFortressChestplate;
- public static Item ItemVoidFortressLeggings;
+ ItemFocusLumos = new ItemFocusLumos();
+ GameRegistry.registerItem(ItemFocusLumos, "ItemFocusLumos");
- public static Item ItemShadowFortressHelmet;
- public static Item ItemShadowFortressChestplate;
- public static Item ItemShadowFortressLeggings;
+ // Tools
+ ItemThaumicDisassembler = new ItemThaumicDisassembler();
+ GameRegistry.registerItem(ItemThaumicDisassembler, "ItemThaumicDisassembler");
- public static Item ItemLumosRing;
+ ItemHollowDagger = new ItemHollowDagger(LibToolMaterials.toolMatHollow);
+ GameRegistry.registerItem(ItemHollowDagger, "ItemHollowDagger");
- // Tools
- public static Item ItemThaumicDisassembler;
- public static Item ItemHollowDagger;
+ ItemShadowmetalHoe = new ItemShadowmetalHoe(LibToolMaterials.toolMatShadow);
+ GameRegistry.registerItem(ItemShadowmetalHoe, "ItemShadowmetalHoe");
- public static ItemHoe ItemShadowmetalHoe;
- public static ItemPickaxe ItemShadowmetalPick;
- public static ItemSpade ItemShadowmetalSpade;
- public static ItemAxe ItemShadowmetalAxe;
- public static ItemSword ItemShadowmetalSword;
+ ItemShadowmetalPick = new ItemShadowmetalPick(LibToolMaterials.toolMatShadow);
+ GameRegistry.registerItem(ItemShadowmetalPick, "ItemShadowmetalPick");
- public static ItemSword ItemPrimordialEdge;
+ ItemShadowmetalAxe = new ItemShadowmetalAxe(LibToolMaterials.toolMatShadow);
+ GameRegistry.registerItem(ItemShadowmetalAxe, "ItemShadowmetalAxe");
- public static Item ItemKatana;
+ ItemShadowmetalSpade = new ItemShadowmetalSpade(LibToolMaterials.toolMatShadow);
+ GameRegistry.registerItem(ItemShadowmetalSpade, "ItemShadowmetalSpade");
+
+ ItemShadowmetalSword = new ItemShadowmetalSword(LibToolMaterials.toolMatShadow);
+ GameRegistry.registerItem(ItemShadowmetalSword, "ItemShadowmetalSword");
+
+ ItemPrimordialEdge = new ItemPrimordialEdge(LibToolMaterials.toolMatPrimal);
+ GameRegistry.registerItem(ItemPrimordialEdge, "ItemPrimordialEdge");
+
+ ItemKatana = new ItemKatana();
+ GameRegistry.registerItem(ItemKatana, "ItemKatana");
+ }
}
diff --git a/src/main/java/taintedmagic/common/registry/RecipeRegistry.java b/src/main/java/taintedmagic/common/registry/RecipeRegistry.java
index d56e337..3b2cbac 100644
--- a/src/main/java/taintedmagic/common/registry/RecipeRegistry.java
+++ b/src/main/java/taintedmagic/common/registry/RecipeRegistry.java
@@ -18,400 +18,631 @@ import thaumcraft.common.config.ConfigItems;
public class RecipeRegistry
{
- public static void init ()
- {
- initCrafting();
- initSmelting();
- initCrucible();
- initInfusion();
- initArcane();
- }
-
- /**
- * Vanilla crafting table recipes
- */
- public static void initCrafting ()
- {
- GameRegistry.addShapedRecipe(new ItemStack(
- Item.getItemFromBlock(BlockRegistry.BlockShadowmetal)), new Object[]{ "AAA", "AAA", "AAA", Character.valueOf('A'), new ItemStack(ItemRegistry.ItemMaterial) });
-
- GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.ItemMaterial, 1, 0), new Object[]{ "AAA", "AAA", "AAA", Character.valueOf('A'), new ItemStack(ItemRegistry.ItemMaterial, 1, 9) });
-
- ResearchRegistry.recipes.put("ItemShadowmetalPick", GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.ItemShadowmetalPick), new Object[]{ "AAA", " B ", " B ", Character.valueOf('A'),
- new ItemStack(ItemRegistry.ItemMaterial), Character.valueOf('B'), new ItemStack(Items.stick) }));
-
- ResearchRegistry.recipes.put("ItemShadowmetalAxe", CraftingManager.getInstance().addRecipe(new ItemStack(ItemRegistry.ItemShadowmetalAxe), new Object[]{ "AA", "BA", "B ",
- Character.valueOf('A'), new ItemStack(ItemRegistry.ItemMaterial), Character.valueOf('B'), new ItemStack(Items.stick) }));
-
- ResearchRegistry.recipes.put("ItemShadowmetalSpade", CraftingManager.getInstance().addRecipe(new ItemStack(ItemRegistry.ItemShadowmetalSpade), new Object[]{ "A", "B", "B",
- Character.valueOf('A'), new ItemStack(ItemRegistry.ItemMaterial), Character.valueOf('B'), new ItemStack(Items.stick) }));
-
- ResearchRegistry.recipes.put("ItemShadowmetalHoe", CraftingManager.getInstance().addRecipe(new ItemStack(ItemRegistry.ItemShadowmetalHoe), new Object[]{ "AA", "B ", "B ",
- Character.valueOf('A'), new ItemStack(ItemRegistry.ItemMaterial), Character.valueOf('B'), new ItemStack(Items.stick) }));
-
- ResearchRegistry.recipes.put("ItemShadowmetalSword", GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.ItemShadowmetalSword), new Object[]{ "A", "A", "B", Character.valueOf('A'),
- new ItemStack(ItemRegistry.ItemMaterial), Character.valueOf('B'), new ItemStack(Items.stick) }));
-
- GameRegistry.addRecipe(new ItemStack(ItemRegistry.ItemMaterial, 9), new Object[]{ "A", Character.valueOf('A'), new ItemStack(BlockRegistry.BlockShadowmetal) });
-
- GameRegistry.addRecipe(new ItemStack(ItemRegistry.ItemMaterial, 9, 9), new Object[]{ "A", Character.valueOf('A'), new ItemStack(ItemRegistry.ItemMaterial, 1, 0) });
-
- ResearchRegistry.recipes.put("BlockWarpwoodPlanks", CraftingManager.getInstance()
- .addRecipe(new ItemStack(BlockRegistry.BlockWarpwoodPlanks, 4), new Object[]{ "A", Character.valueOf('A'), new ItemStack(BlockRegistry.BlockWarpwoodLog) }));
- }
-
- /**
- * Furnace recipes
- */
- public static void initSmelting ()
- {
- GameRegistry.addSmelting(BlockRegistry.BlockShadowOre, new ItemStack(ItemRegistry.ItemMaterial), 2.0F);
- }
-
- /**
- * Arcane Infusion recipes
- */
- public static void initInfusion ()
- {
- ResearchRegistry.recipes.put("ItemFocusShockwave", ThaumcraftApi
- .addInfusionCraftingRecipe("FOCUSSHOCKWAVE", new ItemStack(ItemRegistry.ItemFocusShockwave), 6, new AspectList().add(Aspect.AIR, 35).add(Aspect.MOTION, 42).add(Aspect.ENERGY, 42)
- .add(Aspect.MAGIC, 16), new ItemStack(ConfigItems.itemFocusShock), new ItemStack[]{ new ItemStack(Blocks.tnt), new ItemStack(Items.gunpowder),
- new ItemStack(ConfigItems.itemShard, 1, 0), new ItemStack(Blocks.tnt), new ItemStack(Items.gunpowder), new ItemStack(ConfigItems.itemShard, 1, 0) }));
-
- ResearchRegistry.recipes.put("ItemPrimordialEdge", ThaumcraftApi.addInfusionCraftingRecipe("PRIMALBLADE", new ItemStack(ItemRegistry.ItemPrimordialEdge), 8, new AspectList()
- .add(Aspect.WEAPON, 65).add(Aspect.ELDRITCH, 46).add(Aspect.DARKNESS, 16).add(Aspect.METAL, 60)
- .add(Aspect.VOID, 56), ItemApi.getItem("itemSwordVoid", 0), new ItemStack[]{ new ItemStack(ItemRegistry.ItemMaterial, 1, 5), new ItemStack(ConfigItems.itemShard, 1, 0),
- new ItemStack(ConfigItems.itemShard, 1, 1), new ItemStack(ConfigItems.itemShard, 1, 2), new ItemStack(ItemRegistry.ItemMaterial, 1, 10),
- new ItemStack(ConfigItems.itemShard, 1, 3), new ItemStack(ConfigItems.itemShard, 1, 4), new ItemStack(ConfigItems.itemShard, 1, 5) }));
-
- ResearchRegistry.recipes.put("ItemFocusMageMace", ThaumcraftApi.addInfusionCraftingRecipe("MACEFOCUS", new ItemStack(ItemRegistry.ItemFocusMageMace), 3, new AspectList().add(Aspect.WEAPON, 32)
- .add(Aspect.METAL, 8).add(Aspect.ENTROPY, 18)
- .add(Aspect.MAGIC, 26), new ItemStack(Blocks.iron_block), new ItemStack[]{ new ItemStack(Items.gold_ingot), new ItemStack(Items.quartz), ItemApi.getItem("itemShard", 5),
- new ItemStack(Items.quartz), new ItemStack(ConfigItems.itemSwordThaumium), new ItemStack(Items.quartz), ItemApi.getItem("itemShard", 5), new ItemStack(Items.quartz) }));
-
- ResearchRegistry.recipes.put("ItemSwordCrimson", ThaumcraftApi.addInfusionCraftingRecipe("CRIMSONBLADE", new ItemStack(ConfigItems.itemSwordCrimson), 7, new AspectList().add(Aspect.WEAPON, 32)
- .add(Aspect.METAL, 16).add(Aspect.ENTROPY, 8).add(Aspect.ELDRITCH, 18)
- .add(Aspect.VOID, 32), ItemApi.getItem("itemSwordVoid", 0), new ItemStack[]{ new ItemStack(ItemRegistry.ItemMaterial.setContainerItem(ConfigItems.itemEssence), 1, 7),
- new ItemStack(ItemRegistry.ItemMaterial.setContainerItem(ConfigItems.itemEssence), 1, 7),
- new ItemStack(ItemRegistry.ItemMaterial.setContainerItem(ConfigItems.itemEssence), 1, 7) }));
-
- ResearchRegistry.recipes.put("ItemVoidwalkerSash", ThaumcraftApi.addInfusionCraftingRecipe("VOIDSASH", new ItemStack(ItemRegistry.ItemVoidwalkerSash, 1), 7, new AspectList()
- .add(Aspect.VOID, 56).add(Aspect.MAGIC, 40).add(Aspect.ARMOR, 66).add(Aspect.TRAVEL, 16)
- .add(Aspect.FLIGHT, 10), ItemApi.getItem("itemGirdleRunic", 0), new ItemStack[]{ ItemApi.getItem("itemEldritchObject", 3), ItemApi.getItem("itemResource", 16),
- new ItemStack(ItemRegistry.ItemMaterial), ItemApi.getItem("itemResource", 16), new ItemStack(ItemRegistry.ItemMaterial, 1, 1), ItemApi.getItem("itemResource", 16),
- new ItemStack(ItemRegistry.ItemMaterial), ItemApi.getItem("itemResource", 16), }));
-
- ResearchRegistry.recipes.put("ItemMaterial:5", ThaumcraftApi.addInfusionCraftingRecipe("CREATIONSHARD", new ItemStack(ItemRegistry.ItemMaterial, 1, 5), 8, TaintedMagicHelper.getPrimals(46)
- .add(Aspect.AURA, 35).add(Aspect.VOID, 22).add(Aspect.MAGIC, 56).add(Aspect.CRYSTAL, 38), new ItemStack(ConfigItems.itemShard, 1,
- 6), new ItemStack[]{ new ItemStack(ConfigItems.itemEldritchObject, 1, 3), new ItemStack(ConfigItems.itemShard, 1, 0), new ItemStack(ConfigItems.itemShard, 1, 1),
- new ItemStack(ConfigItems.itemShard, 1, 2), new ItemStack(Items.nether_star), new ItemStack(ConfigItems.itemShard, 1, 3), new ItemStack(ConfigItems.itemShard, 1, 4),
- new ItemStack(ConfigItems.itemShard, 1, 5) }));
-
- ResearchRegistry.recipes
- .put("BlockWarpwoodSapling", ThaumcraftApi.addInfusionCraftingRecipe("WARPTREE", new ItemStack(BlockRegistry.BlockWarpwoodSapling), 3, new AspectList().add(Aspect.ELDRITCH, 8)
- .add(Aspect.TREE, 8).add(Aspect.DARKNESS, 8), new ItemStack(Blocks.sapling, 1, Short.MAX_VALUE), new ItemStack[]{ new ItemStack(ItemRegistry.ItemMaterial, 1, 3),
- ItemApi.getItem("itemZombieBrain", 0), new ItemStack(ItemRegistry.ItemMaterial, 1, 3), ItemApi.getItem("itemZombieBrain", 0) }));
-
- ResearchRegistry.recipes.put("ItemWandRod:0", ThaumcraftApi.addInfusionCraftingRecipe("ROD_warpwood", new ItemStack(ItemRegistry.ItemWandRod), 8, new AspectList().add(Aspect.ELDRITCH, 65)
- .add(Aspect.DARKNESS, 30).add(Aspect.TREE, 12).add(Aspect.MAGIC, 45)
- .add(Aspect.AURA, 35), new ItemStack(BlockRegistry.BlockWarpwoodLog), new ItemStack[]{ new ItemStack(ItemRegistry.ItemMaterial, 1, 10), new ItemStack(ItemRegistry.ItemMaterial),
- new ItemStack(ItemRegistry.ItemMaterial, 1, 3), ItemApi.getItem("itemResource", 16), ItemApi.getItem("itemZombieBrain", 0), new ItemStack(ItemRegistry.ItemMaterial),
- new ItemStack(ItemRegistry.ItemMaterial, 1, 3), ItemApi.getItem("itemResource", 16) }));
-
- ResearchRegistry.recipes.put("ItemVoidFortressHelmet:goggles", ThaumcraftApi
- .addInfusionCraftingRecipe("HELMGOGGLES", new Object[]{ "goggles", new NBTTagByte((byte) 1) }, 5, new AspectList().add(Aspect.SENSES, 32).add(Aspect.AURA, 16)
- .add(Aspect.ARMOR, 16), new ItemStack(ItemRegistry.ItemVoidFortressHelmet, 1, 32767), new ItemStack[]{ new ItemStack(Items.slime_ball), ItemApi.getItem("itemGoggles", 0) }));
-
- ResearchRegistry.recipes.put("ItemVoidFortressHelmet:mask0", ThaumcraftApi
- .addInfusionCraftingRecipe("MASKGRINNINGDEVIL", new Object[]{ "mask", new NBTTagInt(0) }, 8, new AspectList().add(Aspect.MIND, 64).add(Aspect.HEAL, 64)
- .add(Aspect.ARMOR, 16), new ItemStack(ItemRegistry.ItemVoidFortressHelmet, 1, 32767), new ItemStack[]{ new ItemStack(Items.dye, 1, 0), new ItemStack(Items.iron_ingot),
- new ItemStack(Items.leather), ItemApi.getBlock("blockCustomPlant", 2), ItemApi.getItem("itemZombieBrain", 0), new ItemStack(Items.iron_ingot) }));
-
- ResearchRegistry.recipes.put("ItemVoidFortressHelmet:mask1", ThaumcraftApi.addInfusionCraftingRecipe("MASKANGRYGHOST", new Object[]{ "mask", new NBTTagInt(1) }, 8, new AspectList()
- .add(Aspect.ENTROPY, 64).add(Aspect.DEATH, 64).add(Aspect.ARMOR, 16), new ItemStack(ItemRegistry.ItemVoidFortressHelmet, 1, 32767), new ItemStack[]{ new ItemStack(Items.dye, 1, 15),
- new ItemStack(Items.iron_ingot), new ItemStack(Items.leather), new ItemStack(Items.poisonous_potato), new ItemStack(Items.skull, 1, 1), new ItemStack(Items.iron_ingot) }));
-
- ResearchRegistry.recipes.put("ItemVoidFortressHelmet:mask2", ThaumcraftApi.addInfusionCraftingRecipe("MASKSIPPINGFIEND", new Object[]{ "mask", new NBTTagInt(2) }, 8, new AspectList()
- .add(Aspect.UNDEAD, 64).add(Aspect.LIFE, 64).add(Aspect.ARMOR, 16), new ItemStack(ItemRegistry.ItemVoidFortressHelmet, 1, 32767), new ItemStack[]{ new ItemStack(Items.dye, 1, 1),
- new ItemStack(Items.iron_ingot), new ItemStack(Items.leather), new ItemStack(Items.ghast_tear), new ItemStack(Items.milk_bucket), new ItemStack(Items.iron_ingot) }));
-
- ResearchRegistry.recipes.put("ItemVoidFortressHelmet", ThaumcraftApi.addInfusionCraftingRecipe("VOIDFORTRESS", new ItemStack(ItemRegistry.ItemVoidFortressHelmet), 6, new AspectList()
- .add(Aspect.METAL, 24).add(Aspect.ARMOR, 16).add(Aspect.MAGIC, 8).add(Aspect.ELDRITCH, 16).add(Aspect.VOID, 16), ItemApi.getItem("itemHelmetVoid", 0), new ItemStack[]{
- ItemApi.getItem("itemResource", 16), ItemApi.getItem("itemResource", 16), new ItemStack(Items.gold_ingot), new ItemStack(Items.gold_ingot), new ItemStack(Items.emerald) }));
-
- ResearchRegistry.recipes.put("ItemVoidFortressChestplate", ThaumcraftApi
- .addInfusionCraftingRecipe("VOIDFORTRESS", new ItemStack(ItemRegistry.ItemVoidFortressChestplate), 6, new AspectList().add(Aspect.METAL, 24).add(Aspect.ARMOR, 24).add(Aspect.MAGIC, 8)
- .add(Aspect.ELDRITCH, 16).add(Aspect.VOID, 24), ItemApi.getItem("itemChestVoid", 0), new ItemStack[]{ ItemApi.getItem("itemResource", 16), ItemApi.getItem("itemResource", 16),
- ItemApi.getItem("itemResource", 16), ItemApi.getItem("itemResource", 16), new ItemStack(Items.gold_ingot), new ItemStack(Items.leather) }));
-
- ResearchRegistry.recipes.put("ItemVoidFortressLeggings", ThaumcraftApi
- .addInfusionCraftingRecipe("VOIDFORTRESS", new ItemStack(ItemRegistry.ItemVoidFortressLeggings), 6, new AspectList().add(Aspect.METAL, 24).add(Aspect.ARMOR, 20).add(Aspect.MAGIC, 8)
- .add(Aspect.ELDRITCH, 16).add(Aspect.VOID, 20), ItemApi.getItem("itemLegsVoid", 0), new ItemStack[]{ ItemApi.getItem("itemResource", 16), ItemApi.getItem("itemResource", 16),
- ItemApi.getItem("itemResource", 16), new ItemStack(Items.gold_ingot), new ItemStack(Items.leather) }));
-
- ResearchRegistry.recipes.put("ItemWarpedGoggles", ThaumcraftApi.addInfusionCraftingRecipe("WARPEDGOGGLES", new ItemStack(ItemRegistry.ItemWarpedGoggles), 3, new AspectList()
- .add(Aspect.ELDRITCH, 35).add(Aspect.DARKNESS, 12).add(Aspect.MAGIC, 16)
- .add(Aspect.ARMOR, 8), ItemApi.getItem("itemGoggles", 0), new ItemStack[]{ new ItemStack(ItemRegistry.ItemMaterial, 1, 9), new ItemStack(ConfigItems.itemWispEssence, 1, 32767) }));
-
- ResearchRegistry.recipes.put("ItemWandCap:0", ThaumcraftApi.addInfusionCraftingRecipe("CAP_shadowmetal", new ItemStack(ItemRegistry.ItemWandCap), 8, new AspectList().add(Aspect.ELDRITCH, 55)
- .add(Aspect.DARKNESS, 47).add(Aspect.MAGIC, 52).add(Aspect.METAL, 45)
- .add(Aspect.VOID, 55), ItemApi.getItem("itemWandCap", 7), new ItemStack[]{ new ItemStack(ItemRegistry.ItemMaterial, 1, 3), new ItemStack(ItemRegistry.ItemMaterial),
- ItemApi.getItem("itemResource", 16), new ItemStack(ItemRegistry.ItemMaterial), new ItemStack(ItemRegistry.ItemMaterial, 1, 10), new ItemStack(ItemRegistry.ItemMaterial),
- ItemApi.getItem("itemResource", 16), new ItemStack(ItemRegistry.ItemMaterial) }));
-
- ResearchRegistry.recipes.put("ItemFocusTaintSwarm", ThaumcraftApi.addInfusionCraftingRecipe("TAINTFOCUS", new ItemStack(ItemRegistry.ItemFocusTaintSwarm), 4, new AspectList()
- .add(Aspect.TAINT, 45).add(Aspect.LIFE, 24).add(Aspect.MOTION, 24).add(Aspect.MAGIC, 16)
- .add(Aspect.DEATH, 37), new ItemStack(ItemRegistry.ItemFocusVisShard), new ItemStack[]{ ItemApi.getItem("itemResource", 11), new ItemStack(ItemRegistry.ItemMaterial, 1, 4),
- ItemApi.getItem("itemBottleTaint", 0), new ItemStack(ItemRegistry.ItemMaterial, 1, 4), ItemApi.getItem("itemResource", 11), new ItemStack(ItemRegistry.ItemMaterial, 1, 4),
- ItemApi.getItem("itemBottleTaint", 0), new ItemStack(ItemRegistry.ItemMaterial, 1, 4) }));
-
- ResearchRegistry.recipes.put("ItemFocusDarkMatter", ThaumcraftApi.addInfusionCraftingRecipe("ELDRITCHFOCUS", new ItemStack(ItemRegistry.ItemFocusDarkMatter), 6, new AspectList()
- .add(Aspect.ELDRITCH, 64).add(Aspect.DARKNESS, 32).add(Aspect.MAGIC, 32).add(Aspect.DEATH, 32)
- .add(Aspect.VOID, 32), new ItemStack(ConfigItems.itemFocusPortableHole), new ItemStack[]{ new ItemStack(ConfigItems.itemEldritchObject, 1, 3),
- new ItemStack(ConfigItems.itemResource, 1, 16), new ItemStack(ItemRegistry.ItemMaterial, 1, 3), new ItemStack(ConfigItems.itemBucketDeath),
- new ItemStack(ItemRegistry.ItemMaterial, 1, 3), new ItemStack(ConfigItems.itemResource, 1, 16), new ItemStack(ConfigItems.itemResource, 1, 17),
- new ItemStack(ConfigItems.itemResource, 1, 16), new ItemStack(ItemRegistry.ItemMaterial, 1, 3), new ItemStack(ConfigItems.itemBucketDeath),
- new ItemStack(ItemRegistry.ItemMaterial, 1, 3), new ItemStack(ConfigItems.itemResource, 1, 16) }));
-
- ResearchRegistry.recipes.put("ItemMaterial:8", ThaumcraftApi
- .addInfusionCraftingRecipe("KNIGHTROBES", new ItemStack(ItemRegistry.ItemMaterial, 9, 8), 2, new AspectList().add(Aspect.HUNGER, 4).add(Aspect.METAL, 8)
- .add(Aspect.MAGIC, 6), new ItemStack(Blocks.iron_block), new ItemStack[]{ new ItemStack(ItemRegistry.ItemMaterial.setContainerItem(ConfigItems.itemEssence), 1, 7),
- new ItemStack(Items.gold_nugget), new ItemStack(ItemRegistry.ItemMaterial.setContainerItem(ConfigItems.itemEssence), 1, 7), new ItemStack(Items.gold_nugget),
- new ItemStack(ItemRegistry.ItemMaterial.setContainerItem(ConfigItems.itemEssence), 1, 7), new ItemStack(Items.gold_nugget),
- new ItemStack(ItemRegistry.ItemMaterial.setContainerItem(ConfigItems.itemEssence), 1, 7), new ItemStack(Items.gold_nugget) }));
-
- ResearchRegistry.recipes.put("ItemVoidwalkerBoots", ThaumcraftApi.addInfusionCraftingRecipe("VOIDWALKERBOOTS", new ItemStack(ItemRegistry.ItemVoidwalkerBoots), 8, new AspectList()
- .add(Aspect.DARKNESS, 42).add(Aspect.VOID, 56).add(Aspect.ELDRITCH, 38).add(Aspect.ARMOR, 60)
- .add(Aspect.TRAVEL, 45), ItemApi.getItem("itemBootsTraveller", 0), new ItemStack[]{ new ItemStack(ItemRegistry.ItemMaterial, 1, 11), ItemApi.getItem("itemResource", 16),
- new ItemStack(ItemRegistry.ItemMaterial, 1, 1), new ItemStack(ItemRegistry.ItemMaterial), new ItemStack(ItemRegistry.ItemMaterial, 1, 1), ItemApi.getItem("itemResource", 16),
- ItemApi.getItem("itemEldritchObject", 0), ItemApi.getItem("itemResource", 16), new ItemStack(ItemRegistry.ItemMaterial, 1, 1), new ItemStack(ItemRegistry.ItemMaterial),
- new ItemStack(ItemRegistry.ItemMaterial, 1, 1), ItemApi.getItem("itemResource", 16) }));
-
- ResearchRegistry.recipes.put("ItemSalis:0", ThaumcraftApi.addInfusionCraftingRecipe("SKYSALT", new ItemStack(ItemRegistry.ItemSalis, 3, 0), 7, new AspectList().add(Aspect.AURA, 10)
- .add(Aspect.WEATHER, 15).add(Aspect.WATER, 15), new ItemStack(ItemRegistry.ItemMaterial, 1,
- 12), new ItemStack[]{ new ItemStack(ConfigItems.itemResource, 1, 14), new ItemStack(ConfigItems.itemResource, 1, 0), new ItemStack(ConfigItems.itemNugget, 1, 5) }));
-
- ResearchRegistry.recipes.put("ItemSalis:1", ThaumcraftApi.addInfusionCraftingRecipe("TIMESALT", new ItemStack(ItemRegistry.ItemSalis, 3, 1), 7, new AspectList().add(Aspect.AURA, 10)
- .add(Aspect.LIGHT, 15).add(Aspect.DARKNESS, 15), new ItemStack(ItemRegistry.ItemMaterial, 1,
- 12), new ItemStack[]{ new ItemStack(ConfigItems.itemResource, 1, 14), new ItemStack(ConfigItems.itemResource, 1, 1), new ItemStack(Items.gold_nugget) }));
-
- ResearchRegistry.recipes.put("ItemThaumicDisassembler", ThaumcraftApi.addInfusionCraftingRecipe("THAUMICDISASSEMBLER", new ItemStack(ItemRegistry.ItemThaumicDisassembler), 3, new AspectList()
- .add(Aspect.METAL, 22).add(Aspect.TOOL, 24).add(Aspect.WEAPON, 14).add(Aspect.MECHANISM, 12), new ItemStack(ItemRegistry.ItemMaterial, 1,
- 6), new ItemStack[]{ new ItemStack(ItemRegistry.ItemMaterial, 1, 11), ItemApi.getItem("itemPickVoid", 0), ItemApi.getItem("itemResource", 2),
- ItemApi.getItem("itemShovelVoid", 0), ItemApi.getItem("itemResource", 2), ItemApi.getItem("itemSwordVoid", 0), ItemApi.getItem("itemResource", 2),
- ItemApi.getItem("itemAxeVoid", 0) }));
-
- ResearchRegistry.recipes.put("ItemShadowFortressHelmet:goggles", ThaumcraftApi
- .addInfusionCraftingRecipe("HELMGOGGLES", new Object[]{ "goggles", new NBTTagByte((byte) 1) }, 5, new AspectList().add(Aspect.SENSES, 32).add(Aspect.AURA, 16)
- .add(Aspect.ARMOR, 16), new ItemStack(ItemRegistry.ItemShadowFortressHelmet, 1, 32767), new ItemStack[]{ new ItemStack(Items.slime_ball), ItemApi.getItem("itemGoggles", 0) }));
-
- ResearchRegistry.recipes.put("ItemShadowFortressHelmet:mask0", ThaumcraftApi
- .addInfusionCraftingRecipe("MASKGRINNINGDEVIL", new Object[]{ "mask", new NBTTagInt(0) }, 8, new AspectList().add(Aspect.MIND, 64).add(Aspect.HEAL, 64)
- .add(Aspect.ARMOR, 16), new ItemStack(ItemRegistry.ItemShadowFortressHelmet, 1, 32767), new ItemStack[]{ new ItemStack(Items.dye, 1, 0), new ItemStack(Items.iron_ingot),
- new ItemStack(Items.leather), ItemApi.getBlock("blockCustomPlant", 2), ItemApi.getItem("itemZombieBrain", 0), new ItemStack(Items.iron_ingot) }));
-
- ResearchRegistry.recipes.put("ItemShadowFortressHelmet:mask1", ThaumcraftApi.addInfusionCraftingRecipe("MASKANGRYGHOST", new Object[]{ "mask", new NBTTagInt(1) }, 8, new AspectList()
- .add(Aspect.ENTROPY, 64).add(Aspect.DEATH, 64).add(Aspect.ARMOR, 16), new ItemStack(ItemRegistry.ItemShadowFortressHelmet, 1, 32767), new ItemStack[]{ new ItemStack(Items.dye, 1, 15),
- new ItemStack(Items.iron_ingot), new ItemStack(Items.leather), new ItemStack(Items.poisonous_potato), new ItemStack(Items.skull, 1, 1), new ItemStack(Items.iron_ingot) }));
-
- ResearchRegistry.recipes.put("ItemShadowFortressHelmet:mask2", ThaumcraftApi.addInfusionCraftingRecipe("MASKSIPPINGFIEND", new Object[]{ "mask", new NBTTagInt(2) }, 8, new AspectList()
- .add(Aspect.UNDEAD, 64).add(Aspect.LIFE, 64).add(Aspect.ARMOR, 16), new ItemStack(ItemRegistry.ItemShadowFortressHelmet, 1, 32767), new ItemStack[]{ new ItemStack(Items.dye, 1, 1),
- new ItemStack(Items.iron_ingot), new ItemStack(Items.leather), new ItemStack(Items.ghast_tear), new ItemStack(Items.milk_bucket), new ItemStack(Items.iron_ingot) }));
-
- ResearchRegistry.recipes.put("ItemShadowFortressHelmet", ThaumcraftApi
- .addInfusionCraftingRecipe("SHADOWFORTRESSARMOR", new ItemStack(ItemRegistry.ItemShadowFortressHelmet), 7, new AspectList().add(Aspect.METAL, 28).add(Aspect.ARMOR, 20)
- .add(Aspect.MAGIC, 12).add(Aspect.DARKNESS, 30).add(Aspect.VOID, 22), ItemApi.getItem("itemHelmetVoid", 0), new ItemStack[]{ new ItemStack(BlockRegistry.BlockShadowmetal),
- new ItemStack(BlockRegistry.BlockShadowmetal), new ItemStack(Items.gold_ingot), new ItemStack(Items.gold_ingot), new ItemStack(Items.emerald) }));
-
- ResearchRegistry.recipes
- .put("ItemShadowFortressChestplate", ThaumcraftApi.addInfusionCraftingRecipe("SHADOWFORTRESSARMOR", new ItemStack(ItemRegistry.ItemShadowFortressChestplate), 7, new AspectList()
- .add(Aspect.METAL, 38).add(Aspect.ARMOR, 26).add(Aspect.MAGIC, 18).add(Aspect.DARKNESS, 34)
- .add(Aspect.VOID, 26), ItemApi.getItem("itemChestVoid", 0), new ItemStack[]{ new ItemStack(BlockRegistry.BlockShadowmetal), new ItemStack(BlockRegistry.BlockShadowmetal),
- new ItemStack(BlockRegistry.BlockShadowmetal), new ItemStack(BlockRegistry.BlockShadowmetal), new ItemStack(Items.gold_ingot), new ItemStack(Items.leather) }));
-
- ResearchRegistry.recipes.put("ItemShadowFortressLeggings", ThaumcraftApi
- .addInfusionCraftingRecipe("SHADOWFORTRESSARMOR", new ItemStack(ItemRegistry.ItemShadowFortressLeggings), 7, new AspectList().add(Aspect.METAL, 32).add(Aspect.ARMOR, 24)
- .add(Aspect.MAGIC, 16).add(Aspect.DARKNESS, 32).add(Aspect.VOID, 24), ItemApi.getItem("itemLegsVoid", 0), new ItemStack[]{ new ItemStack(BlockRegistry.BlockShadowmetal),
- new ItemStack(BlockRegistry.BlockShadowmetal), new ItemStack(BlockRegistry.BlockShadowmetal), new ItemStack(Items.gold_ingot), new ItemStack(Items.leather) }));
-
- ResearchRegistry.recipes.put("ItemKatana:0", ThaumcraftApi
- .addInfusionCraftingRecipe("THAUMIUMKATANA", new ItemStack(ItemRegistry.ItemKatana, 1, 0), 3, new AspectList().add(Aspect.METAL, 42).add(Aspect.WEAPON, 45)
- .add(Aspect.MAGIC, 22), new ItemStack(ConfigItems.itemSwordThaumium), new ItemStack[]{ new ItemStack(Blocks.obsidian), new ItemStack(ConfigItems.itemResource, 1, 2),
- new ItemStack(Items.gold_ingot), new ItemStack(Items.emerald), new ItemStack(Items.iron_ingot), new ItemStack(ConfigItems.itemResource, 1, 2),
- new ItemStack(Blocks.obsidian), new ItemStack(ConfigItems.itemResource, 1, 2), new ItemStack(Items.gold_ingot), new ItemStack(Items.emerald),
- new ItemStack(Items.iron_ingot), new ItemStack(ConfigItems.itemResource, 1, 2) }));
-
- ResearchRegistry.recipes.put("ItemKatana:1", ThaumcraftApi.addInfusionCraftingRecipe("VOIDMETALKATANA", new ItemStack(ItemRegistry.ItemKatana, 1, 1), 6, new AspectList().add(Aspect.METAL, 52)
- .add(Aspect.WEAPON, 55).add(Aspect.MAGIC, 32).add(Aspect.VOID, 46)
- .add(Aspect.ELDRITCH, 12), new ItemStack(ConfigItems.itemSwordVoid), new ItemStack[]{ new ItemStack(Blocks.obsidian), new ItemStack(ConfigItems.itemResource, 1, 16),
- new ItemStack(Items.gold_ingot), new ItemStack(Items.emerald), new ItemStack(Items.iron_ingot), new ItemStack(ConfigItems.itemResource, 1, 16), new ItemStack(Blocks.obsidian),
- new ItemStack(ConfigItems.itemResource, 1, 16), new ItemStack(Items.gold_ingot), new ItemStack(Items.emerald), new ItemStack(Items.iron_ingot),
- new ItemStack(ConfigItems.itemResource, 1, 16) }));
-
- ResearchRegistry.recipes.put("ItemKatana:2", ThaumcraftApi.addInfusionCraftingRecipe("SHADOWMETALKATANA", new ItemStack(ItemRegistry.ItemKatana, 1, 2), 7, new AspectList()
- .add(Aspect.METAL, 62).add(Aspect.WEAPON, 65).add(Aspect.MAGIC, 42).add(Aspect.VOID, 16)
- .add(Aspect.DARKNESS, 46), new ItemStack(ItemRegistry.ItemShadowmetalSword), new ItemStack[]{ new ItemStack(Blocks.obsidian), new ItemStack(ItemRegistry.ItemMaterial, 1, 0),
- new ItemStack(Items.iron_ingot), new ItemStack(Items.emerald), new ItemStack(Items.iron_ingot), new ItemStack(ItemRegistry.ItemMaterial, 1, 0), new ItemStack(Blocks.obsidian),
- new ItemStack(ItemRegistry.ItemMaterial, 1, 0), new ItemStack(Items.iron_ingot), new ItemStack(Items.emerald), new ItemStack(Items.iron_ingot),
- new ItemStack(ItemRegistry.ItemMaterial, 1, 0) }));
-
- ResearchRegistry.recipes.put("ItemFlyteCharm", ThaumcraftApi.addInfusionCraftingRecipe("FLYTECHARM", new ItemStack(ItemRegistry.ItemFlyteCharm, 1, 0), 7, new AspectList()
- .add(Aspect.FLIGHT, 86).add(Aspect.AURA, 56).add(Aspect.SENSES, 25).add(Aspect.MAGIC, 48).add(Aspect.ENERGY, 65), new ItemStack(ConfigItems.itemPrimalArrow, 1,
- 0), new ItemStack[]{ new ItemStack(ItemRegistry.ItemMaterial, 1, 10), new ItemStack(Items.gold_ingot), new ItemStack(ConfigItems.itemShard, 1, 0),
- new ItemStack(Items.iron_ingot), new ItemStack(ItemRegistry.ItemMaterial, 1, 5), new ItemStack(Items.gold_ingot), new ItemStack(ConfigItems.itemShard, 1, 0),
- new ItemStack(Items.iron_ingot) }));
- /**
- * The ItemKatanaThaumium recipes are for the thaumonomicon
- */
- ResearchRegistry.recipes.put("ItemKatanaThaumium:inscription0", ThaumcraftApi.addInfusionCraftingRecipe("INSCRIPTIONFIRE", new Object[]{ "inscription", new NBTTagInt(0) }, 8, new AspectList()
- .add(Aspect.FIRE, 64).add(Aspect.LIGHT, 64).add(Aspect.METAL, 16), new ItemStack(ItemRegistry.ItemKatana, 1, 0), new ItemStack[]{ ItemApi.getItem("itemFocusFire", 0),
- new ItemStack(Items.coal), new ItemStack(Blocks.netherrack), new ItemStack(Items.fire_charge), new ItemStack(Items.blaze_powder), ItemApi.getItem("itemResource", 1) }));
-
- ResearchRegistry.recipes.put("ItemKatanaThaumium:inscription1", ThaumcraftApi.addInfusionCraftingRecipe("INSCRIPTIONTAINT", new Object[]{ "inscription", new NBTTagInt(1) }, 8, new AspectList()
- .add(Aspect.TAINT, 64).add(Aspect.FLESH, 64)
- .add(Aspect.METAL, 16), new ItemStack(ItemRegistry.ItemKatana, 1, 0), new ItemStack[]{ new ItemStack(ItemRegistry.ItemFocusTaintSwarm), new ItemStack(ItemRegistry.ItemMaterial, 1, 4),
- ItemApi.getBlock("blockJar", 1), ItemApi.getBlock("blockCustomPlant", 5), ItemApi.getItem("itemBottleTaint", 0), ItemApi.getItem("itemResource", 11) }));
-
- ResearchRegistry.recipes.put("ItemKatanaThaumium:inscription2", ThaumcraftApi
- .addInfusionCraftingRecipe("INSCRIPTIONUNDEAD", new Object[]{ "inscription", new NBTTagInt(2) }, 8, new AspectList().add(Aspect.HEAL, 64).add(Aspect.UNDEAD, 64)
- .add(Aspect.METAL, 16), new ItemStack(ItemRegistry.ItemKatana, 1, 0), new ItemStack[]{ new ItemStack(ConfigItems.itemZombieBrain), new ItemStack(Items.bone),
- new ItemStack(Items.rotten_flesh), new ItemStack(Items.fermented_spider_eye), new ItemStack(ConfigItems.itemFocusPech), new ItemStack(ConfigItems.itemBathSalts) }));
-
- ResearchRegistry.recipes.put("ItemKatana:inscription0", ThaumcraftApi.addInfusionCraftingRecipe("INSCRIPTIONFIRE", new Object[]{ "inscription", new NBTTagInt(0) }, 8, new AspectList()
- .add(Aspect.FIRE, 64).add(Aspect.ENERGY, 64).add(Aspect.MAGIC, 16), new ItemStack(ItemRegistry.ItemKatana, 1, 32767), new ItemStack[]{ ItemApi.getItem("itemFocusFire", 0),
- new ItemStack(Items.coal), new ItemStack(Blocks.netherrack), new ItemStack(Items.fire_charge), new ItemStack(Items.blaze_powder), ItemApi.getItem("itemResource", 1) }));
-
- ResearchRegistry.recipes.put("ItemKatana:inscription1", ThaumcraftApi.addInfusionCraftingRecipe("INSCRIPTIONTAINT", new Object[]{ "inscription", new NBTTagInt(1) }, 8, new AspectList()
- .add(Aspect.TAINT, 64).add(Aspect.POISON, 64).add(Aspect.MAGIC, 16), new ItemStack(ItemRegistry.ItemKatana, 1,
- 32767), new ItemStack[]{ new ItemStack(ItemRegistry.ItemFocusTaintSwarm), new ItemStack(ItemRegistry.ItemMaterial, 1, 4), ItemApi.getBlock("blockJar", 1),
- ItemApi.getBlock("blockCustomPlant", 5), ItemApi.getItem("itemBottleTaint", 0), ItemApi.getItem("itemResource", 11) }));
-
- ResearchRegistry.recipes.put("ItemKatana:inscription2", ThaumcraftApi
- .addInfusionCraftingRecipe("INSCRIPTIONUNDEAD", new Object[]{ "inscription", new NBTTagInt(2) }, 8, new AspectList().add(Aspect.HEAL, 64).add(Aspect.UNDEAD, 64)
- .add(Aspect.METAL, 16), new ItemStack(ItemRegistry.ItemKatana, 1, 32767), new ItemStack[]{ new ItemStack(ConfigItems.itemZombieBrain), new ItemStack(Items.bone),
- new ItemStack(Items.rotten_flesh), new ItemStack(Items.fermented_spider_eye), new ItemStack(ConfigItems.itemFocusPech), new ItemStack(ConfigItems.itemBathSalts) }));
-
- ResearchRegistry.recipes.put("ItemVoidmetalGoggles", ThaumcraftApi.addInfusionCraftingRecipe("VOIDGOGGLES", new ItemStack(ItemRegistry.ItemVoidmetalGoggles), 5, new AspectList()
- .add(Aspect.VOID, 40).add(Aspect.SENSES, 35).add(Aspect.ARMOR, 20), new ItemStack(ItemRegistry.ItemWarpedGoggles, 1,
- 32767), new ItemStack[]{ new ItemStack(ConfigItems.itemResource, 1, 16), new ItemStack(ConfigItems.itemResource, 1, 16) }));
-
- ResearchRegistry.recipes.put("ItemLumosRing", ThaumcraftApi
- .addInfusionCraftingRecipe("LUMOSRING", new ItemStack(ItemRegistry.ItemLumosRing), 1, new AspectList().add(Aspect.LIGHT, 35).add(Aspect.SENSES, 25).add(Aspect.AURA, 10), new ItemStack(
- ConfigItems.itemBaubleBlanks, 1, 1), new ItemStack[]{ new ItemStack(ItemRegistry.ItemFocusLumos), new ItemStack(ConfigItems.itemResource, 1, 6),
- new ItemStack(Items.gold_ingot), new ItemStack(ConfigItems.itemResource, 1, 14), new ItemStack(ConfigItems.itemResource, 1, 6), new ItemStack(Items.gold_ingot) }));
- }
-
- /**
- * Arcane worktable recipes
- */
- public static void initArcane ()
- {
- ResearchRegistry.recipes.put("ItemMaterial:2", ThaumcraftApi
- .addShapelessArcaneCraftingRecipe("CRIMSONROBES", new ItemStack(ItemRegistry.ItemMaterial, 1, 2), new AspectList().add(Aspect.FIRE, 5).add(Aspect.ENTROPY, 5), new Object[]{
- new ItemStack(ItemRegistry.ItemMaterial.setContainerItem(ConfigItems.itemEssence), 1, 7), ItemApi.getItem("itemResource", 7), Items.gold_nugget }));
-
- ResearchRegistry.recipes.put("ItemMaterial:6", ThaumcraftApi.addArcaneCraftingRecipe("THAUMICDISASSEMBLER", new ItemStack(ItemRegistry.ItemMaterial, 1, 6), new AspectList()
- .add(Aspect.ORDER, 50).add(Aspect.ENTROPY, 50), new Object[]{ "BAB", "ACA", "BAB", Character.valueOf('A'), ItemApi.getItem("itemResource", 2), Character.valueOf('B'),
- ItemApi.getItem("itemResource", 16), Character.valueOf('C'), new ItemStack(Items.diamond) }));
-
- ResearchRegistry.recipes.put("ItemHelmetCultistRobe", ThaumcraftApi.addArcaneCraftingRecipe("CRIMSONROBES", ItemApi.getItem("itemHelmetCultistRobe", 0), new AspectList().add(Aspect.FIRE, 5)
- .add(Aspect.ENTROPY, 5), new Object[]{ "AAA", "A A", 'A', new ItemStack(ItemRegistry.ItemMaterial, 1, 2) }));
-
- ResearchRegistry.recipes.put("ItemChestCultistRobe", ThaumcraftApi
- .addArcaneCraftingRecipe("CRIMSONROBES", ItemApi.getItem("itemChestCultistRobe", 0), new AspectList().add(Aspect.FIRE, 10).add(Aspect.ENTROPY, 10), new Object[]{ "A A", "CAC", "ABA",
- 'A', new ItemStack(ItemRegistry.ItemMaterial, 1, 2), 'B', new ItemStack(Items.gold_ingot), 'C', new ItemStack(Items.iron_ingot) }));
-
- ResearchRegistry.recipes.put("ItemLegsCultistRobe", ThaumcraftApi.addArcaneCraftingRecipe("CRIMSONROBES", ItemApi.getItem("itemLegsCultistRobe", 0), new AspectList().add(Aspect.FIRE, 8)
- .add(Aspect.ENTROPY, 8), new Object[]{ "ABA", "ACA", "A A", Character.valueOf('A'), new ItemStack(ItemRegistry.ItemMaterial, 1, 2), Character.valueOf('B'),
- new ItemStack(Items.gold_ingot), Character.valueOf('C'), new ItemStack(Items.iron_ingot) }));
-
- ResearchRegistry.recipes.put("ItemBootsCultist", ThaumcraftApi.addArcaneCraftingRecipe("CRIMSONROBES", ItemApi.getItem("itemBootsCultist", 0), new AspectList().add(Aspect.FIRE, 5)
- .add(Aspect.ENTROPY, 5), new Object[]{ "A A", "A A", Character.valueOf('A'), new ItemStack(ItemRegistry.ItemMaterial, 1, 2) }));
-
- ResearchRegistry.recipes.put("ItemWandRod:1", ThaumcraftApi.addArcaneCraftingRecipe("ROD_warpwood_staff", new ItemStack(ItemRegistry.ItemWandRod, 1, 1), new AspectList().add(Aspect.ORDER, 120)
- .add(Aspect.WATER, 120).add(Aspect.EARTH, 120).add(Aspect.AIR, 120).add(Aspect.FIRE, 120).add(Aspect.ENTROPY, 120), new Object[]{ " A", " B ", "B ", Character.valueOf('A'),
- new ItemStack(ConfigItems.itemEldritchObject, 1, 3), Character.valueOf('B'), new ItemStack(ItemRegistry.ItemWandRod, 1, 0) }));
-
- ResearchRegistry.recipes.put("ItemHelmetCultistPlate", ThaumcraftApi
- .addArcaneCraftingRecipe("KNIGHTROBES", ItemApi.getItem("itemHelmetCultistPlate", 0), new AspectList().add(Aspect.EARTH, 5).add(Aspect.FIRE, 5).add(Aspect.ENTROPY, 5), new Object[]{
- "ABA", "C C", 'A', new ItemStack(ItemRegistry.ItemMaterial, 1, 8), 'B', new ItemStack(Items.gold_ingot), 'C', new ItemStack(Items.iron_ingot) }));
-
- ResearchRegistry.recipes.put("ItemChestCultistPlate", ThaumcraftApi.addArcaneCraftingRecipe("KNIGHTROBES", ItemApi.getItem("itemChestCultistPlate", 0), new AspectList().add(Aspect.EARTH, 10)
- .add(Aspect.FIRE, 10).add(Aspect.ENTROPY, 10), new Object[]{ "A A", "ABA", "BBB", 'A', new ItemStack(Items.iron_ingot), 'B', new ItemStack(ItemRegistry.ItemMaterial, 1, 8) }));
-
- ResearchRegistry.recipes.put("ItemLegsCultistPlate", ThaumcraftApi
- .addArcaneCraftingRecipe("KNIGHTROBES", ItemApi.getItem("itemLegsCultistPlate", 0), new AspectList().add(Aspect.EARTH, 8).add(Aspect.FIRE, 8).add(Aspect.ENTROPY, 8), new Object[]{
- "ABA", "ACA", " C ", 'A', new ItemStack(Items.iron_ingot), 'B', new ItemStack(Items.gold_ingot), 'C', new ItemStack(ItemRegistry.ItemMaterial, 1, 8) }));
-
- ResearchRegistry.recipes.put("ItemHelmetCultistLeaderPlate", ThaumcraftApi.addArcaneCraftingRecipe("PRAETORARMOR", new ItemStack(ConfigItems.itemHelmetCultistLeaderPlate), new AspectList()
- .add(Aspect.ORDER, 15).add(Aspect.ENTROPY, 15).add(Aspect.FIRE, 15), new Object[]{ "BCB", "DAD", "BCB", 'A', new ItemStack(ConfigItems.itemHelmetCultistPlate), 'B',
- new ItemStack(Items.iron_ingot), 'C', new ItemStack(ItemRegistry.ItemMaterial, 1, 8), 'D', new ItemStack(Items.gold_ingot) }));
-
- ResearchRegistry.recipes.put("ItemChestCultistLeaderPlate", ThaumcraftApi.addArcaneCraftingRecipe("PRAETORARMOR", new ItemStack(ConfigItems.itemChestCultistLeaderPlate), new AspectList()
- .add(Aspect.ORDER, 25).add(Aspect.ENTROPY, 25).add(Aspect.FIRE, 25), new Object[]{ "BBB", "CAC", "CDC", 'A', new ItemStack(ConfigItems.itemChestCultistPlate), 'B',
- new ItemStack(Items.iron_ingot), 'C', new ItemStack(ItemRegistry.ItemMaterial, 1, 8), 'D', new ItemStack(Items.gold_ingot) }));
-
- ResearchRegistry.recipes.put("ItemLegsCultistLeaderPlate", ThaumcraftApi.addArcaneCraftingRecipe("PRAETORARMOR", new ItemStack(ConfigItems.itemLegsCultistLeaderPlate), new AspectList()
- .add(Aspect.ORDER, 20).add(Aspect.ENTROPY, 20).add(Aspect.FIRE, 20), new Object[]{ "CDC", "BAB", "BCB", 'A', new ItemStack(ConfigItems.itemLegsCultistPlate), 'B',
- new ItemStack(Items.iron_ingot), 'C', new ItemStack(ItemRegistry.ItemMaterial, 1, 8), 'D', new ItemStack(Items.gold_ingot) }));
-
- ResearchRegistry.recipes.put("ItemMaterial:1", ThaumcraftApi
- .addArcaneCraftingRecipe("SHADOWCLOTH", new ItemStack(ItemRegistry.ItemMaterial, 1, 1), new AspectList().add(Aspect.ORDER, 1).add(Aspect.WATER, 1).add(Aspect.EARTH, 1)
- .add(Aspect.AIR, 1).add(Aspect.FIRE, 1).add(Aspect.ENTROPY, 1), new Object[]{ "CAC", "ABA", "CAC", Character.valueOf('A'), new ItemStack(ItemRegistry.ItemMaterial),
- Character.valueOf('B'), ItemApi.getItem("itemResource", 7), Character.valueOf('C'), new ItemStack(ItemRegistry.ItemMaterial, 1, 9) }));
-
- ResearchRegistry.recipes.put("ItemMagicFunguar", ThaumcraftApi.addShapelessArcaneCraftingRecipe("MAGICFUNGUAR", new ItemStack(ItemRegistry.ItemMagicFunguar), TaintedMagicHelper
- .getPrimals(1), new Object[]{ new ItemStack(ConfigBlocks.blockCustomPlant, 1, 5), new ItemStack(ConfigItems.itemShard, 1, 32767), Items.glowstone_dust }));
-
- ResearchRegistry.recipes
- .put("ItemHollowDagger", ThaumcraftApi.addArcaneCraftingRecipe("CRYSTALDAGGER", new ItemStack(ItemRegistry.ItemHollowDagger), new AspectList().add(Aspect.ENTROPY, 85), new Object[]{
- " A", "EBD", "C ", Character.valueOf('A'), new ItemStack(ConfigItems.itemWandRod, 1, 7), Character.valueOf('B'), new ItemStack(ConfigBlocks.blockMagicalLog, 1, 0),
- Character.valueOf('C'), Items.stick, Character.valueOf('D'), ConfigItems.itemNugget, Character.valueOf('E'), Items.string }));
-
- ResearchRegistry.recipes.put("ItemWandCap:1", ThaumcraftApi.addArcaneCraftingRecipe("CAP_cloth", new ItemStack(ItemRegistry.ItemWandCap, 1, 1), new AspectList().add(Aspect.EARTH, 10)
- .add(Aspect.FIRE, 10).add(Aspect.ENTROPY, 10).add(Aspect.ORDER, 10), new Object[]{ "AAA", "A A", Character.valueOf('A'), ItemApi.getItem("itemResource", 7) }));
-
- ResearchRegistry.recipes.put("ItemWandCap:2", ThaumcraftApi.addArcaneCraftingRecipe("CAP_crimsoncloth", new ItemStack(ItemRegistry.ItemWandCap, 1, 2), new AspectList().add(Aspect.FIRE, 25)
- .add(Aspect.ENTROPY, 25).add(Aspect.ORDER, 25), new Object[]{ "AAA", "ABA", Character.valueOf('A'), new ItemStack(ItemRegistry.ItemMaterial, 1, 2), Character.valueOf('B'),
- ItemApi.getItem("itemResource", 14) }));
-
- ResearchRegistry.recipes.put("ItemWandCap:3", ThaumcraftApi.addArcaneCraftingRecipe("CAP_shadowcloth", new ItemStack(ItemRegistry.ItemWandCap, 1, 3), new AspectList().add(Aspect.EARTH, 55)
- .add(Aspect.FIRE, 55).add(Aspect.ENTROPY, 55).add(Aspect.ORDER, 55), new Object[]{ "AAA", "ABA", Character.valueOf('A'), new ItemStack(ItemRegistry.ItemMaterial, 1, 1),
- Character.valueOf('B'), ItemApi.getItem("itemResource", 14) }));
-
- ResearchRegistry.recipes.put("ItemFocusVisShard", ThaumcraftApi.addArcaneCraftingRecipe("FOCUSSHARD", new ItemStack(ItemRegistry.ItemFocusVisShard), new AspectList().add(Aspect.AIR, 46)
- .add(Aspect.ENTROPY, 38).add(Aspect.ORDER, 22), new Object[]{ "BDC", "DAD", "CDB", 'A', new ItemStack(ConfigItems.itemResource, 1, 3), 'B', new ItemStack(ConfigItems.itemShard, 1, 6),
- 'C', new ItemStack(ItemRegistry.ItemMaterial, 1, 4), 'D', new ItemStack(ConfigItems.itemWispEssence, 1, 32767) }));
-
- ResearchRegistry.recipes.put("ItemFocusLumos", ThaumcraftApi.addArcaneCraftingRecipe("FOCUSLUMOS", new ItemStack(ItemRegistry.ItemFocusLumos), new AspectList().add(Aspect.AIR, 52)
- .add(Aspect.FIRE, 56).add(Aspect.ORDER, 28), new Object[]{ "BDC", "DAD", "CDB", 'A', new ItemStack(ConfigItems.itemResource, 1, 3), 'B', new ItemStack(ConfigItems.itemResource, 1, 1),
- 'C', new ItemStack(ConfigItems.itemShard, 1, 6), 'D', new ItemStack(Items.glowstone_dust) }));
-
- ResearchRegistry.recipes.put("ItemMaterial:10", ThaumcraftApi.addShapelessArcaneCraftingRecipe("PRIMPEARL", new ItemStack(ItemRegistry.ItemMaterial, 3, 10), new AspectList()
- .add(Aspect.ENTROPY, 25), new ItemStack(ConfigItems.itemEldritchObject, 1, 3)));
-
- ResearchRegistry.recipes.put("ItemMaterial:11", ThaumcraftApi.addShapelessArcaneCraftingRecipe("PRIMPEARL", new ItemStack(ItemRegistry.ItemMaterial, 3, 11), new AspectList()
- .add(Aspect.ENTROPY, 15), new ItemStack(ItemRegistry.ItemMaterial, 1, 10)));
-
- ResearchRegistry.recipes.put("ItemMaterial:12", ThaumcraftApi.addShapelessArcaneCraftingRecipe("CREATIONSHARD", new ItemStack(ItemRegistry.ItemMaterial, 9, 12), new AspectList()
- .add(Aspect.ENTROPY, 99), new ItemStack(ItemRegistry.ItemMaterial, 1, 5)));
-
- ResearchRegistry.recipes.put("ItemVoidsentBlood", ThaumcraftApi.addArcaneCraftingRecipe("VOIDSENTBLOOD", new ItemStack(ItemRegistry.ItemVoidsentBlood), new AspectList().add(Aspect.ORDER, 35)
- .add(Aspect.ENTROPY, 25), new Object[]{ "BDB", "CAC", "BCB", 'A', new ItemStack(ItemRegistry.ItemMaterial, 1, 7), 'B', new ItemStack(ConfigItems.itemResource, 1, 17), 'C',
- new ItemStack(ConfigItems.itemResource, 1, 14), 'D', new ItemStack(ItemRegistry.ItemMaterial, 1, 11) }));
- }
-
- public static void initCrucible ()
- {
- ResearchRegistry.recipes.put("ItemMaterial:3", ThaumcraftApi
- .addCrucibleRecipe("EVILSHARDS", new ItemStack(ItemRegistry.ItemMaterial, 1, 3), ItemApi.getItem("itemShard", 6), new AspectList().merge(Aspect.ELDRITCH, 4)));
- ResearchRegistry.recipes.put("ItemMaterial:4", ThaumcraftApi
- .addCrucibleRecipe("EVILSHARDS", new ItemStack(ItemRegistry.ItemMaterial, 1, 4), ItemApi.getItem("itemShard", 6), new AspectList().merge(Aspect.TAINT, 4)));
- ResearchRegistry.recipes.put("BlockShadowOre", ThaumcraftApi.addCrucibleRecipe("SHADOWMETAL", new ItemStack(BlockRegistry.BlockShadowOre), new ItemStack(Blocks.stone), new AspectList()
- .merge(Aspect.DARKNESS, 1).merge(Aspect.METAL, 3).merge(Aspect.MAGIC, 1)));
- ResearchRegistry.recipes.put("Vishroom_brown", ThaumcraftApi.addCrucibleRecipe("VISHROOMCRAFT", new ItemStack(ConfigBlocks.blockCustomPlant, 1,
- 5), new ItemStack(Blocks.brown_mushroom), new AspectList().merge(Aspect.MAGIC, 3).merge(Aspect.POISON, 1)));
- ResearchRegistry.recipes.put("Vishroom_red", ThaumcraftApi.addCrucibleRecipe("VISHROOMCRAFT", new ItemStack(ConfigBlocks.blockCustomPlant, 1,
- 5), new ItemStack(Blocks.red_mushroom), new AspectList().merge(Aspect.MAGIC, 3).merge(Aspect.POISON, 1)));
- }
+ public static void init ()
+ {
+ initCrafting();
+ initSmelting();
+ initCrucible();
+ initInfusion();
+ initArcane();
+ }
+
+ /**
+ * Vanilla crafting table recipes
+ */
+ public static void initCrafting ()
+ {
+ GameRegistry.addShapedRecipe(new ItemStack(Item.getItemFromBlock(BlockRegistry.BlockShadowmetal)),
+ new Object[]{ "AAA", "AAA", "AAA", Character.valueOf('A'), new ItemStack(ItemRegistry.ItemMaterial) });
+
+ GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.ItemMaterial, 1, 0),
+ new Object[]{ "AAA", "AAA", "AAA", Character.valueOf('A'), new ItemStack(ItemRegistry.ItemMaterial, 1, 8) });
+
+ ResearchRegistry.recipes.put("ItemShadowmetalPick",
+ GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.ItemShadowmetalPick),
+ new Object[]{ "AAA", " B ", " B ", Character.valueOf('A'), new ItemStack(ItemRegistry.ItemMaterial),
+ Character.valueOf('B'), new ItemStack(Items.stick) }));
+
+ ResearchRegistry.recipes.put("ItemShadowmetalAxe",
+ CraftingManager.getInstance().addRecipe(new ItemStack(ItemRegistry.ItemShadowmetalAxe),
+ new Object[]{ "AA", "BA", "B ", Character.valueOf('A'), new ItemStack(ItemRegistry.ItemMaterial),
+ Character.valueOf('B'), new ItemStack(Items.stick) }));
+
+ ResearchRegistry.recipes.put("ItemShadowmetalSpade",
+ CraftingManager.getInstance().addRecipe(new ItemStack(ItemRegistry.ItemShadowmetalSpade),
+ new Object[]{ "A", "B", "B", Character.valueOf('A'), new ItemStack(ItemRegistry.ItemMaterial),
+ Character.valueOf('B'), new ItemStack(Items.stick) }));
+
+ ResearchRegistry.recipes.put("ItemShadowmetalHoe",
+ CraftingManager.getInstance().addRecipe(new ItemStack(ItemRegistry.ItemShadowmetalHoe),
+ new Object[]{ "AA", "B ", "B ", Character.valueOf('A'), new ItemStack(ItemRegistry.ItemMaterial),
+ Character.valueOf('B'), new ItemStack(Items.stick) }));
+
+ ResearchRegistry.recipes.put("ItemShadowmetalSword",
+ GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.ItemShadowmetalSword),
+ new Object[]{ "A", "A", "B", Character.valueOf('A'), new ItemStack(ItemRegistry.ItemMaterial),
+ Character.valueOf('B'), new ItemStack(Items.stick) }));
+
+ GameRegistry.addRecipe(new ItemStack(ItemRegistry.ItemMaterial, 9),
+ new Object[]{ "A", Character.valueOf('A'), new ItemStack(BlockRegistry.BlockShadowmetal) });
+
+ GameRegistry.addRecipe(new ItemStack(ItemRegistry.ItemMaterial, 9, 8),
+ new Object[]{ "A", Character.valueOf('A'), new ItemStack(ItemRegistry.ItemMaterial, 1, 0) });
+
+ ResearchRegistry.recipes.put("BlockWarpwoodPlanks",
+ CraftingManager.getInstance().addRecipe(new ItemStack(BlockRegistry.BlockWarpwoodPlanks, 4),
+ new Object[]{ "A", Character.valueOf('A'), new ItemStack(BlockRegistry.BlockWarpwoodLog) }));
+ }
+
+ /**
+ * Furnace recipes
+ */
+ public static void initSmelting ()
+ {
+ GameRegistry.addSmelting(BlockRegistry.BlockShadowOre, new ItemStack(ItemRegistry.ItemMaterial), 2.0F);
+ }
+
+ /**
+ * Arcane Infusion recipes
+ */
+ public static void initInfusion ()
+ {
+ ResearchRegistry.recipes.put("ItemFocusShockwave",
+ ThaumcraftApi.addInfusionCraftingRecipe("FOCUSSHOCKWAVE", new ItemStack(ItemRegistry.ItemFocusShockwave), 6,
+ new AspectList()
+ .add(Aspect.AIR, 35).add(Aspect.MOTION, 42).add(Aspect.ENERGY, 42).add(Aspect.MAGIC, 16),
+ new ItemStack(ConfigItems.itemFocusShock),
+ new ItemStack[]{ new ItemStack(Blocks.tnt), new ItemStack(Items.gunpowder),
+ new ItemStack(ConfigItems.itemShard, 1, 0), new ItemStack(Blocks.tnt),
+ new ItemStack(Items.gunpowder), new ItemStack(ConfigItems.itemShard, 1, 0) }));
+
+ ResearchRegistry.recipes.put("ItemPrimordialEdge", ThaumcraftApi.addInfusionCraftingRecipe("PRIMALBLADE",
+ new ItemStack(ItemRegistry.ItemPrimordialEdge), 8, new AspectList().add(Aspect.WEAPON, 65)
+ .add(Aspect.ELDRITCH, 46).add(Aspect.DARKNESS, 16).add(Aspect.METAL, 60).add(Aspect.VOID, 56),
+ ItemApi.getItem("itemSwordVoid", 0),
+ new ItemStack[]{ new ItemStack(ItemRegistry.ItemMaterial, 1, 5), new ItemStack(ConfigItems.itemShard, 1, 0),
+ new ItemStack(ConfigItems.itemShard, 1, 1), new ItemStack(ConfigItems.itemShard, 1, 2),
+ new ItemStack(ItemRegistry.ItemMaterial, 1, 10), new ItemStack(ConfigItems.itemShard, 1, 3),
+ new ItemStack(ConfigItems.itemShard, 1, 4), new ItemStack(ConfigItems.itemShard, 1, 5) }));
+
+ ResearchRegistry.recipes.put("ItemFocusMageMace",
+ ThaumcraftApi.addInfusionCraftingRecipe("MACEFOCUS", new ItemStack(ItemRegistry.ItemFocusMageMace), 3,
+ new AspectList()
+ .add(Aspect.WEAPON, 32).add(Aspect.METAL, 8).add(Aspect.ENTROPY, 18).add(Aspect.MAGIC, 26),
+ new ItemStack(Blocks.iron_block),
+ new ItemStack[]{ new ItemStack(Items.iron_sword), new ItemStack(Items.quartz),
+ ItemApi.getItem("itemShard", 5), new ItemStack(Items.quartz), new ItemStack(Items.iron_sword),
+ new ItemStack(Items.quartz), ItemApi.getItem("itemShard", 5), new ItemStack(Items.quartz) }));
+
+ ResearchRegistry.recipes.put("ItemSwordCrimson",
+ ThaumcraftApi.addInfusionCraftingRecipe("CRIMSONBLADE", new ItemStack(ConfigItems.itemSwordCrimson), 7,
+ new AspectList().add(Aspect.WEAPON, 32).add(Aspect.METAL, 16).add(Aspect.ENTROPY, 8)
+ .add(Aspect.ELDRITCH, 18).add(Aspect.VOID, 32),
+ ItemApi.getItem("itemSwordVoid", 0), new ItemStack[]{ new ItemStack(ItemRegistry.ItemCrimsonBlood),
+ new ItemStack(ItemRegistry.ItemCrimsonBlood), new ItemStack(ItemRegistry.ItemCrimsonBlood) }));
+
+ ResearchRegistry.recipes.put("ItemVoidwalkerSash",
+ ThaumcraftApi.addInfusionCraftingRecipe(
+ "VOIDSASH", new ItemStack(ItemRegistry.ItemVoidwalkerSash, 1), 7, new AspectList().add(Aspect.VOID, 56)
+ .add(Aspect.MAGIC, 40).add(Aspect.ARMOR, 66).add(Aspect.TRAVEL, 16).add(Aspect.FLIGHT, 10),
+ ItemApi.getItem("itemGirdleRunic", 0),
+ new ItemStack[]{ ItemApi.getItem("itemEldritchObject", 3), ItemApi.getItem("itemResource", 16),
+ new ItemStack(ItemRegistry.ItemMaterial), ItemApi.getItem("itemResource", 16),
+ new ItemStack(ItemRegistry.ItemMaterial, 1, 1), ItemApi.getItem("itemResource", 16),
+ new ItemStack(ItemRegistry.ItemMaterial), ItemApi.getItem("itemResource", 16), }));
+
+ ResearchRegistry.recipes.put("ItemMaterial:5",
+ ThaumcraftApi.addInfusionCraftingRecipe(
+ "CREATIONSHARD", new ItemStack(ItemRegistry.ItemMaterial, 1, 5), 8, TaintedMagicHelper.getPrimals(46)
+ .add(Aspect.AURA, 35).add(Aspect.VOID, 22).add(Aspect.MAGIC, 56).add(Aspect.CRYSTAL, 38),
+ new ItemStack(ConfigItems.itemShard, 1, 6),
+ new ItemStack[]{ new ItemStack(ConfigItems.itemEldritchObject, 1, 3),
+ new ItemStack(ConfigItems.itemShard, 1, 0), new ItemStack(ConfigItems.itemShard, 1, 1),
+ new ItemStack(ConfigItems.itemShard, 1, 2), new ItemStack(Items.nether_star),
+ new ItemStack(ConfigItems.itemShard, 1, 3), new ItemStack(ConfigItems.itemShard, 1, 4),
+ new ItemStack(ConfigItems.itemShard, 1, 5) }));
+
+ ResearchRegistry.recipes.put("ItemWandRod:0", ThaumcraftApi.addInfusionCraftingRecipe("ROD_warpwood",
+ new ItemStack(ItemRegistry.ItemWandRod), 8, new AspectList().add(Aspect.ELDRITCH, 65).add(Aspect.DARKNESS, 30)
+ .add(Aspect.TREE, 12).add(Aspect.MAGIC, 45).add(Aspect.AURA, 35),
+ new ItemStack(BlockRegistry.BlockWarpwoodLog),
+ new ItemStack[]{ new ItemStack(ItemRegistry.ItemMaterial, 1, 9), new ItemStack(ItemRegistry.ItemMaterial),
+ new ItemStack(ItemRegistry.ItemMaterial, 1, 3), ItemApi.getItem("itemResource", 16),
+ ItemApi.getItem("itemZombieBrain", 0), new ItemStack(ItemRegistry.ItemMaterial),
+ new ItemStack(ItemRegistry.ItemMaterial, 1, 3), ItemApi.getItem("itemResource", 16) }));
+
+ ResearchRegistry.recipes.put("ItemVoidFortressHelmet:goggles",
+ ThaumcraftApi.addInfusionCraftingRecipe("HELMGOGGLES", new Object[]{ "goggles", new NBTTagByte((byte) 1) }, 5,
+ new AspectList().add(Aspect.SENSES, 32).add(Aspect.AURA, 16).add(Aspect.ARMOR, 16),
+ new ItemStack(ItemRegistry.ItemVoidFortressHelmet, 1, 32767),
+ new ItemStack[]{ new ItemStack(Items.slime_ball), ItemApi.getItem("itemGoggles", 0) }));
+
+ ResearchRegistry.recipes.put("ItemVoidFortressHelmet:mask0",
+ ThaumcraftApi.addInfusionCraftingRecipe("MASKGRINNINGDEVIL", new Object[]{ "mask", new NBTTagInt(0) }, 8,
+ new AspectList().add(Aspect.MIND, 64).add(Aspect.HEAL, 64).add(Aspect.ARMOR, 16),
+ new ItemStack(ItemRegistry.ItemVoidFortressHelmet, 1, 32767),
+ new ItemStack[]{ new ItemStack(Items.dye, 1, 0), new ItemStack(Items.iron_ingot),
+ new ItemStack(Items.leather), ItemApi.getBlock("blockCustomPlant", 2),
+ ItemApi.getItem("itemZombieBrain", 0), new ItemStack(Items.iron_ingot) }));
+
+ ResearchRegistry.recipes.put("ItemVoidFortressHelmet:mask1",
+ ThaumcraftApi.addInfusionCraftingRecipe("MASKANGRYGHOST", new Object[]{ "mask", new NBTTagInt(1) }, 8,
+ new AspectList().add(Aspect.ENTROPY, 64).add(Aspect.DEATH, 64).add(Aspect.ARMOR, 16),
+ new ItemStack(ItemRegistry.ItemVoidFortressHelmet, 1, 32767),
+ new ItemStack[]{ new ItemStack(Items.dye, 1, 15), new ItemStack(Items.iron_ingot),
+ new ItemStack(Items.leather), new ItemStack(Items.poisonous_potato),
+ new ItemStack(Items.skull, 1, 1), new ItemStack(Items.iron_ingot) }));
+
+ ResearchRegistry.recipes.put("ItemVoidFortressHelmet:mask2",
+ ThaumcraftApi.addInfusionCraftingRecipe("MASKSIPPINGFIEND", new Object[]{ "mask", new NBTTagInt(2) }, 8,
+ new AspectList().add(Aspect.UNDEAD, 64).add(Aspect.LIFE, 64).add(Aspect.ARMOR, 16),
+ new ItemStack(ItemRegistry.ItemVoidFortressHelmet, 1, 32767),
+ new ItemStack[]{ new ItemStack(Items.dye, 1, 1), new ItemStack(Items.iron_ingot),
+ new ItemStack(Items.leather), new ItemStack(Items.ghast_tear), new ItemStack(Items.milk_bucket),
+ new ItemStack(Items.iron_ingot) }));
+
+ ResearchRegistry.recipes.put("ItemVoidFortressHelmet", ThaumcraftApi.addInfusionCraftingRecipe("VOIDFORTRESS",
+ new ItemStack(ItemRegistry.ItemVoidFortressHelmet), 6,
+ new AspectList().add(Aspect.METAL, 24).add(Aspect.ARMOR, 16).add(Aspect.MAGIC, 8).add(Aspect.ELDRITCH, 16)
+ .add(Aspect.VOID, 16),
+ ItemApi.getItem("itemHelmetVoid", 0),
+ new ItemStack[]{ ItemApi.getItem("itemResource", 16), ItemApi.getItem("itemResource", 16),
+ new ItemStack(Items.gold_ingot), new ItemStack(Items.gold_ingot), new ItemStack(Items.emerald) }));
+
+ ResearchRegistry.recipes.put("ItemVoidFortressChestplate", ThaumcraftApi.addInfusionCraftingRecipe("VOIDFORTRESS",
+ new ItemStack(ItemRegistry.ItemVoidFortressChestplate), 6, new AspectList().add(Aspect.METAL, 24)
+ .add(Aspect.ARMOR, 24).add(Aspect.MAGIC, 8).add(Aspect.ELDRITCH, 16).add(Aspect.VOID, 24),
+ ItemApi.getItem("itemChestVoid", 0),
+ new ItemStack[]{ ItemApi.getItem("itemResource", 16), ItemApi.getItem("itemResource", 16),
+ ItemApi.getItem("itemResource", 16), ItemApi.getItem("itemResource", 16),
+ new ItemStack(Items.gold_ingot), new ItemStack(Items.leather) }));
+
+ ResearchRegistry.recipes.put("ItemVoidFortressLeggings", ThaumcraftApi.addInfusionCraftingRecipe("VOIDFORTRESS",
+ new ItemStack(ItemRegistry.ItemVoidFortressLeggings), 6,
+ new AspectList().add(Aspect.METAL, 24).add(Aspect.ARMOR, 20).add(Aspect.MAGIC, 8).add(Aspect.ELDRITCH, 16)
+ .add(Aspect.VOID, 20),
+ ItemApi.getItem("itemLegsVoid", 0),
+ new ItemStack[]{ ItemApi.getItem("itemResource", 16), ItemApi.getItem("itemResource", 16),
+ ItemApi.getItem("itemResource", 16), new ItemStack(Items.gold_ingot), new ItemStack(Items.leather) }));
+
+ ResearchRegistry.recipes.put("ItemWarpedGoggles",
+ ThaumcraftApi.addInfusionCraftingRecipe("WARPEDGOGGLES", new ItemStack(ItemRegistry.ItemWarpedGoggles), 3,
+ new AspectList().add(Aspect.ELDRITCH, 35).add(Aspect.DARKNESS, 12).add(Aspect.MAGIC, 16)
+ .add(Aspect.ARMOR, 8),
+ ItemApi.getItem("itemGoggles", 0), new ItemStack[]{ new ItemStack(ItemRegistry.ItemMaterial, 1, 8),
+ new ItemStack(ConfigItems.itemWispEssence, 1, 32767) }));
+
+ ResearchRegistry.recipes.put("ItemWandCap:0", ThaumcraftApi.addInfusionCraftingRecipe(
+ "CAP_shadowmetal", new ItemStack(ItemRegistry.ItemWandCap), 8, new AspectList().add(Aspect.ELDRITCH, 55)
+ .add(Aspect.DARKNESS, 47).add(Aspect.MAGIC, 52).add(Aspect.METAL, 45).add(Aspect.VOID, 55),
+ ItemApi.getItem("itemWandCap", 7),
+ new ItemStack[]{ new ItemStack(ItemRegistry.ItemMaterial, 1, 3), new ItemStack(ItemRegistry.ItemMaterial),
+ ItemApi.getItem("itemResource", 16), new ItemStack(ItemRegistry.ItemMaterial),
+ new ItemStack(ItemRegistry.ItemMaterial, 1, 9), new ItemStack(ItemRegistry.ItemMaterial),
+ ItemApi.getItem("itemResource", 16), new ItemStack(ItemRegistry.ItemMaterial) }));
+
+ ResearchRegistry.recipes.put("ItemFocusTaintSwarm",
+ ThaumcraftApi.addInfusionCraftingRecipe(
+ "TAINTFOCUS", new ItemStack(ItemRegistry.ItemFocusTaintSwarm), 4, new AspectList().add(Aspect.TAINT, 45)
+ .add(Aspect.LIFE, 24).add(Aspect.MOTION, 24).add(Aspect.MAGIC, 16).add(Aspect.DEATH, 37),
+ new ItemStack(ItemRegistry.ItemFocusVisShard),
+ new ItemStack[]{ ItemApi.getItem("itemResource", 11), new ItemStack(ItemRegistry.ItemMaterial, 1, 4),
+ ItemApi.getItem("itemBottleTaint", 0), new ItemStack(ItemRegistry.ItemMaterial, 1, 4),
+ ItemApi.getItem("itemResource", 11), new ItemStack(ItemRegistry.ItemMaterial, 1, 4),
+ ItemApi.getItem("itemBottleTaint", 0), new ItemStack(ItemRegistry.ItemMaterial, 1, 4) }));
+
+ ResearchRegistry.recipes.put("ItemFocusDarkMatter", ThaumcraftApi.addInfusionCraftingRecipe("ELDRITCHFOCUS",
+ new ItemStack(ItemRegistry.ItemFocusDarkMatter), 6, new AspectList().add(Aspect.ELDRITCH, 64)
+ .add(Aspect.DARKNESS, 32).add(Aspect.MAGIC, 32).add(Aspect.DEATH, 32).add(Aspect.VOID, 32),
+ new ItemStack(ConfigItems.itemFocusPortableHole),
+ new ItemStack[]{ new ItemStack(ConfigItems.itemEldritchObject, 1, 3),
+ new ItemStack(ConfigItems.itemResource, 1, 16), new ItemStack(ItemRegistry.ItemMaterial, 1, 3),
+ new ItemStack(ConfigItems.itemBucketDeath), new ItemStack(ItemRegistry.ItemMaterial, 1, 3),
+ new ItemStack(ConfigItems.itemResource, 1, 16), new ItemStack(ConfigItems.itemResource, 1, 17),
+ new ItemStack(ConfigItems.itemResource, 1, 16), new ItemStack(ItemRegistry.ItemMaterial, 1, 3),
+ new ItemStack(ConfigItems.itemBucketDeath), new ItemStack(ItemRegistry.ItemMaterial, 1, 3),
+ new ItemStack(ConfigItems.itemResource, 1, 16) }));
+
+ ResearchRegistry.recipes.put("ItemMaterial:7",
+ ThaumcraftApi.addInfusionCraftingRecipe("KNIGHTROBES", new ItemStack(ItemRegistry.ItemMaterial, 9, 7), 2,
+ new AspectList().add(Aspect.HUNGER, 4).add(Aspect.METAL, 8).add(Aspect.MAGIC, 6),
+ new ItemStack(Blocks.iron_block),
+ new ItemStack[]{ new ItemStack(ItemRegistry.ItemCrimsonBlood), new ItemStack(Items.gold_nugget),
+ new ItemStack(ItemRegistry.ItemCrimsonBlood), new ItemStack(Items.gold_nugget),
+ new ItemStack(ItemRegistry.ItemCrimsonBlood), new ItemStack(Items.gold_nugget),
+ new ItemStack(ItemRegistry.ItemCrimsonBlood), new ItemStack(Items.gold_nugget) }));
+
+ ResearchRegistry.recipes.put("ItemVoidwalkerBoots", ThaumcraftApi.addInfusionCraftingRecipe("VOIDWALKERBOOTS",
+ new ItemStack(ItemRegistry.ItemVoidwalkerBoots), 8, new AspectList().add(Aspect.DARKNESS, 42)
+ .add(Aspect.VOID, 56).add(Aspect.ELDRITCH, 38).add(Aspect.ARMOR, 60).add(Aspect.TRAVEL, 45),
+ ItemApi.getItem("itemBootsTraveller", 0),
+ new ItemStack[]{ new ItemStack(ItemRegistry.ItemMaterial, 1, 10), ItemApi.getItem("itemResource", 16),
+ new ItemStack(ItemRegistry.ItemMaterial, 1, 1), new ItemStack(ItemRegistry.ItemMaterial),
+ new ItemStack(ItemRegistry.ItemMaterial, 1, 1), ItemApi.getItem("itemResource", 16),
+ ItemApi.getItem("itemEldritchObject", 0), ItemApi.getItem("itemResource", 16),
+ new ItemStack(ItemRegistry.ItemMaterial, 1, 1), new ItemStack(ItemRegistry.ItemMaterial),
+ new ItemStack(ItemRegistry.ItemMaterial, 1, 1), ItemApi.getItem("itemResource", 16) }));
+
+ ResearchRegistry.recipes.put("ItemSalis:0",
+ ThaumcraftApi.addInfusionCraftingRecipe("SKYSALT", new ItemStack(ItemRegistry.ItemSalis, 3, 0), 7,
+ new AspectList().add(Aspect.AURA, 20).add(Aspect.WEATHER, 30).add(Aspect.WATER, 30),
+ new ItemStack(ConfigItems.itemResource, 1, 14),
+ new ItemStack[]{ new ItemStack(ConfigItems.itemResource, 1, 0),
+ new ItemStack(ConfigItems.itemNugget, 1, 5),
+ new ItemStack(ItemRegistry.ItemMaterial, 1, 11) }));
+
+ ResearchRegistry.recipes.put("ItemSalis:1",
+ ThaumcraftApi.addInfusionCraftingRecipe("TIMESALT", new ItemStack(ItemRegistry.ItemSalis, 3, 1), 7,
+ new AspectList().add(Aspect.AURA, 20).add(Aspect.LIGHT, 30).add(Aspect.DARKNESS, 30),
+ new ItemStack(ConfigItems.itemResource, 1, 14),
+ new ItemStack[]{ new ItemStack(ConfigItems.itemResource, 1, 1), new ItemStack(Items.gold_nugget),
+ new ItemStack(ItemRegistry.ItemMaterial, 1, 11) }));
+
+ ResearchRegistry.recipes.put("ItemThaumicDisassembler",
+ ThaumcraftApi.addInfusionCraftingRecipe("THAUMICDISASSEMBLER",
+ new ItemStack(ItemRegistry.ItemThaumicDisassembler), 3,
+ new AspectList()
+ .add(Aspect.METAL, 22).add(Aspect.TOOL, 24).add(Aspect.WEAPON, 14).add(Aspect.MECHANISM, 12),
+ new ItemStack(ItemRegistry.ItemMaterial, 1, 6),
+ new ItemStack[]{ new ItemStack(ItemRegistry.ItemMaterial, 1, 10), ItemApi.getItem("itemPickVoid", 0),
+ ItemApi.getItem("itemResource", 2), ItemApi.getItem("itemShovelVoid", 0),
+ new ItemStack(Items.diamond), ItemApi.getItem("itemSwordVoid", 0),
+ ItemApi.getItem("itemResource", 2), ItemApi.getItem("itemAxeVoid", 0) }));
+
+ ResearchRegistry.recipes.put("ItemShadowFortressHelmet:goggles",
+ ThaumcraftApi.addInfusionCraftingRecipe("HELMGOGGLES", new Object[]{ "goggles", new NBTTagByte((byte) 1) }, 5,
+ new AspectList().add(Aspect.SENSES, 32).add(Aspect.AURA, 16).add(Aspect.ARMOR, 16),
+ new ItemStack(ItemRegistry.ItemShadowFortressHelmet, 1, 32767),
+ new ItemStack[]{ new ItemStack(Items.slime_ball), ItemApi.getItem("itemGoggles", 0) }));
+
+ ResearchRegistry.recipes.put("ItemShadowFortressHelmet:mask0",
+ ThaumcraftApi.addInfusionCraftingRecipe("MASKGRINNINGDEVIL", new Object[]{ "mask", new NBTTagInt(0) }, 8,
+ new AspectList().add(Aspect.MIND, 64).add(Aspect.HEAL, 64).add(Aspect.ARMOR, 16),
+ new ItemStack(ItemRegistry.ItemShadowFortressHelmet, 1, 32767),
+ new ItemStack[]{ new ItemStack(Items.dye, 1, 0), new ItemStack(Items.iron_ingot),
+ new ItemStack(Items.leather), ItemApi.getBlock("blockCustomPlant", 2),
+ ItemApi.getItem("itemZombieBrain", 0), new ItemStack(Items.iron_ingot) }));
+
+ ResearchRegistry.recipes.put("ItemShadowFortressHelmet:mask1",
+ ThaumcraftApi.addInfusionCraftingRecipe("MASKANGRYGHOST", new Object[]{ "mask", new NBTTagInt(1) }, 8,
+ new AspectList().add(Aspect.ENTROPY, 64).add(Aspect.DEATH, 64).add(Aspect.ARMOR, 16),
+ new ItemStack(ItemRegistry.ItemShadowFortressHelmet, 1, 32767),
+ new ItemStack[]{ new ItemStack(Items.dye, 1, 15), new ItemStack(Items.iron_ingot),
+ new ItemStack(Items.leather), new ItemStack(Items.poisonous_potato),
+ new ItemStack(Items.skull, 1, 1), new ItemStack(Items.iron_ingot) }));
+
+ ResearchRegistry.recipes.put("ItemShadowFortressHelmet:mask2",
+ ThaumcraftApi.addInfusionCraftingRecipe("MASKSIPPINGFIEND", new Object[]{ "mask", new NBTTagInt(2) }, 8,
+ new AspectList().add(Aspect.UNDEAD, 64).add(Aspect.LIFE, 64).add(Aspect.ARMOR, 16),
+ new ItemStack(ItemRegistry.ItemShadowFortressHelmet, 1, 32767),
+ new ItemStack[]{ new ItemStack(Items.dye, 1, 1), new ItemStack(Items.iron_ingot),
+ new ItemStack(Items.leather), new ItemStack(Items.ghast_tear), new ItemStack(Items.milk_bucket),
+ new ItemStack(Items.iron_ingot) }));
+
+ ResearchRegistry.recipes.put("ItemShadowFortressHelmet", ThaumcraftApi.addInfusionCraftingRecipe("SHADOWFORTRESS",
+ new ItemStack(ItemRegistry.ItemShadowFortressHelmet), 7,
+ new AspectList().add(Aspect.METAL, 28).add(Aspect.ARMOR, 20).add(Aspect.MAGIC, 12).add(Aspect.DARKNESS, 30)
+ .add(Aspect.VOID, 22),
+ ItemApi.getItem("itemHelmetVoid", 0),
+ new ItemStack[]{ new ItemStack(BlockRegistry.BlockShadowmetal), new ItemStack(BlockRegistry.BlockShadowmetal),
+ new ItemStack(Items.gold_ingot), new ItemStack(Items.gold_ingot), new ItemStack(Items.emerald) }));
+
+ ResearchRegistry.recipes.put("ItemShadowFortressChestplate", ThaumcraftApi.addInfusionCraftingRecipe("SHADOWFORTRESS",
+ new ItemStack(ItemRegistry.ItemShadowFortressChestplate), 7, new AspectList().add(Aspect.METAL, 38)
+ .add(Aspect.ARMOR, 26).add(Aspect.MAGIC, 18).add(Aspect.DARKNESS, 34).add(Aspect.VOID, 26),
+ ItemApi.getItem("itemChestVoid", 0),
+ new ItemStack[]{ new ItemStack(BlockRegistry.BlockShadowmetal), new ItemStack(BlockRegistry.BlockShadowmetal),
+ new ItemStack(BlockRegistry.BlockShadowmetal), new ItemStack(BlockRegistry.BlockShadowmetal),
+ new ItemStack(Items.gold_ingot), new ItemStack(Items.leather) }));
+
+ ResearchRegistry.recipes.put("ItemShadowFortressLeggings",
+ ThaumcraftApi.addInfusionCraftingRecipe("SHADOWFORTRESS",
+ new ItemStack(ItemRegistry.ItemShadowFortressLeggings), 7, new AspectList().add(Aspect.METAL, 32)
+ .add(Aspect.ARMOR, 24).add(Aspect.MAGIC, 16).add(Aspect.DARKNESS, 32).add(Aspect.VOID, 24),
+ ItemApi.getItem("itemLegsVoid", 0),
+ new ItemStack[]{ new ItemStack(BlockRegistry.BlockShadowmetal),
+ new ItemStack(BlockRegistry.BlockShadowmetal), new ItemStack(BlockRegistry.BlockShadowmetal),
+ new ItemStack(Items.gold_ingot), new ItemStack(Items.leather) }));
+
+ ResearchRegistry.recipes.put("ItemKatana:0",
+ ThaumcraftApi.addInfusionCraftingRecipe("THAUMIUMKATANA", new ItemStack(ItemRegistry.ItemKatana, 1, 0), 3,
+ new AspectList().add(Aspect.METAL, 42).add(Aspect.WEAPON, 45).add(Aspect.MAGIC, 22),
+ new ItemStack(ConfigItems.itemSwordThaumium),
+ new ItemStack[]{ new ItemStack(Blocks.obsidian), new ItemStack(ConfigItems.itemResource, 1, 2),
+ new ItemStack(Items.gold_ingot), new ItemStack(Items.emerald), new ItemStack(Items.iron_ingot),
+ new ItemStack(ConfigItems.itemResource, 1, 2), new ItemStack(Blocks.obsidian),
+ new ItemStack(ConfigItems.itemResource, 1, 2), new ItemStack(Items.gold_ingot),
+ new ItemStack(Items.emerald), new ItemStack(Items.iron_ingot),
+ new ItemStack(ConfigItems.itemResource, 1, 2) }));
+
+ ResearchRegistry.recipes.put("ItemKatana:1", ThaumcraftApi.addInfusionCraftingRecipe("VOIDMETALKATANA",
+ new ItemStack(ItemRegistry.ItemKatana, 1, 1), 6, new AspectList().add(Aspect.METAL, 52).add(Aspect.WEAPON, 55)
+ .add(Aspect.MAGIC, 32).add(Aspect.VOID, 46).add(Aspect.ELDRITCH, 12),
+ new ItemStack(ConfigItems.itemSwordVoid),
+ new ItemStack[]{ new ItemStack(Blocks.obsidian), new ItemStack(ConfigItems.itemResource, 1, 16),
+ new ItemStack(Items.gold_ingot), new ItemStack(Items.emerald), new ItemStack(Items.iron_ingot),
+ new ItemStack(ConfigItems.itemResource, 1, 16), new ItemStack(Blocks.obsidian),
+ new ItemStack(ConfigItems.itemResource, 1, 16), new ItemStack(Items.gold_ingot),
+ new ItemStack(Items.emerald), new ItemStack(Items.iron_ingot),
+ new ItemStack(ConfigItems.itemResource, 1, 16) }));
+
+ ResearchRegistry.recipes.put("ItemKatana:2", ThaumcraftApi.addInfusionCraftingRecipe("SHADOWMETALKATANA",
+ new ItemStack(ItemRegistry.ItemKatana, 1, 2), 7, new AspectList().add(Aspect.METAL, 62).add(Aspect.WEAPON, 65)
+ .add(Aspect.MAGIC, 42).add(Aspect.VOID, 16).add(Aspect.DARKNESS, 46),
+ new ItemStack(ItemRegistry.ItemShadowmetalSword),
+ new ItemStack[]{ new ItemStack(Blocks.obsidian), new ItemStack(ItemRegistry.ItemMaterial, 1, 0),
+ new ItemStack(Items.iron_ingot), new ItemStack(Items.emerald), new ItemStack(Items.iron_ingot),
+ new ItemStack(ItemRegistry.ItemMaterial, 1, 0), new ItemStack(Blocks.obsidian),
+ new ItemStack(ItemRegistry.ItemMaterial, 1, 0), new ItemStack(Items.iron_ingot),
+ new ItemStack(Items.emerald), new ItemStack(Items.iron_ingot),
+ new ItemStack(ItemRegistry.ItemMaterial, 1, 0) }));
+
+ ResearchRegistry.recipes.put("ItemFlyteCharm", ThaumcraftApi.addInfusionCraftingRecipe("FLYTECHARM",
+ new ItemStack(ItemRegistry.ItemFlyteCharm, 1, 0), 7, new AspectList().add(Aspect.FLIGHT, 86)
+ .add(Aspect.AURA, 56).add(Aspect.SENSES, 25).add(Aspect.MAGIC, 48).add(Aspect.ENERGY, 65),
+ new ItemStack(ConfigItems.itemPrimalArrow, 1, 0),
+ new ItemStack[]{ new ItemStack(ItemRegistry.ItemMaterial, 1, 9), new ItemStack(Items.gold_ingot),
+ new ItemStack(ConfigItems.itemShard, 1, 0), new ItemStack(Items.iron_ingot),
+ new ItemStack(ItemRegistry.ItemMaterial, 1, 5), new ItemStack(Items.gold_ingot),
+ new ItemStack(ConfigItems.itemShard, 1, 0), new ItemStack(Items.iron_ingot) }));
+
+ ResearchRegistry.recipes.put("ItemGatekey",
+ ThaumcraftApi.addInfusionCraftingRecipe("GATEKEY", new ItemStack(ItemRegistry.ItemGatekey, 1, 0), 7,
+ new AspectList()
+ .add(Aspect.MOTION, 40).add(Aspect.AURA, 20).add(Aspect.TRAVEL, 25).add(Aspect.MAGIC, 30),
+ new ItemStack(Items.gold_ingot),
+ new ItemStack[]{ new ItemStack(ItemRegistry.ItemMaterial, 1, 11), new ItemStack(Items.iron_ingot),
+ new ItemStack(ConfigItems.itemShard, 1, 6), new ItemStack(Items.ender_pearl),
+ new ItemStack(Items.feather), new ItemStack(Items.iron_ingot),
+ new ItemStack(ConfigItems.itemShard, 1, 6), new ItemStack(Items.ender_pearl) }));
+ /**
+ * The ItemKatanaThaumium recipes are for the thaumonomicon
+ */
+ ResearchRegistry.recipes.put("ItemKatanaThaumium:inscription0",
+ ThaumcraftApi.addInfusionCraftingRecipe("INSCRIPTIONFIRE", new Object[]{ "inscription", new NBTTagInt(0) }, 8,
+ new AspectList().add(Aspect.FIRE, 64).add(Aspect.LIGHT, 64).add(Aspect.METAL, 16),
+ new ItemStack(ItemRegistry.ItemKatana, 1, 0),
+ new ItemStack[]{ ItemApi.getItem("itemFocusFire", 0), new ItemStack(Items.coal),
+ new ItemStack(Blocks.netherrack), new ItemStack(Items.fire_charge),
+ new ItemStack(Items.blaze_powder), ItemApi.getItem("itemResource", 1) }));
+
+ ResearchRegistry.recipes.put("ItemKatanaThaumium:inscription1", ThaumcraftApi.addInfusionCraftingRecipe(
+ "INSCRIPTIONTHUNDER", new Object[]{ "inscription", new NBTTagInt(1) }, 8,
+ new AspectList().add(Aspect.AIR, 64).add(Aspect.MOTION, 64).add(Aspect.MAGIC, 16),
+ new ItemStack(ItemRegistry.ItemKatana, 1, 0),
+ new ItemStack[]{ new ItemStack(ItemRegistry.ItemFocusShockwave), new ItemStack(ConfigItems.itemShard, 1, 0),
+ new ItemStack(Items.feather), new ItemStack(Blocks.tnt), new ItemStack(ConfigItems.itemShard, 1, 5),
+ new ItemStack(Items.gunpowder) }));
+
+ ResearchRegistry.recipes.put("ItemKatanaThaumium:inscription2",
+ ThaumcraftApi.addInfusionCraftingRecipe("INSCRIPTIONUNDEAD", new Object[]{ "inscription", new NBTTagInt(2) }, 8,
+ new AspectList().add(Aspect.HEAL, 64).add(Aspect.UNDEAD, 64).add(Aspect.MAGIC, 16),
+ new ItemStack(ItemRegistry.ItemKatana, 1, 0),
+ new ItemStack[]{ new ItemStack(ConfigItems.itemFocusPech), new ItemStack(Items.bone),
+ new ItemStack(Items.rotten_flesh), new ItemStack(Items.fermented_spider_eye),
+ new ItemStack(ConfigItems.itemZombieBrain), new ItemStack(ConfigItems.itemBathSalts) }));
+
+ ResearchRegistry.recipes.put("ItemKatana:inscription0",
+ ThaumcraftApi.addInfusionCraftingRecipe("INSCRIPTIONFIRE", new Object[]{ "inscription", new NBTTagInt(0) }, 8,
+ new AspectList().add(Aspect.FIRE, 64).add(Aspect.ENERGY, 64).add(Aspect.MAGIC, 16),
+ new ItemStack(ItemRegistry.ItemKatana, 1, 32767),
+ new ItemStack[]{ ItemApi.getItem("itemFocusFire", 0), new ItemStack(Items.coal),
+ new ItemStack(Blocks.netherrack), new ItemStack(Items.fire_charge),
+ new ItemStack(Items.blaze_powder), ItemApi.getItem("itemResource", 1) }));
+
+ ResearchRegistry.recipes.put("ItemKatana:inscription1", ThaumcraftApi.addInfusionCraftingRecipe("INSCRIPTIONTHUNDER",
+ new Object[]{ "inscription", new NBTTagInt(1) }, 8,
+ new AspectList().add(Aspect.AIR, 64).add(Aspect.MOTION, 64).add(Aspect.MAGIC, 16),
+ new ItemStack(ItemRegistry.ItemKatana, 1, 32767),
+ new ItemStack[]{ new ItemStack(ItemRegistry.ItemFocusShockwave), new ItemStack(ConfigItems.itemShard, 1, 0),
+ new ItemStack(Items.feather), new ItemStack(Blocks.tnt), new ItemStack(ConfigItems.itemShard, 1, 5),
+ new ItemStack(Items.gunpowder) }));
+
+ ResearchRegistry.recipes.put("ItemKatana:inscription2",
+ ThaumcraftApi.addInfusionCraftingRecipe("INSCRIPTIONUNDEAD", new Object[]{ "inscription", new NBTTagInt(2) }, 8,
+ new AspectList().add(Aspect.HEAL, 64).add(Aspect.UNDEAD, 64).add(Aspect.METAL, 16),
+ new ItemStack(ItemRegistry.ItemKatana, 1, 32767),
+ new ItemStack[]{ new ItemStack(ConfigItems.itemFocusPech), new ItemStack(Items.bone),
+ new ItemStack(Items.rotten_flesh), new ItemStack(Items.fermented_spider_eye),
+ new ItemStack(ConfigItems.itemZombieBrain), new ItemStack(ConfigItems.itemBathSalts) }));
+
+ ResearchRegistry.recipes.put("ItemVoidmetalGoggles",
+ ThaumcraftApi.addInfusionCraftingRecipe("VOIDGOGGLES", new ItemStack(ItemRegistry.ItemVoidmetalGoggles), 5,
+ new AspectList().add(Aspect.VOID, 40).add(Aspect.SENSES, 35).add(Aspect.ARMOR, 20),
+ new ItemStack(ItemRegistry.ItemWarpedGoggles, 1, 32767),
+ new ItemStack[]{ new ItemStack(ConfigItems.itemResource, 1, 16),
+ new ItemStack(ConfigItems.itemResource, 1, 16) }));
+
+ ResearchRegistry.recipes.put("ItemLumosRing", ThaumcraftApi.addInfusionCraftingRecipe("LUMOSRING",
+ new ItemStack(ItemRegistry.ItemLumosRing), 1,
+ new AspectList().add(Aspect.LIGHT, 35).add(Aspect.SENSES, 25).add(Aspect.AURA, 10),
+ new ItemStack(ConfigItems.itemBaubleBlanks, 1, 1),
+ new ItemStack[]{ new ItemStack(ItemRegistry.ItemFocusLumos), new ItemStack(ConfigItems.itemResource, 1, 6),
+ new ItemStack(Items.gold_ingot), new ItemStack(ConfigItems.itemResource, 1, 14),
+ new ItemStack(ConfigItems.itemResource, 1, 6), new ItemStack(Items.gold_ingot) }));
+ }
+
+ /**
+ * Arcane worktable recipes
+ */
+ public static void initArcane ()
+ {
+ ResearchRegistry.recipes.put("ItemMaterial:2",
+ ThaumcraftApi.addShapelessArcaneCraftingRecipe("CRIMSONROBES", new ItemStack(ItemRegistry.ItemMaterial, 1, 2),
+ new AspectList().add(Aspect.FIRE, 5).add(Aspect.ENTROPY, 5),
+ new Object[]{ new ItemStack(ItemRegistry.ItemCrimsonBlood), ItemApi.getItem("itemResource", 7),
+ new ItemStack(Items.gold_nugget) }));
+
+ ResearchRegistry.recipes.put("ItemMaterial:12",
+ ThaumcraftApi.addShapelessArcaneCraftingRecipe("WARPTREE", new ItemStack(ItemRegistry.ItemMaterial, 1, 12),
+ new AspectList().add(Aspect.ENTROPY, 150),
+ new Object[]{ new ItemStack(ConfigItems.itemZombieBrain),
+ new ItemStack(ItemRegistry.ItemMaterial, 1, 3),
+ new ItemStack(ConfigItems.itemWispEssence, 1, Short.MAX_VALUE) }));
+
+ ResearchRegistry.recipes.put("ItemMaterial:6",
+ ThaumcraftApi.addArcaneCraftingRecipe("THAUMICDISASSEMBLER", new ItemStack(ItemRegistry.ItemMaterial, 1, 6),
+ new AspectList().add(Aspect.ORDER, 50).add(Aspect.ENTROPY, 50),
+ new Object[]{ "BAB", "A A", "BAB", Character.valueOf('A'), ItemApi.getItem("itemResource", 2),
+ Character.valueOf('B'), ItemApi.getItem("itemResource", 16) }));
+
+ ResearchRegistry.recipes.put("ItemHelmetCultistRobe",
+ ThaumcraftApi.addArcaneCraftingRecipe("CRIMSONROBES", ItemApi.getItem("itemHelmetCultistRobe", 0),
+ new AspectList().add(Aspect.FIRE, 5).add(Aspect.ENTROPY, 5),
+ new Object[]{ "AAA", "A A", 'A', new ItemStack(ItemRegistry.ItemMaterial, 1, 2) }));
+
+ ResearchRegistry.recipes.put("ItemChestCultistRobe",
+ ThaumcraftApi.addArcaneCraftingRecipe("CRIMSONROBES", ItemApi.getItem("itemChestCultistRobe", 0),
+ new AspectList().add(Aspect.FIRE, 10).add(Aspect.ENTROPY, 10),
+ new Object[]{ "A A", "CAC", "ABA", 'A', new ItemStack(ItemRegistry.ItemMaterial, 1, 2), 'B',
+ new ItemStack(Items.gold_ingot), 'C', new ItemStack(Items.iron_ingot) }));
+
+ ResearchRegistry.recipes.put("ItemLegsCultistRobe",
+ ThaumcraftApi.addArcaneCraftingRecipe("CRIMSONROBES", ItemApi.getItem("itemLegsCultistRobe", 0),
+ new AspectList().add(Aspect.FIRE, 8).add(Aspect.ENTROPY, 8),
+ new Object[]{ "ABA", "ACA", "A A", Character.valueOf('A'),
+ new ItemStack(ItemRegistry.ItemMaterial, 1, 2), Character.valueOf('B'),
+ new ItemStack(Items.gold_ingot), Character.valueOf('C'), new ItemStack(Items.iron_ingot) }));
+
+ ResearchRegistry.recipes.put("ItemBootsCultist",
+ ThaumcraftApi.addArcaneCraftingRecipe("CRIMSONROBES", ItemApi.getItem("itemBootsCultist", 0),
+ new AspectList().add(Aspect.FIRE, 5).add(Aspect.ENTROPY, 5),
+ new Object[]{ "A A", "A A", Character.valueOf('A'), new ItemStack(ItemRegistry.ItemMaterial, 1, 2) }));
+
+ ResearchRegistry.recipes.put("ItemWandRod:1", ThaumcraftApi.addArcaneCraftingRecipe("ROD_warpwood_staff",
+ new ItemStack(ItemRegistry.ItemWandRod, 1, 1),
+ new AspectList().add(Aspect.ORDER, 120).add(Aspect.WATER, 120).add(Aspect.EARTH, 120).add(Aspect.AIR, 120)
+ .add(Aspect.FIRE, 120).add(Aspect.ENTROPY, 120),
+ new Object[]{ " A", " B ", "B ", Character.valueOf('A'), new ItemStack(ConfigItems.itemEldritchObject, 1, 3),
+ Character.valueOf('B'), new ItemStack(ItemRegistry.ItemWandRod, 1, 0) }));
+
+ ResearchRegistry.recipes.put("ItemHelmetCultistPlate",
+ ThaumcraftApi.addArcaneCraftingRecipe("KNIGHTROBES", ItemApi.getItem("itemHelmetCultistPlate", 0),
+ new AspectList().add(Aspect.EARTH, 5).add(Aspect.FIRE, 5).add(Aspect.ENTROPY, 5),
+ new Object[]{ "ABA", "C C", 'A', new ItemStack(ItemRegistry.ItemMaterial, 1, 7), 'B',
+ new ItemStack(Items.gold_ingot), 'C', new ItemStack(Items.iron_ingot) }));
+
+ ResearchRegistry.recipes.put("ItemChestCultistPlate",
+ ThaumcraftApi.addArcaneCraftingRecipe("KNIGHTROBES", ItemApi.getItem("itemChestCultistPlate", 0),
+ new AspectList().add(Aspect.EARTH, 10).add(Aspect.FIRE, 10).add(Aspect.ENTROPY, 10),
+ new Object[]{ "A A", "ABA", "BBB", 'A', new ItemStack(Items.iron_ingot), 'B',
+ new ItemStack(ItemRegistry.ItemMaterial, 1, 7) }));
+
+ ResearchRegistry.recipes.put("ItemLegsCultistPlate",
+ ThaumcraftApi.addArcaneCraftingRecipe("KNIGHTROBES", ItemApi.getItem("itemLegsCultistPlate", 0),
+ new AspectList().add(Aspect.EARTH, 8).add(Aspect.FIRE, 8).add(Aspect.ENTROPY, 8),
+ new Object[]{ "ABA", "ACA", " C ", 'A', new ItemStack(Items.iron_ingot), 'B',
+ new ItemStack(Items.gold_ingot), 'C', new ItemStack(ItemRegistry.ItemMaterial, 1, 7) }));
+
+ ResearchRegistry.recipes.put("ItemHelmetCultistLeaderPlate",
+ ThaumcraftApi.addArcaneCraftingRecipe("PRAETORARMOR", new ItemStack(ConfigItems.itemHelmetCultistLeaderPlate),
+ new AspectList().add(Aspect.ORDER, 15).add(Aspect.ENTROPY, 15).add(Aspect.FIRE, 15),
+ new Object[]{ "BCB", "DAD", "BCB", 'A', new ItemStack(ConfigItems.itemHelmetCultistPlate), 'B',
+ new ItemStack(Items.iron_ingot), 'C', new ItemStack(ItemRegistry.ItemMaterial, 1, 7), 'D',
+ new ItemStack(Items.gold_ingot) }));
+
+ ResearchRegistry.recipes.put("ItemChestCultistLeaderPlate",
+ ThaumcraftApi.addArcaneCraftingRecipe("PRAETORARMOR", new ItemStack(ConfigItems.itemChestCultistLeaderPlate),
+ new AspectList().add(Aspect.ORDER, 25).add(Aspect.ENTROPY, 25).add(Aspect.FIRE, 25),
+ new Object[]{ "BBB", "CAC", "CDC", 'A', new ItemStack(ConfigItems.itemChestCultistPlate), 'B',
+ new ItemStack(Items.iron_ingot), 'C', new ItemStack(ItemRegistry.ItemMaterial, 1, 7), 'D',
+ new ItemStack(Items.gold_ingot) }));
+
+ ResearchRegistry.recipes.put("ItemLegsCultistLeaderPlate",
+ ThaumcraftApi.addArcaneCraftingRecipe("PRAETORARMOR", new ItemStack(ConfigItems.itemLegsCultistLeaderPlate),
+ new AspectList().add(Aspect.ORDER, 20).add(Aspect.ENTROPY, 20).add(Aspect.FIRE, 20),
+ new Object[]{ "CDC", "BAB", "BCB", 'A', new ItemStack(ConfigItems.itemLegsCultistPlate), 'B',
+ new ItemStack(ItemRegistry.ItemMaterial, 1, 7), 'C', new ItemStack(Items.iron_ingot), 'D',
+ new ItemStack(Items.gold_ingot) }));
+
+ ResearchRegistry.recipes.put("ItemMaterial:1",
+ ThaumcraftApi.addArcaneCraftingRecipe("SHADOWCLOTH", new ItemStack(ItemRegistry.ItemMaterial, 1, 1),
+ new AspectList().add(Aspect.ORDER, 1).add(Aspect.WATER, 1).add(Aspect.EARTH, 1).add(Aspect.AIR, 1)
+ .add(Aspect.FIRE, 1).add(Aspect.ENTROPY, 1),
+ new Object[]{ "CAC", "ABA", "CAC", Character.valueOf('A'), new ItemStack(ItemRegistry.ItemMaterial),
+ Character.valueOf('B'), ItemApi.getItem("itemResource", 7), Character.valueOf('C'),
+ new ItemStack(ItemRegistry.ItemMaterial, 1, 8) }));
+
+ ResearchRegistry.recipes.put("ItemMagicFunguar",
+ ThaumcraftApi.addShapelessArcaneCraftingRecipe("MAGICFUNGUAR", new ItemStack(ItemRegistry.ItemMagicFunguar),
+ TaintedMagicHelper.getPrimals(1), new Object[]{ new ItemStack(ConfigBlocks.blockCustomPlant, 1, 5),
+ new ItemStack(ConfigItems.itemShard, 1, 32767), Items.glowstone_dust }));
+
+ ResearchRegistry.recipes.put("ItemHollowDagger", ThaumcraftApi.addArcaneCraftingRecipe("HOLLOWDAGGER",
+ new ItemStack(ItemRegistry.ItemHollowDagger), new AspectList().add(Aspect.ENTROPY, 85),
+ new Object[]{ " A", "EBD", "C ", Character.valueOf('A'), new ItemStack(ConfigItems.itemWandRod, 1, 7),
+ Character.valueOf('B'), new ItemStack(ConfigBlocks.blockMagicalLog, 1, 0), Character.valueOf('C'),
+ Items.stick, Character.valueOf('D'), ConfigItems.itemNugget, Character.valueOf('E'), Items.string }));
+
+ ResearchRegistry.recipes.put("ItemWandCap:1",
+ ThaumcraftApi.addArcaneCraftingRecipe(
+ "CAP_cloth", new ItemStack(ItemRegistry.ItemWandCap, 1, 1), new AspectList().add(Aspect.EARTH, 10)
+ .add(Aspect.FIRE, 10).add(Aspect.ENTROPY, 10).add(Aspect.ORDER, 10),
+ new Object[]{ "AAA", "A A", Character.valueOf('A'), ItemApi.getItem("itemResource", 7) }));
+
+ ResearchRegistry.recipes.put("ItemWandCap:2",
+ ThaumcraftApi.addArcaneCraftingRecipe("CAP_crimsoncloth", new ItemStack(ItemRegistry.ItemWandCap, 1, 2),
+ new AspectList().add(Aspect.FIRE, 25).add(Aspect.ENTROPY, 25).add(Aspect.ORDER, 25),
+ new Object[]{ "AAA", "ABA", Character.valueOf('A'), new ItemStack(ItemRegistry.ItemMaterial, 1, 2),
+ Character.valueOf('B'), ItemApi.getItem("itemResource", 14) }));
+
+ ResearchRegistry.recipes.put("ItemWandCap:3",
+ ThaumcraftApi.addArcaneCraftingRecipe("CAP_shadowcloth", new ItemStack(ItemRegistry.ItemWandCap, 1, 3),
+ new AspectList().add(Aspect.EARTH, 55).add(Aspect.FIRE, 55).add(Aspect.ENTROPY, 55).add(Aspect.ORDER,
+ 55),
+ new Object[]{ "AAA", "ABA", Character.valueOf('A'), new ItemStack(ItemRegistry.ItemMaterial, 1, 1),
+ Character.valueOf('B'), ItemApi.getItem("itemResource", 14) }));
+
+ ResearchRegistry.recipes.put("ItemFocusVisShard",
+ ThaumcraftApi.addArcaneCraftingRecipe("FOCUSSHARD", new ItemStack(ItemRegistry.ItemFocusVisShard),
+ new AspectList().add(Aspect.AIR, 46).add(Aspect.ENTROPY, 38).add(Aspect.ORDER, 22),
+ new Object[]{ "BDC", "DAD", "CDB", 'A', new ItemStack(ConfigItems.itemResource, 1, 3), 'B',
+ new ItemStack(ConfigItems.itemShard, 1, 6), 'C', new ItemStack(ItemRegistry.ItemMaterial, 1, 4),
+ 'D', new ItemStack(ConfigItems.itemWispEssence, 1, 32767) }));
+
+ ResearchRegistry.recipes.put("ItemFocusLumos",
+ ThaumcraftApi.addArcaneCraftingRecipe("FOCUSLUMOS", new ItemStack(ItemRegistry.ItemFocusLumos),
+ new AspectList().add(Aspect.AIR, 52).add(Aspect.FIRE, 56).add(Aspect.ORDER, 28),
+ new Object[]{ "BDC", "DAD", "CDB", 'A', new ItemStack(ConfigItems.itemResource, 1, 3), 'B',
+ new ItemStack(ConfigItems.itemResource, 1, 1), 'C', new ItemStack(ConfigItems.itemShard, 1, 6),
+ 'D', new ItemStack(Items.glowstone_dust) }));
+
+ ResearchRegistry.recipes.put("ItemMaterial:9",
+ ThaumcraftApi.addShapelessArcaneCraftingRecipe("BREAKPEARL", new ItemStack(ItemRegistry.ItemMaterial, 3, 9),
+ new AspectList().add(Aspect.ENTROPY, 25), new ItemStack(ConfigItems.itemEldritchObject, 1, 3)));
+
+ ResearchRegistry.recipes.put("ItemMaterial:10",
+ ThaumcraftApi.addShapelessArcaneCraftingRecipe("BREAKPEARL", new ItemStack(ItemRegistry.ItemMaterial, 3, 10),
+ new AspectList().add(Aspect.ENTROPY, 15), new ItemStack(ItemRegistry.ItemMaterial, 1, 9)));
+
+ ResearchRegistry.recipes.put("ItemMaterial:11",
+ ThaumcraftApi.addShapelessArcaneCraftingRecipe("CREATIONSHARD", new ItemStack(ItemRegistry.ItemMaterial, 9, 11),
+ new AspectList().add(Aspect.ENTROPY, 99), new ItemStack(ItemRegistry.ItemMaterial, 1, 5)));
+
+ ResearchRegistry.recipes.put("ItemVoidsentBlood", ThaumcraftApi.addArcaneCraftingRecipe("VOIDSENTBLOOD",
+ new ItemStack(ItemRegistry.ItemVoidsentBlood), new AspectList().add(Aspect.ORDER, 35).add(Aspect.ENTROPY, 25),
+ new Object[]{ "BDB", "CAC", "BCB", 'A', new ItemStack(ItemRegistry.ItemCrimsonBlood), 'B',
+ new ItemStack(ConfigItems.itemResource, 1, 17), 'C', new ItemStack(ConfigItems.itemResource, 1, 14),
+ 'D', new ItemStack(ItemRegistry.ItemMaterial, 1, 10) }));
+ }
+
+ public static void initCrucible ()
+ {
+ ResearchRegistry.recipes.put("ItemMaterial:3",
+ ThaumcraftApi.addCrucibleRecipe("UNBALANCEDSHARDS", new ItemStack(ItemRegistry.ItemMaterial, 1, 3),
+ ItemApi.getItem("itemShard", 6), new AspectList().merge(Aspect.ELDRITCH, 4)));
+ ResearchRegistry.recipes.put("ItemMaterial:4",
+ ThaumcraftApi.addCrucibleRecipe("UNBALANCEDSHARDS", new ItemStack(ItemRegistry.ItemMaterial, 1, 4),
+ ItemApi.getItem("itemShard", 6), new AspectList().merge(Aspect.TAINT, 4)));
+ ResearchRegistry.recipes.put("BlockShadowOre",
+ ThaumcraftApi.addCrucibleRecipe("SHADOWMETAL", new ItemStack(BlockRegistry.BlockShadowOre),
+ new ItemStack(Blocks.stone),
+ new AspectList().merge(Aspect.DARKNESS, 2).merge(Aspect.METAL, 5).merge(Aspect.MAGIC, 1)));
+ ResearchRegistry.recipes.put("Vishroom_brown",
+ ThaumcraftApi.addCrucibleRecipe("VISHROOMCRAFT", new ItemStack(ConfigBlocks.blockCustomPlant, 1, 5),
+ new ItemStack(Blocks.brown_mushroom), new AspectList().merge(Aspect.MAGIC, 3).merge(Aspect.POISON, 1)));
+ ResearchRegistry.recipes.put("Vishroom_red",
+ ThaumcraftApi.addCrucibleRecipe("VISHROOMCRAFT", new ItemStack(ConfigBlocks.blockCustomPlant, 1, 5),
+ new ItemStack(Blocks.red_mushroom), new AspectList().merge(Aspect.MAGIC, 3).merge(Aspect.POISON, 1)));
+ }
}
\ No newline at end of file
diff --git a/src/main/java/taintedmagic/common/registry/ResearchRegistry.java b/src/main/java/taintedmagic/common/registry/ResearchRegistry.java
index 13482d4..4d11062 100644
--- a/src/main/java/taintedmagic/common/registry/ResearchRegistry.java
+++ b/src/main/java/taintedmagic/common/registry/ResearchRegistry.java
@@ -7,7 +7,7 @@ import net.minecraft.item.crafting.IRecipe;
import net.minecraft.util.ResourceLocation;
import taintedmagic.common.TaintedMagic;
import taintedmagic.common.helper.TaintedMagicHelper;
-import taintedmagic.common.research.TaintedMagicResearchItem;
+import taintedmagic.common.research.TMResearchItem;
import taintedmagic.common.research.ThaumcraftResearchItem;
import thaumcraft.api.ItemApi;
import thaumcraft.api.ThaumcraftApi;
@@ -17,257 +17,361 @@ import thaumcraft.api.crafting.CrucibleRecipe;
import thaumcraft.api.crafting.IArcaneRecipe;
import thaumcraft.api.crafting.InfusionRecipe;
import thaumcraft.api.research.ResearchCategories;
+import thaumcraft.api.research.ResearchItem;
import thaumcraft.api.research.ResearchPage;
import thaumcraft.common.config.ConfigBlocks;
import thaumcraft.common.config.ConfigItems;
public class ResearchRegistry
{
- public static final String TM = "TM";
- public static HashMap recipes = new HashMap();
+ public static final String categoryTM = "TAINTEDMAGIC";
+ public static HashMap recipes = new HashMap();
- public static void initResearch ()
- {
- ResearchCategories.registerCategory(TM, new ResourceLocation("taintedmagic:textures/misc/IconThaumonomiconTab.png"), TaintedMagic.configHandler.useCustomResearchTabBackground
- ? new ResourceLocation("taintedmagic:textures/gui/GUIThaumonomiconTab.png")
- : new ResourceLocation("thaumcraft:textures/gui/gui_researchback.png"));
+ public static void initResearch ()
+ {
+ ResearchCategories.registerCategory(categoryTM, new ResourceLocation("taintedmagic:textures/misc/tab_tm.png"),
+ TaintedMagic.configHandler.CUSTOM_RESEARCH_TAB_BACK
+ ? new ResourceLocation("taintedmagic:textures/gui/gui_tm_researchback.png")
+ : new ResourceLocation("thaumcraft:textures/gui/gui_researchback.png"));
- /**
- * Thaumcraft research items
- */
- new ThaumcraftResearchItem("TMELDRITCHMAJOR", TM, "ELDRITCHMAJOR", "ELDRITCH", 7, -7, new ResourceLocation("thaumcraft:textures/misc/r_eldritchmajor.png")).setSpecial().setConcealed()
- .setRound().registerResearchItem();
- new ThaumcraftResearchItem("TMFOCUSFIRE", TM, "FOCUSFIRE", "THAUMATURGY", 7, 3, new ItemStack(ConfigItems.itemFocusFire)).setConcealed().registerResearchItem();
- new ThaumcraftResearchItem("TMARMORFORTRESS", TM, "ARMORFORTRESS", "ARTIFICE", 11, 3, new ItemStack(ConfigItems.itemHelmetFortress)).setConcealed().registerResearchItem();
+ ResearchItem r;
- /**
- * Tainted Magic research items
- */
- new TaintedMagicResearchItem("TAINTEDMAGIC", TM, new AspectList(), 2, -1, 0, new ItemStack(ConfigItems.itemResource, 1, 13)).setRound().setAutoUnlock()
- .setPages(new ResearchPage[]{ new ResearchPage("1"), new ResearchPage("2") }).registerResearchItem();
+ /**
+ * Copied Thaumcraft research
+ */
+ r = new ThaumcraftResearchItem("TMELDRITCHMAJOR", "ELDRITCHMAJOR", "ELDRITCH", 7, -7,
+ new ResourceLocation("thaumcraft:textures/misc/r_eldritchmajor.png"));
+ r.setSpecial().setConcealed().setRound().registerResearchItem();
- new TaintedMagicResearchItem("SHADOWMETAL", TM, new AspectList().add(Aspect.METAL, 1).add(Aspect.DARKNESS, 1).add(Aspect.MAGIC, 1), 0, 1, 0, new ItemStack(BlockRegistry.BlockShadowOre))
- .setParents("TAINTEDMAGIC").setConcealed()
- .setPages(new ResearchPage[]{ new ResearchPage("1"), new ResearchPage((CrucibleRecipe) recipes.get("BlockShadowOre")), new ResearchPage(new ItemStack(BlockRegistry.BlockShadowOre)),
- new ResearchPage((IRecipe) recipes.get("ItemShadowmetalPick")), new ResearchPage((IRecipe) recipes.get("ItemShadowmetalSpade")),
- new ResearchPage((IRecipe) recipes.get("ItemShadowmetalAxe")), new ResearchPage((IRecipe) recipes.get("ItemShadowmetalHoe")),
- new ResearchPage((IRecipe) recipes.get("ItemShadowmetalSword")) })
- .registerResearchItem();
+ r = new ThaumcraftResearchItem("TMFOCUSFIRE", "FOCUSFIRE", "THAUMATURGY", 7, 3,
+ new ItemStack(ConfigItems.itemFocusFire));
+ r.setConcealed().registerResearchItem();
- new TaintedMagicResearchItem("CAP_shadowmetal", TM, new AspectList().add(Aspect.METAL, 4).add(Aspect.DARKNESS, 4).add(Aspect.ELDRITCH, 4).add(Aspect.MAGIC, 4), -3, 2, 0,
- new ItemStack(ItemRegistry.ItemWandCap, 1, 0)).setParents(new String[]{ "SHADOWMETAL", "CAP_void", "PRIMPEARL" }).setComplexity(2).setParentsHidden("SHADOWCLOTH")
- .setPages(new ResearchPage[]{ new ResearchPage("1"), new ResearchPage((InfusionRecipe) recipes.get("ItemWandCap:0")) }).setConcealed().registerResearchItem();
- ThaumcraftApi.addWarpToResearch("CAP_shadowmetal", 4);
+ r = new ThaumcraftResearchItem("TMARMORFORTRESS", "ARMORFORTRESS", "ARTIFICE", 11, 2,
+ new ItemStack(ConfigItems.itemHelmetFortress));
+ r.setConcealed().registerResearchItem();
- new TaintedMagicResearchItem("SHADOWCLOTH", TM, new AspectList().add(Aspect.CLOTH, 1).add(Aspect.DARKNESS, 1), -1, 4, 0, new ItemStack(ItemRegistry.ItemMaterial, 1, 1)).setConcealed()
- .setSecondary().setParents(new String[]{ "ENCHFABRIC", "SHADOWMETAL" })
- .setPages(new ResearchPage[]{ new ResearchPage("1"), new ResearchPage((IArcaneRecipe) recipes.get("ItemMaterial:1")) }).registerResearchItem();
+ /**
+ * Tainted Magic research
+ */
+ r = new TMResearchItem("TAINTEDMAGIC", new AspectList(), 2, -1, new ItemStack(ConfigItems.itemResource, 1, 13), 0, 0);
+ r.setPages(new ResearchPage("1"), new ResearchPage("2"));
+ r.setRound().setAutoUnlock().registerResearchItem();
- new TaintedMagicResearchItem("ROD_warpwood", TM, new AspectList().add(Aspect.TREE, 4).add(Aspect.DARKNESS, 4).add(Aspect.ELDRITCH, 4), 8, 0, 0, new ItemStack(ItemRegistry.ItemWandRod, 1, 0))
- .setParents(new String[]{ "WARPTREE", "VOIDMETAL", "PRIMPEARL", "ROD_primal_staff" }).setParentsHidden("SHADOWMETAL").setConcealed().setComplexity(3)
- .setPages(new ResearchPage[]{ new ResearchPage("1"), new ResearchPage((InfusionRecipe) recipes.get("ItemWandRod:0")), new ResearchPage("2") }).registerResearchItem();
- ThaumcraftApi.addWarpToResearch("ROD_warpwood", 5);
+ r = new TMResearchItem("SHADOWMETAL",
+ new AspectList().add(Aspect.METAL, 1).add(Aspect.DARKNESS, 1).add(Aspect.MAGIC, 1), 0, 1,
+ new ItemStack(BlockRegistry.BlockShadowOre), 0, 1);
+ r.setPages(new ResearchPage("1"), cruciblePage("BlockShadowOre"),
+ new ResearchPage(new ItemStack(BlockRegistry.BlockShadowOre)), recipePage("ItemShadowmetalPick"),
+ recipePage("ItemShadowmetalSpade"), recipePage("ItemShadowmetalAxe"), recipePage("ItemShadowmetalHoe"),
+ recipePage("ItemShadowmetalSword"));
+ r.setParents("TAINTEDMAGIC").setConcealed().registerResearchItem();
- new TaintedMagicResearchItem("ROD_warpwood_staff", TM, new AspectList().add(Aspect.TREE, 4).add(Aspect.DARKNESS, 4).add(Aspect.ELDRITCH, 4), 10, -1, 0,
- new ItemStack(ItemRegistry.ItemWandRod, 1, 1)).setConcealed().setParents("ROD_warpwood")
- .setPages(new ResearchPage[]{ new ResearchPage("1"), new ResearchPage((IArcaneRecipe) recipes.get("ItemWandRod:1")) }).setSecondary().registerResearchItem();
+ r = new TMResearchItem("CAP_shadowmetal",
+ new AspectList().add(Aspect.METAL, 4).add(Aspect.DARKNESS, 4).add(Aspect.ELDRITCH, 4).add(Aspect.MAGIC, 4), -3,
+ 2, new ItemStack(ItemRegistry.ItemWandCap, 1, 0), 2, 4);
+ r.setPages(new ResearchPage("1"), infusionPage("ItemWandCap:0"));
+ r.setParents("SHADOWMETAL", "CAP_void", "PRIMPEARL").setParentsHidden("SHADOWCLOTH").setConcealed()
+ .registerResearchItem();
- new TaintedMagicResearchItem("EVILSHARDS", TM, new AspectList().add(Aspect.CRYSTAL, 4).add(Aspect.DARKNESS, 4), 4, -1, 0, new ItemStack(ItemRegistry.ItemMaterial, 1, 4))
- .setParents("TAINTEDMAGIC").setConcealed().setSecondary().setPages(new ResearchPage[]{ new ResearchPage("1"), new ResearchPage((CrucibleRecipe) recipes.get("ItemMaterial:3")),
- new ResearchPage((CrucibleRecipe) recipes.get("ItemMaterial:4")) })
- .registerResearchItem();
+ r = new TMResearchItem("SHADOWCLOTH", new AspectList().add(Aspect.CLOTH, 1).add(Aspect.DARKNESS, 1), -2, 4,
+ new ItemStack(ItemRegistry.ItemMaterial, 1, 1), 0, 0);
+ r.setPages(new ResearchPage("1"), arcanePage("ItemMaterial:1"));
+ r.setConcealed().setSecondary().setParents("ENCHFABRIC", "SHADOWMETAL").registerResearchItem();
- new TaintedMagicResearchItem("WARPTREE", TM, new AspectList().add(Aspect.ELDRITCH, 4).add(Aspect.DARKNESS, 4).add(Aspect.TAINT, 4).add(Aspect.TREE, 4), 6, -2, 0,
- new ItemStack(BlockRegistry.BlockWarpwoodSapling)).setParentsHidden("SHADOWMETAL").setParents("EVILSHARDS").setConcealed()
- .setPages(new ResearchPage[]{ new ResearchPage("1"), new ResearchPage((InfusionRecipe) recipes.get("BlockWarpwoodSapling")),
- new ResearchPage((IRecipe) recipes.get("BlockWarpwoodPlanks")) })
- .registerResearchItem();
+ r = new TMResearchItem("ROD_warpwood",
+ new AspectList().add(Aspect.TREE, 4).add(Aspect.DARKNESS, 4).add(Aspect.ELDRITCH, 4), 8, 0,
+ new ItemStack(ItemRegistry.ItemWandRod, 1, 0), 3, 5);
+ r.setPages(new ResearchPage("1"), infusionPage("ItemWandRod:0"), new ResearchPage("2"));
+ r.setParents("WARPTREE", "VOIDMETAL", "PRIMPEARL", "ROD_primal_staff").setParentsHidden("SHADOWMETAL").setConcealed()
+ .registerResearchItem();
- 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();
+ r = new TMResearchItem("ROD_warpwood_staff",
+ new AspectList().add(Aspect.TREE, 4).add(Aspect.DARKNESS, 4).add(Aspect.ELDRITCH, 4), 10, -1,
+ new ItemStack(ItemRegistry.ItemWandRod, 1, 1), 2, 0);
+ r.setPages(new ResearchPage("1"), arcanePage("ItemWandRod:1"));
+ r.setConcealed().setParents("ROD_warpwood").setSecondary().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);
+ r = new TMResearchItem("UNBALANCEDSHARDS", new AspectList().add(Aspect.CRYSTAL, 4).add(Aspect.DARKNESS, 4), 4, -1,
+ new ItemStack(ItemRegistry.ItemMaterial, 1, 4), 0, 1);
+ r.setPages(new ResearchPage("1"), cruciblePage("ItemMaterial:3"), cruciblePage("ItemMaterial:4"));
+ r.setParents("TAINTEDMAGIC").setConcealed().setSecondary().registerResearchItem();
- 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();
+ r = new TMResearchItem("WARPTREE", new AspectList().add(Aspect.MAGIC, 4).add(Aspect.DARKNESS, 4).add(Aspect.TREE, 4), 6,
+ -2, new ItemStack(ItemRegistry.ItemMaterial, 1, 12), 3, 2);
+ r.setPages(new ResearchPage("1"), arcanePage("ItemMaterial:12"), recipePage("BlockWarpwoodPlanks"));
+ r.setParents("UNBALANCEDSHARDS").setConcealed().registerResearchItem();
- new TaintedMagicResearchItem("ELDRITCHFOCUS", TM, new AspectList().add(Aspect.ELDRITCH, 22).add(Aspect.ENTROPY, 14).add(Aspect.AIR, 4).add(Aspect.DARKNESS, 6), 7, 7, 0,
- new ItemStack(ItemRegistry.ItemFocusDarkMatter)).setParentsHidden(new String[]{ "OUTERREV" })
- .setParents(new String[]{ "TMFOCUSFIRE", "TAINTFOCUS", "FOCUSSHARD", "FOCUSLUMOS", "MACEFOCUS", "FOCUSSHOCKWAVE" }).setConcealed().setSecondary()
- .setPages(new ResearchPage[]{ new ResearchPage("1"), new ResearchPage((InfusionRecipe) recipes.get("ItemFocusDarkMatter")) }).registerResearchItem();
- ThaumcraftApi.addWarpToResearch("ELDRITCHFOCUS", 7);
+ r = new TMResearchItem("CRIMSONROBES",
+ new AspectList().add(Aspect.CLOTH, 4).add(Aspect.EXCHANGE, 4).add(Aspect.ARMOR, 4), -2, -1,
+ new ItemStack(ItemRegistry.ItemMaterial, 1, 2), 2, 0);
+ r.setPages(new ResearchPage("1"), arcanePage("ItemMaterial:2"), arcanePage("ItemHelmetCultistRobe"),
+ arcanePage("ItemChestCultistRobe"), arcanePage("ItemLegsCultistRobe"), arcanePage("ItemBootsCultist"));
+ r.setParents("HOLLOWDAGGER").setConcealed().registerResearchItem();
- new TaintedMagicResearchItem("KNIGHTROBES", TM, new AspectList().add(Aspect.CLOTH, 4).add(Aspect.DARKNESS, 4).add(Aspect.ARMOR, 4), -4, -2, 0, new ItemStack(ItemRegistry.ItemMaterial, 1, 8))
- .setParentsHidden("ELDRITCHMINOR").setParents("CRIMSONROBES").setConcealed()
- .setPages(new ResearchPage[]{ new ResearchPage("1"), new ResearchPage((InfusionRecipe) recipes.get("ItemMaterial:8")),
- new ResearchPage((IArcaneRecipe) recipes.get("ItemHelmetCultistPlate")), new ResearchPage((IArcaneRecipe) recipes.get("ItemChestCultistPlate")),
- new ResearchPage((IArcaneRecipe) recipes.get("ItemLegsCultistPlate")) })
- .registerResearchItem();
+ r = new TMResearchItem("VOIDFORTRESS",
+ new AspectList().add(Aspect.ARMOR, 5).add(Aspect.ELDRITCH, 3).add(Aspect.DARKNESS, 3).add(Aspect.VOID, 5), 8,
+ -9, new ItemStack(ItemRegistry.ItemVoidFortressHelmet), 2, 2);
+ r.setPages(new ResearchPage("1"), infusionPage("ItemVoidFortressHelmet"), infusionPage("ItemVoidFortressChestplate"),
+ infusionPage("ItemVoidFortressLeggings"));
+ r.setParentsHidden("ARMORVOIDFORTRESS", "ARMORFORTRESS").setParents("TMELDRITCHMAJOR").setConcealed()
+ .registerResearchItem();
- new TaintedMagicResearchItem("PRAETORARMOR", TM, new AspectList().add(Aspect.CLOTH, 4).add(Aspect.DARKNESS, 4).add(Aspect.ARMOR, 4).add(Aspect.ELDRITCH, 4), -6, 0, 0,
- ItemApi.getItem("itemHelmetCultistLeaderPlate", 0))
- .setParents("KNIGHTROBES").setParentsHidden(new String[]{ "CRIMSONROBES", "TMELDRITCHMAJOR", "VOIDMETAL" })
- .setPages(new ResearchPage[]{ new ResearchPage("1"), new ResearchPage((IArcaneRecipe) recipes.get("ItemHelmetCultistLeaderPlate")),
- new ResearchPage((IArcaneRecipe) recipes.get("ItemChestCultistLeaderPlate")), new ResearchPage((IArcaneRecipe) recipes.get("ItemLegsCultistLeaderPlate")) })
- .setConcealed().registerResearchItem();
+ r = new TMResearchItem("WARPEDGOGGLES",
+ new AspectList().add(Aspect.ARMOR, 4).add(Aspect.ELDRITCH, 4).add(Aspect.DARKNESS, 4).add(Aspect.ARMOR, 4), 2,
+ 4, new ItemStack(ItemRegistry.ItemWarpedGoggles), 1, 0);
+ r.setPages(new ResearchPage("1"), infusionPage("ItemWarpedGoggles"));
+ r.setParentsHidden("TAINTEDMAGIC", "GOGGLES").setConcealed().setSecondary().setParents("SHADOWMETAL")
+ .registerResearchItem();
- new TaintedMagicResearchItem("VOIDSENTBLOOD", TM, new AspectList().add(Aspect.VOID, 14).add(Aspect.DARKNESS, 8).add(Aspect.ARMOR, 18).add(Aspect.AURA, 4), -2, -5, 0,
- new ItemStack(ItemRegistry.ItemVoidsentBlood)).setSecondary().setParents("CRYSTALDAGGER").setParentsHidden("ELDRITCHMAJOR", "PRIMPEARL")
- .setPages(new ResearchPage[]{ new ResearchPage("1"), new ResearchPage((IArcaneRecipe) recipes.get("ItemVoidsentBlood")) }).setConcealed().registerResearchItem();
- ThaumcraftApi.addWarpToResearch("VOIDSENTBLOOD", 1);
+ r = new TMResearchItem("KNIGHTROBES",
+ new AspectList().add(Aspect.CLOTH, 4).add(Aspect.DARKNESS, 4).add(Aspect.ARMOR, 4), -4, -2,
+ new ItemStack(ItemRegistry.ItemMaterial, 1, 7), 2, 0);
+ r.setPages(new ResearchPage("1"), infusionPage("ItemMaterial:7"), arcanePage("ItemHelmetCultistPlate"),
+ arcanePage("ItemChestCultistPlate"), arcanePage("ItemLegsCultistPlate"));
+ r.setParentsHidden("ELDRITCHMINOR").setParents("CRIMSONROBES").setConcealed().registerResearchItem();
- new TaintedMagicResearchItem("VOIDWALKERBOOTS", TM, new AspectList().add(Aspect.MAGIC, 4).add(Aspect.DARKNESS, 8).add(Aspect.ARMOR, 8).add(Aspect.ELDRITCH, 8), 5, -5, 0,
- new ItemStack(ItemRegistry.ItemVoidwalkerBoots)).setParentsHidden(new String[]{ "PRIMPEARL", "BOOTSTRAVELLER", "SHADOWCLOTH", "ARMORVOIDFORTRESS" }).setConcealed()
- .setParents(new String[]{ "TMELDRITCHMAJOR" }).setPages(new ResearchPage[]{ new ResearchPage("1"), new ResearchPage((InfusionRecipe) recipes.get("ItemVoidwalkerBoots")) })
- .registerResearchItem();
+ r = new TMResearchItem("PRAETORARMOR",
+ new AspectList().add(Aspect.CLOTH, 4).add(Aspect.DARKNESS, 4).add(Aspect.ARMOR, 4).add(Aspect.ELDRITCH, 4), -6,
+ 0, ItemApi.getItem("itemHelmetCultistLeaderPlate", 0), 2, 0);
+ r.setPages(new ResearchPage("1"), arcanePage("ItemHelmetCultistLeaderPlate"), arcanePage("ItemChestCultistLeaderPlate"),
+ arcanePage("ItemLegsCultistLeaderPlate"));
+ r.setParents("KNIGHTROBES").setParentsHidden("CRIMSONROBES", "TMELDRITCHMAJOR", "VOIDMETAL").setConcealed()
+ .registerResearchItem();
- new TaintedMagicResearchItem("CREATIONSHARD", TM, TaintedMagicHelper.getPrimals(16), 9, -7, 0, new ItemStack(ItemRegistry.ItemMaterial, 1, 5)).setConcealed().setParents("TMELDRITCHMAJOR")
- .setParentsHidden("PRIMPEARL").setPages(new ResearchPage[]{ new ResearchPage("1"), new ResearchPage((InfusionRecipe) recipes.get("ItemMaterial:5")),
- new ResearchPage((IArcaneRecipe) recipes.get("ItemMaterial:12")) })
- .setSecondary().registerResearchItem();
- ThaumcraftApi.addWarpToResearch("CREATIONSHARD", 9);
+ r = new TMResearchItem("VOIDSENTBLOOD",
+ new AspectList().add(Aspect.VOID, 14).add(Aspect.DARKNESS, 8).add(Aspect.ARMOR, 18).add(Aspect.AURA, 4), -2, -5,
+ new ItemStack(ItemRegistry.ItemVoidsentBlood), 0, 3);
+ r.setPages(new ResearchPage("1"), arcanePage("ItemVoidsentBlood"));
+ r.setSecondary().setParents("HOLLOWDAGGER").setParentsHidden("ELDRITCHMAJOR", "PRIMPEARL").setConcealed()
+ .registerResearchItem();
- new TaintedMagicResearchItem("CREATION", TM, new AspectList().add(Aspect.MAGIC, 4), 11, -5, 0, new ResourceLocation("taintedmagic:textures/misc/IconCREATION.png")).setParents("CREATIONSHARD")
- .setConcealed().setRound().setSpecial().setHidden()
- .setPages(new ResearchPage[]{ new ResearchPage("1"), new ResearchPage("2"), new ResearchPage("3"), new ResearchPage("4"), new ResearchPage("5") }).registerResearchItem();
+ r = new TMResearchItem("VOIDWALKERBOOTS",
+ new AspectList().add(Aspect.MAGIC, 4).add(Aspect.DARKNESS, 8).add(Aspect.ARMOR, 8).add(Aspect.ELDRITCH, 8), 5,
+ -5, new ItemStack(ItemRegistry.ItemVoidwalkerBoots), 3, 4);
+ r.setPages(new ResearchPage("1"), infusionPage("ItemVoidwalkerBoots"));
+ r.setParentsHidden("PRIMPEARL", "BOOTSTRAVELLER", "SHADOWCLOTH", "ARMORVOIDFORTRESS").setConcealed()
+ .setParents("TMELDRITCHMAJOR").registerResearchItem();
- new TaintedMagicResearchItem("SKYSALT", TM, new AspectList().add(TaintedMagicHelper.getPrimals(4)).add(Aspect.WEATHER, 4), 12, -7, 0, new ItemStack(ItemRegistry.ItemSalis, 1, 0))
- .setConcealed().setParents("CREATION").setComplexity(3).setPages(new ResearchPage[]{ new ResearchPage("1"), new ResearchPage((InfusionRecipe) recipes.get("ItemSalis:0")) })
- .setSecondary().registerResearchItem();
+ r = new TMResearchItem("BREAKPEARL", TaintedMagicHelper.getPrimals(4).add(Aspect.ENTROPY, 12), 8, -6,
+ new ItemStack(ItemRegistry.ItemMaterial, 1, 9), 0, 0);
+ r.setPages(new ResearchPage("1"), arcanePage("ItemMaterial:9"), arcanePage("ItemMaterial:10"));
+ r.setConcealed().setParents("PRIMPEARL").setSecondary().registerResearchItem();
- new TaintedMagicResearchItem("TIMESALT", TM, new AspectList().add(TaintedMagicHelper.getPrimals(4)).add(Aspect.EXCHANGE, 4), 13, -6, 0, new ItemStack(ItemRegistry.ItemSalis, 1, 1))
- .setConcealed().setParents("CREATION").setComplexity(3).setPages(new ResearchPage[]{ new ResearchPage("1"), new ResearchPage((InfusionRecipe) recipes.get("ItemSalis:1")) })
- .setSecondary().registerResearchItem();
+ r = new TMResearchItem("CREATIONSHARD", TaintedMagicHelper.getPrimals(16), 9, -7,
+ new ItemStack(ItemRegistry.ItemMaterial, 1, 5), 3, 9);
+ r.setPages(new ResearchPage("1"), infusionPage("ItemMaterial:5"), arcanePage("ItemMaterial:11"));
+ r.setConcealed().setParents("TMELDRITCHMAJOR").setParentsHidden("PRIMPEARL").setSpecial().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();
+ r = new TMResearchItem("CREATION", new AspectList(), 11, -5,
+ new ResourceLocation("taintedmagic:textures/misc/r_creation.png"), 0, 0);
+ r.setPages(new ResearchPage("1"), new ResearchPage("2"), new ResearchPage("3"), new ResearchPage("4"),
+ new ResearchPage("5"));
+ r.setParents("CREATIONSHARD").setConcealed().setRound().setSpecial().setHidden().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);
+ r = new TMResearchItem("SKYSALT", new AspectList().add(TaintedMagicHelper.getPrimals(4)).add(Aspect.WEATHER, 4), 12, -7,
+ new ItemStack(ItemRegistry.ItemSalis, 1, 0), 0, 0);
+ r.setPages(new ResearchPage("1"), infusionPage("ItemSalis:0"));
+ r.setConcealed().setParents("CREATION").setSecondary().registerResearchItem();
- new TaintedMagicResearchItem("MAGICFUNGUAR", TM, new AspectList().add(Aspect.MAGIC, 2).add(Aspect.HUNGER, 4).add(Aspect.PLANT, 2), 2, -4, 0, new ItemStack(ItemRegistry.ItemMagicFunguar))
- .setSecondary().setPages(new ResearchPage[]{ new ResearchPage("1"), new ResearchPage((IArcaneRecipe) recipes.get("ItemMagicFunguar")) }).setParents("VISHROOMCRAFT").setConcealed()
- .registerResearchItem();
+ r = new TMResearchItem("TIMESALT", new AspectList().add(TaintedMagicHelper.getPrimals(4)).add(Aspect.EXCHANGE, 4), 13,
+ -6, new ItemStack(ItemRegistry.ItemSalis, 1, 1), 0, 0);
+ r.setConcealed().setParents("CREATION").setSecondary().registerResearchItem();
+ r.setPages(new ResearchPage("1"), infusionPage("ItemSalis:1"));
- new TaintedMagicResearchItem("VISHROOMCRAFT", TM, new AspectList().add(Aspect.MAGIC, 4).add(Aspect.CRAFT, 2).add(Aspect.PLANT, 3), 3, -3, 0,
- new ItemStack(ConfigBlocks.blockCustomPlant, 1, 5)).setSecondary()
- .setPages(new ResearchPage[]{ new ResearchPage("1"), new ResearchPage((CrucibleRecipe) recipes.get("Vishroom_red")),
- new ResearchPage((CrucibleRecipe) recipes.get("Vishroom_brown")) })
- .setConcealed().registerResearchItem();
+ r = new TMResearchItem("THAUMICDISASSEMBLER",
+ new AspectList().add(Aspect.METAL, 4).add(Aspect.WEAPON, 8).add(Aspect.TOOL, 4), 6, -9,
+ new ItemStack(ItemRegistry.ItemThaumicDisassembler), 3, 0);
+ r.setPages(new ResearchPage("1"), infusionPage("ItemThaumicDisassembler"), arcanePage("ItemMaterial:6"),
+ new ResearchPage("2"));
+ r.setParentsHidden("THAUMIUM", "VOIDMETAL", "PRIMPEARL").setConcealed().setParents("TMELDRITCHMAJOR")
+ .registerResearchItem();
- new TaintedMagicResearchItem("CRYSTALDAGGER", TM, new AspectList().add(Aspect.WEAPON, 4).add(Aspect.FIRE, 4).add(Aspect.HEAL, 4), 0, -3, 0, new ItemStack(ItemRegistry.ItemHollowDagger, 1, 7))
- .setParentsHidden("ENCHFABRIC", "ESSENTIACRYSTAL", "ELDRITCHMINOR").setParents("TAINTEDMAGIC").setComplexity(2)
- .setPages(new ResearchPage[]{ new ResearchPage("1"), new ResearchPage((IArcaneRecipe) recipes.get("ItemHollowDagger")) }).registerResearchItem();
- ThaumcraftApi.addWarpToResearch("CRYSTALDAGGER", 2);
+ r = new TMResearchItem("VOIDSASH", new AspectList().add(Aspect.VOID, 4).add(Aspect.METAL, 8).add(Aspect.ARMOR, 4), 3,
+ -6, new ItemStack(ItemRegistry.ItemVoidwalkerSash), 0, 3);
+ r.setPages(new ResearchPage("1"), infusionPage("ItemVoidwalkerSash"));
+ r.setParentsHidden("PRIMPEARL").setParents("VOIDWALKERBOOTS").setConcealed().setSecondary().registerResearchItem();
- new TaintedMagicResearchItem("MACEFOCUS", TM, new AspectList().add(Aspect.ENTROPY, 10).add(Aspect.EARTH, 4).add(Aspect.WEAPON, 6).add(Aspect.MAGIC, 8), 6, 5, 0,
- new ItemStack(ItemRegistry.ItemFocusMageMace)).setParents("TMFOCUSFIRE").setConcealed().setComplexity(2).setParentsHidden("THAUMIUM")
- .setPages(new ResearchPage[]{ new ResearchPage("1"), new ResearchPage((InfusionRecipe) recipes.get("ItemFocusMageMace")) }).registerResearchItem();
+ r = new TMResearchItem("MAGICFUNGUAR", new AspectList().add(Aspect.MAGIC, 2).add(Aspect.HUNGER, 4).add(Aspect.PLANT, 2),
+ 2, -4, new ItemStack(ItemRegistry.ItemMagicFunguar), 0, 0);
+ r.setPages(new ResearchPage("1"), arcanePage("ItemMagicFunguar"));
+ r.setSecondary().setParents("VISHROOMCRAFT").setConcealed().registerResearchItem();
- new TaintedMagicResearchItem("CRIMSONBLADE", TM, new AspectList().add(Aspect.ENTROPY, 8).add(Aspect.ELDRITCH, 2).add(Aspect.WEAPON, 16).add(Aspect.VOID, 6), -6, 2, 0,
- ItemApi.getItem("itemSwordCrimson", 0)).setParents("PRAETORARMOR").setConcealed().setComplexity(3)
- .setPages(new ResearchPage[]{ new ResearchPage("1"), new ResearchPage((InfusionRecipe) recipes.get("ItemSwordCrimson")) }).setSecondary().registerResearchItem();
- ThaumcraftApi.addWarpToResearch("CRIMSONBLADE", 3);
+ r = new TMResearchItem("VISHROOMCRAFT", new AspectList().add(Aspect.MAGIC, 4).add(Aspect.CRAFT, 2).add(Aspect.PLANT, 3),
+ 3, -3, new ItemStack(ConfigBlocks.blockCustomPlant, 1, 5), 0, 0);
+ r.setPages(new ResearchPage("1"), cruciblePage("Vishroom_red"), cruciblePage("Vishroom_brown"));
+ r.setSecondary().setConcealed().setHidden().setItemTriggers(new ItemStack(ConfigBlocks.blockCustomPlant, 1, 5))
+ .registerResearchItem();
- new TaintedMagicResearchItem("SHADOWFORTRESSARMOR", TM, new AspectList().add(Aspect.METAL, 4).add(Aspect.DARKNESS, 8).add(Aspect.ARMOR, 8).add(Aspect.VOID, 2), 0, 3, 0,
- new ItemStack(ItemRegistry.ItemShadowFortressHelmet)).setParents("SHADOWMETAL").setConcealed().setComplexity(3).setParentsHidden("VOIDFORTRESS", "TMELDRITCHMAJOR", "EVILSHARDS")
- .setSecondary()
- .setPages(new ResearchPage[]{ new ResearchPage("1"), new ResearchPage((InfusionRecipe) recipes.get("ItemShadowFortressHelmet")),
- new ResearchPage((InfusionRecipe) recipes.get("ItemShadowFortressChestplate")), new ResearchPage((InfusionRecipe) recipes.get("ItemShadowFortressLeggings")) })
- .registerResearchItem();
- ThaumcraftApi.addWarpToResearch("SHADOWFORTRESSARMOR", 3);
+ r = new TMResearchItem("HOLLOWDAGGER", new AspectList().add(Aspect.WEAPON, 4).add(Aspect.FIRE, 4).add(Aspect.HEAL, 4),
+ 0, -3, new ItemStack(ItemRegistry.ItemHollowDagger, 1, 7), 2, 2);
+ r.setPages(new ResearchPage("1"), arcanePage("ItemHollowDagger"));
+ r.setParentsHidden("ENCHFABRIC", "ESSENTIACRYSTAL", "ELDRITCHMINOR").setParents("TAINTEDMAGIC").registerResearchItem();
- new TaintedMagicResearchItem("CAP_cloth", TM, new AspectList().add(Aspect.MAGIC, 4).add(Aspect.CLOTH, 4), 3, 1, 0, new ItemStack(ItemRegistry.ItemWandCap, 1, 1))
- .setParentsHidden("CAP_gold", "ENCHFABRIC").setConcealed().setSecondary()
- .setPages(new ResearchPage[]{ new ResearchPage("1"), new ResearchPage((IArcaneRecipe) recipes.get("ItemWandCap:1")) }).registerResearchItem();
+ r = new TMResearchItem("CRIMSONBLADE",
+ new AspectList().add(Aspect.ENTROPY, 8).add(Aspect.ELDRITCH, 2).add(Aspect.WEAPON, 16).add(Aspect.VOID, 6), -6,
+ 2, new ItemStack(ConfigItems.itemSwordCrimson), 0, 5);
+ r.setPages(new ResearchPage("1"), infusionPage("ItemSwordCrimson"));
+ r.setParents("PRAETORARMOR").setConcealed().setSecondary().registerResearchItem();
- new TaintedMagicResearchItem("CAP_crimsoncloth", TM, new AspectList().add(Aspect.MAGIC, 8).add(Aspect.CLOTH, 4).add(Aspect.HEAL, 8), -1, -1, 0, new ItemStack(ItemRegistry.ItemWandCap, 1, 2))
- .setParentsHidden("CAP_cloth").setSecondary().setConcealed().setParents("CRIMSONROBES")
- .setPages(new ResearchPage[]{ new ResearchPage("1"), new ResearchPage((IArcaneRecipe) recipes.get("ItemWandCap:2")) }).registerResearchItem();
+ r = new TMResearchItem("SHADOWFORTRESS",
+ new AspectList().add(Aspect.METAL, 4).add(Aspect.DARKNESS, 8).add(Aspect.ARMOR, 8).add(Aspect.VOID, 2), 0, 3,
+ new ItemStack(ItemRegistry.ItemShadowFortressHelmet), 3, 3);
+ r.setPages(new ResearchPage("1"), infusionPage("ItemShadowFortressHelmet"),
+ infusionPage("ItemShadowFortressChestplate"), infusionPage("ItemShadowFortressLeggings"));
+ r.setParents("SHADOWMETAL").setConcealed().setParentsHidden("VOIDFORTRESS", "TMELDRITCHMAJOR", "UNBALANCEDSHARDS")
+ .registerResearchItem();
- new TaintedMagicResearchItem("CAP_shadowcloth", TM, new AspectList().add(Aspect.MAGIC, 16).add(Aspect.CLOTH, 8).add(Aspect.VOID, 16).add(Aspect.DARKNESS, 8), -2, 3, 0,
- new ItemStack(ItemRegistry.ItemWandCap, 1, 3)).setParentsHidden("CAP_cloth", "CAP_thaumium").setSecondary().setConcealed().setParents("SHADOWCLOTH")
- .setPages(new ResearchPage[]{ new ResearchPage("1"), new ResearchPage((IArcaneRecipe) recipes.get("ItemWandCap:3")) }).registerResearchItem();
- ThaumcraftApi.addWarpToResearch("CAPSHADOWCLOTH", 1);
+ r = new TMResearchItem("CAP_cloth", new AspectList().add(Aspect.MAGIC, 4).add(Aspect.CLOTH, 4), 3, 1,
+ new ItemStack(ItemRegistry.ItemWandCap, 1, 1), 0, 0);
+ r.setPages(new ResearchPage("1"), arcanePage("ItemWandCap:1"));
+ r.setParentsHidden("CAP_gold", "ENCHFABRIC").setConcealed().setSecondary().registerResearchItem();
- new TaintedMagicResearchItem("FOCUSSHOCKWAVE", TM, new AspectList().add(Aspect.MAGIC, 20).add(Aspect.TAINT, 12).add(Aspect.AIR, 6).add(Aspect.MOTION, 12), 8, 5, 0,
- new ItemStack(ItemRegistry.ItemFocusShockwave)).setParentsHidden("FOCUSSHOCK").setConcealed().setParents("TMFOCUSFIRE")
- .setPages(new ResearchPage[]{ new ResearchPage("1"), new ResearchPage((InfusionRecipe) recipes.get("ItemFocusShockwave")) }).setSecondary().registerResearchItem();
- ThaumcraftApi.addWarpToResearch("FOCUSSHOCKWAVE", 4);
+ r = new TMResearchItem("CAP_crimsoncloth",
+ new AspectList().add(Aspect.MAGIC, 8).add(Aspect.CLOTH, 4).add(Aspect.HEAL, 8), -1, -1,
+ new ItemStack(ItemRegistry.ItemWandCap, 1, 2), 0, 0);
+ r.setPages(new ResearchPage("1"), arcanePage("ItemWandCap:2"));
+ r.setParentsHidden("CAP_cloth").setSecondary().setConcealed().setParents("CRIMSONROBES").registerResearchItem();
- new TaintedMagicResearchItem("PRIMALBLADE", TM, new AspectList().add(Aspect.MAGIC, 1).add(Aspect.ELDRITCH, 1).add(Aspect.WEAPON, 1).add(Aspect.VOID, 1).add(Aspect.AURA, 1), 11, -3, 0,
- new ItemStack(ItemRegistry.ItemPrimordialEdge)).setParentsHidden("VOIDMETAL", "PRIMALCRUSHER", "EVILSHARDS", "CRYSTALDAGGER").setConcealed().setParents("CREATION")
- .setPages(new ResearchPage[]{ new ResearchPage("1"), new ResearchPage((InfusionRecipe) recipes.get("ItemPrimordialEdge")) }).registerResearchItem();
- ThaumcraftApi.addWarpToResearch("PRIMALBLADE", 4);
+ r = new TMResearchItem("CAP_shadowcloth",
+ new AspectList().add(Aspect.MAGIC, 16).add(Aspect.CLOTH, 8).add(Aspect.VOID, 16).add(Aspect.DARKNESS, 8), -3, 5,
+ new ItemStack(ItemRegistry.ItemWandCap, 1, 3), 0, 1);
+ r.setPages(new ResearchPage("1"), arcanePage("ItemWandCap:3"));
+ r.setParentsHidden("CAP_cloth", "CAP_thaumium").setSecondary().setConcealed().setParents("SHADOWCLOTH")
+ .registerResearchItem();
- new TaintedMagicResearchItem("THAUMIUMKATANA", TM, new AspectList().add(Aspect.METAL, 8).add(Aspect.MAGIC, 4).add(Aspect.WEAPON, 6), 13, 3, 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();
+ r = new TMResearchItem("PRIMALBLADE", new AspectList().add(Aspect.MAGIC, 1).add(Aspect.ELDRITCH, 1)
+ .add(Aspect.WEAPON, 1).add(Aspect.VOID, 1).add(Aspect.AURA, 1), 11, -3,
+ new ItemStack(ItemRegistry.ItemPrimordialEdge), 3, 5);
+ r.setPages(new ResearchPage("1"), infusionPage("ItemPrimordialEdge"));
+ r.setParentsHidden("VOIDMETAL", "PRIMALCRUSHER", "UNBALANCEDSHARDS", "HOLLOWDAGGER").setConcealed()
+ .setParents("CREATION").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);
+ r = new TMResearchItem("THAUMIUMKATANA",
+ new AspectList().add(Aspect.METAL, 8).add(Aspect.MAGIC, 4).add(Aspect.WEAPON, 6), 13, 2,
+ new ItemStack(ItemRegistry.ItemKatana, 1, 0), 3, 0);
+ r.setPages(new ResearchPage("1"), infusionPage("ItemKatana:0"));
+ r.setParents("TMARMORFORTRESS").setParentsHidden("ARMORFORTRESS").setConcealed().registerResearchItem();
- 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();
- ThaumcraftApi.addWarpToResearch("SHADOWMETALKATANA", 6);
+ r = new TMResearchItem("VOIDMETALKATANA",
+ new AspectList().add(Aspect.METAL, 16).add(Aspect.MAGIC, 8).add(Aspect.WEAPON, 12).add(Aspect.VOID, 12), 7, -10,
+ new ItemStack(ItemRegistry.ItemKatana, 1, 1), 3, 3);
+ r.setPages(new ResearchPage("1"), infusionPage("ItemKatana:1"));
+ r.setParentsHidden("THAUMIUMKATANA").setParents("VOIDFORTRESS").setConcealed().setSecondary().registerResearchItem();
- new TaintedMagicResearchItem("INSCRIPTIONFIRE", TM, new AspectList().add(Aspect.FIRE, 8).add(Aspect.LIGHT, 4).add(Aspect.METAL, 6), 14, 1, 0,
- new ResourceLocation("taintedmagic:textures/misc/IconINSCRIPTIONFIRE.png")).setParents("THAUMIUMKATANA").setParentsHidden("FOCUSFIRE").setConcealed()
- .setPages(new ResearchPage[]{ new ResearchPage("1"), new ResearchPage((InfusionRecipe) recipes.get("ItemKatanaThaumium:inscription0")) }).setSecondary().registerResearchItem();
+ r = new TMResearchItem(
+ "SHADOWMETALKATANA", new AspectList().add(Aspect.METAL, 16).add(Aspect.MAGIC, 8).add(Aspect.WEAPON, 12)
+ .add(Aspect.VOID, 12).add(Aspect.DARKNESS, 14),
+ 0, 5, new ItemStack(ItemRegistry.ItemKatana, 1, 2), 3, 5);
+ r.setPages(new ResearchPage("1"), infusionPage("ItemKatana:2"));
+ r.setParentsHidden("VOIDMETALKATANA").setParents("SHADOWFORTRESS").setConcealed().setSecondary().registerResearchItem();
- new TaintedMagicResearchItem("INSCRIPTIONTAINT", TM, new AspectList().add(Aspect.TAINT, 8).add(Aspect.FLESH, 4).add(Aspect.METAL, 6), 15, 3, 0,
- new ResourceLocation("taintedmagic:textures/misc/IconINSCRIPTIONTAINT.png")).setParents("THAUMIUMKATANA").setParentsHidden("TAINTFOCUS").setConcealed()
- .setPages(new ResearchPage[]{ new ResearchPage("1"), new ResearchPage((InfusionRecipe) recipes.get("ItemKatanaThaumium:inscription1")) }).setSecondary().registerResearchItem();
- ThaumcraftApi.addWarpToResearch("INSCRIPTIONTAINT", 2);
+ r = new TMResearchItem("INSCRIPTIONFIRE",
+ new AspectList().add(Aspect.FIRE, 8).add(Aspect.ENTROPY, 4).add(Aspect.METAL, 6), 14, 0,
+ new ResourceLocation("taintedmagic:textures/misc/r_fire.png"), 0, 0);
+ r.setPages(new ResearchPage("1"), infusionPage("ItemKatanaThaumium:inscription0"));
+ r.setParents("THAUMIUMKATANA").setParentsHidden("FOCUSFIRE").setConcealed().setSecondary().registerResearchItem();
- new TaintedMagicResearchItem("INSCRIPTIONUNDEAD", TM, new AspectList().add(Aspect.HEAL, 8).add(Aspect.UNDEAD, 4).add(Aspect.METAL, 6), 14, 5, 0,
- new ResourceLocation("taintedmagic:textures/misc/IconINSCRIPTIONUNDEAD.png")).setParents("THAUMIUMKATANA").setParentsHidden("BATHSALTS").setConcealed()
- .setPages(new ResearchPage[]{ new ResearchPage("1"), new ResearchPage((InfusionRecipe) recipes.get("ItemKatanaThaumium:inscription2")) }).setSecondary().registerResearchItem();
- ThaumcraftApi.addWarpToResearch("INSCRIPTIONUNDEAD", 4);
+ r = new TMResearchItem("INSCRIPTIONTHUNDER",
+ new AspectList().add(Aspect.ENTROPY, 8).add(Aspect.MOTION, 4).add(Aspect.METAL, 6), 15, 2,
+ new ResourceLocation("taintedmagic:textures/misc/r_thunder.png"), 0, 0);
+ r.setPages(new ResearchPage("1"), infusionPage("ItemKatanaThaumium:inscription1"));
+ r.setParents("THAUMIUMKATANA").setParentsHidden("FOCUSSHOCKWAVE").setConcealed().setSecondary().registerResearchItem();
- new TaintedMagicResearchItem("VOIDGOGGLES", TM, new AspectList().add(Aspect.VOID, 8).add(Aspect.DARKNESS, 4).add(Aspect.MAGIC, 6).add(Aspect.SENSES, 12).add(Aspect.CRYSTAL, 2), 2, 3, 0,
- new ItemStack(ItemRegistry.ItemVoidmetalGoggles)).setParents("WARPEDGOGGLES").setParentsHidden("VOIDMETAL").setConcealed()
- .setPages(new ResearchPage[]{ new ResearchPage("1"), new ResearchPage((InfusionRecipe) recipes.get("ItemVoidmetalGoggles")) }).setSecondary().registerResearchItem();
- ThaumcraftApi.addWarpToResearch("VOIDGOGGLES", 2);
+ r = new TMResearchItem("INSCRIPTIONUNDEAD",
+ new AspectList().add(Aspect.HEAL, 8).add(Aspect.UNDEAD, 4).add(Aspect.METAL, 6), 14, 4,
+ new ResourceLocation("taintedmagic:textures/misc/r_undead.png"), 0, 2);
+ r.setPages(new ResearchPage("1"), infusionPage("ItemKatanaThaumium:inscription2"));
+ r.setParents("THAUMIUMKATANA").setParentsHidden("BATHSALTS").setConcealed().setSecondary().registerResearchItem();
- new TaintedMagicResearchItem("FOCUSSHARD", TM, new AspectList().add(Aspect.CRYSTAL, 2).add(Aspect.MAGIC, 4).add(Aspect.MOTION, 6), 9, 6, 0, new ItemStack(ItemRegistry.ItemFocusVisShard))
- .setParents("TMFOCUSFIRE").setParentsHidden("FOCUSFIRE", "EVILSHARDS").setConcealed()
- .setPages(new ResearchPage[]{ new ResearchPage("1"), new ResearchPage((IArcaneRecipe) recipes.get("ItemFocusVisShard")) }).setSecondary().registerResearchItem();
+ r = new TMResearchItem("VOIDGOGGLES",
+ new AspectList().add(Aspect.VOID, 8).add(Aspect.DARKNESS, 4).add(Aspect.MAGIC, 6).add(Aspect.SENSES, 12), 3, 3,
+ new ItemStack(ItemRegistry.ItemVoidmetalGoggles), 0, 2);
+ r.setPages(new ResearchPage("1"), infusionPage("ItemVoidmetalGoggles"));
+ r.setParents("WARPEDGOGGLES").setParentsHidden("VOIDMETAL").setConcealed().setSecondary().registerResearchItem();
- new TaintedMagicResearchItem("TAINTFOCUS", TM, new AspectList().add(Aspect.TAINT, 4).add(Aspect.LIFE, 4).add(Aspect.MOTION, 4), 10, 6, 0, new ItemStack(ItemRegistry.ItemFocusTaintSwarm))
- .setParentsHidden(new String[]{ "INFUSION", "BOTTLETAINT" }).setParents(new String[]{ "FOCUSSHARD" }).setConcealed()
- .setPages(new ResearchPage[]{ new ResearchPage("1"), new ResearchPage((InfusionRecipe) recipes.get("ItemFocusTaintSwarm")) }).registerResearchItem();
- ThaumcraftApi.addWarpToResearch("TAINTFOCUS", 3);
+ r = new TMResearchItem("ELDRITCHFOCUS",
+ new AspectList().add(Aspect.ELDRITCH, 22).add(Aspect.ENTROPY, 14).add(Aspect.AIR, 4).add(Aspect.DARKNESS, 6), 7,
+ 7, new ItemStack(ItemRegistry.ItemFocusDarkMatter), 3, 7);
+ r.setPages(new ResearchPage("1"), infusionPage("ItemFocusDarkMatter"));
+ r.setParentsHidden("OUTERREV").setParents("TAINTFOCUS", "FOCUSSHARD", "FOCUSLUMOS", "MACEFOCUS", "FOCUSSHOCKWAVE")
+ .setConcealed().setSpecial().registerResearchItem();
- new TaintedMagicResearchItem("FOCUSLUMOS", TM, new AspectList().add(Aspect.FIRE, 16).add(Aspect.LIGHT, 24).add(Aspect.ENERGY, 8), 5, 6, 0, new ItemStack(ItemRegistry.ItemFocusLumos))
- .setPages(new ResearchPage[]{ new ResearchPage("1"), new ResearchPage((IArcaneRecipe) recipes.get("ItemFocusLumos")) }).setParents("TMFOCUSFIRE").setParentsHidden("FOCUSFIRE")
- .setConcealed().setSecondary().registerResearchItem();
+ r = new TMResearchItem("DIFFUSIONUPGRADE",
+ new AspectList().add(Aspect.MAGIC, 4).add(Aspect.DARKNESS, 8).add(Aspect.WEAPON, 8).add(Aspect.ELDRITCH, 10), 8,
+ 8, new ResourceLocation("taintedmagic:textures/foci/IconDiffusion.png"), 0, 2);
+ r.setPages(new ResearchPage("1"));
+ r.setParentsHidden("FOCALMANIPULATION").setConcealed().setParents("ELDRITCHFOCUS").setSecondary()
+ .registerResearchItem();
- new TaintedMagicResearchItem("LUMOSRING", TM, new AspectList().add(Aspect.ARMOR, 16).add(Aspect.AURA, 12).add(Aspect.LIGHT, 24).add(Aspect.ENERGY, 8), 4, 5, 0,
- new ItemStack(ItemRegistry.ItemLumosRing)).setPages(new ResearchPage[]{ new ResearchPage("1"), new ResearchPage((InfusionRecipe) recipes.get("ItemLumosRing")) })
- .setParents("FOCUSLUMOS").setParentsHidden("RUNICARMOR").setConcealed().setComplexity(2).registerResearchItem();
+ r = new TMResearchItem("MACEFOCUS",
+ new AspectList().add(Aspect.ENTROPY, 10).add(Aspect.EARTH, 4).add(Aspect.WEAPON, 6).add(Aspect.MAGIC, 8), 6, 5,
+ new ItemStack(ItemRegistry.ItemFocusMageMace), 2, 0);
+ r.setPages(new ResearchPage("1"), infusionPage("ItemFocusMageMace"));
+ r.setParents("TMFOCUSFIRE").setConcealed().setParentsHidden("THAUMIUM").registerResearchItem();
- new TaintedMagicResearchItem("FLYTECHARM", TM, new AspectList().add(Aspect.FLIGHT, 15).add(Aspect.AIR, 20).add(Aspect.SENSES, 8).add(Aspect.MAGIC, 12), 13, -4, 0,
- new ItemStack(ItemRegistry.ItemFlyteCharm)).setPages(new ResearchPage[]{ new ResearchPage("1"), new ResearchPage((InfusionRecipe) recipes.get("ItemFlyteCharm")) })
- .setParents("CREATION").setParentsHidden("VOIDSASH", "PRIMALARROW").setConcealed().registerResearchItem();
- }
+ r = new TMResearchItem("FOCUSSHOCKWAVE",
+ new AspectList().add(Aspect.MAGIC, 20).add(Aspect.ENTROPY, 12).add(Aspect.AIR, 6).add(Aspect.MOTION, 12), 8, 5,
+ new ItemStack(ItemRegistry.ItemFocusShockwave), 0, 0);
+ r.setPages(new ResearchPage("1"), infusionPage("ItemFocusShockwave"));
+ r.setParentsHidden("FOCUSSHOCK").setConcealed().setParents("TMFOCUSFIRE").setSecondary().registerResearchItem();
+
+ r = new TMResearchItem("FOCUSSHARD", new AspectList().add(Aspect.CRYSTAL, 2).add(Aspect.MAGIC, 4).add(Aspect.MOTION, 6),
+ 9, 6, new ItemStack(ItemRegistry.ItemFocusVisShard), 0, 0);
+ r.setPages(new ResearchPage("1"), arcanePage("ItemFocusVisShard"));
+ r.setParents("TMFOCUSFIRE").setParentsHidden("FOCUSFIRE", "UNBALANCEDSHARDS").setConcealed().setSecondary()
+ .registerResearchItem();
+
+ r = new TMResearchItem("TAINTFOCUS", new AspectList().add(Aspect.TAINT, 4).add(Aspect.LIFE, 4).add(Aspect.MOTION, 4),
+ 10, 6, new ItemStack(ItemRegistry.ItemFocusTaintSwarm), 3, 3);
+ r.setPages(new ResearchPage("1"), infusionPage("ItemFocusTaintSwarm"));
+ r.setParentsHidden("INFUSION", "BOTTLETAINT").setParents("FOCUSSHARD").setConcealed().registerResearchItem();
+
+ r = new TMResearchItem("FOCUSLUMOS", new AspectList().add(Aspect.FIRE, 16).add(Aspect.LIGHT, 24).add(Aspect.ENERGY, 8),
+ 5, 6, new ItemStack(ItemRegistry.ItemFocusLumos), 0, 0);
+ r.setPages(new ResearchPage("1"), arcanePage("ItemFocusLumos"));
+ r.setParents("TMFOCUSFIRE").setParentsHidden("FOCUSFIRE").setConcealed().setSecondary().registerResearchItem();
+
+ r = new TMResearchItem("LUMOSRING",
+ new AspectList().add(Aspect.ARMOR, 16).add(Aspect.AURA, 12).add(Aspect.LIGHT, 24).add(Aspect.ENERGY, 8), 4, 7,
+ new ItemStack(ItemRegistry.ItemLumosRing), 2, 0);
+ r.setPages(new ResearchPage("1"), infusionPage("ItemLumosRing"));
+ r.setParents("FOCUSLUMOS").setParentsHidden("RUNICARMOR").setConcealed().registerResearchItem();
+
+ r = new TMResearchItem("FLYTECHARM",
+ new AspectList().add(Aspect.FLIGHT, 15).add(Aspect.AIR, 20).add(Aspect.SENSES, 8).add(Aspect.MAGIC, 12), 13, -4,
+ new ItemStack(ItemRegistry.ItemFlyteCharm), 3, 0);
+ r.setPages(new ResearchPage("1"), infusionPage("ItemFlyteCharm"));
+ r.setParents("CREATION").setParentsHidden("VOIDSASH", "PRIMALARROW").setConcealed().registerResearchItem();
+
+ r = new TMResearchItem("GATEKEY",
+ new AspectList().add(Aspect.TRAVEL, 30).add(Aspect.EXCHANGE, 15).add(Aspect.AURA, 20).add(Aspect.FLIGHT, 10), 9,
+ -4, new ItemStack(ItemRegistry.ItemGatekey), 3, 0);
+ r.setPages(new ResearchPage("1"), infusionPage("ItemGatekey"));
+ r.setParents("CREATION").setConcealed().registerResearchItem();
+ }
+
+ /**
+ * ResearchPage helpers
+ */
+
+ public static ResearchPage recipePage (String key)
+ {
+ return new ResearchPage((IRecipe) recipes.get(key));
+ }
+
+ public static ResearchPage arcanePage (String key)
+ {
+ return new ResearchPage((IArcaneRecipe) recipes.get(key));
+ }
+
+ public static ResearchPage infusionPage (String key)
+ {
+ return new ResearchPage((InfusionRecipe) recipes.get(key));
+ }
+
+ public static ResearchPage cruciblePage (String key)
+ {
+ return new ResearchPage((CrucibleRecipe) recipes.get(key));
+ }
}
diff --git a/src/main/java/taintedmagic/common/research/TaintedMagicResearchItem.java b/src/main/java/taintedmagic/common/research/TMResearchItem.java
similarity index 57%
rename from src/main/java/taintedmagic/common/research/TaintedMagicResearchItem.java
rename to src/main/java/taintedmagic/common/research/TMResearchItem.java
index 92ed19f..4a12181 100644
--- a/src/main/java/taintedmagic/common/research/TaintedMagicResearchItem.java
+++ b/src/main/java/taintedmagic/common/research/TMResearchItem.java
@@ -6,25 +6,32 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.StatCollector;
import taintedmagic.common.TaintedMagic;
+import taintedmagic.common.registry.ResearchRegistry;
+import thaumcraft.api.ThaumcraftApi;
import thaumcraft.api.aspects.AspectList;
+import thaumcraft.api.research.ResearchCategories;
import thaumcraft.api.research.ResearchItem;
import thaumcraft.api.research.ResearchPage;
-public class TaintedMagicResearchItem extends ResearchItem
+public class TMResearchItem extends ResearchItem
{
- public TaintedMagicResearchItem (String key, String category)
+ int warp = 0;
+
+ public TMResearchItem (String key, String category)
{
super(key, category);
}
- public TaintedMagicResearchItem (String key, String category, AspectList tags, int col, int row, int complex, ItemStack icon)
+ public TMResearchItem (String key, AspectList tags, int col, int row, ItemStack icon, int complex, int warp)
{
- super(key, category, tags, col, row, complex, icon);
+ super(key, ResearchRegistry.categoryTM, tags, col, row, complex, icon);
+ this.warp = warp;
}
- public TaintedMagicResearchItem (String key, String category, AspectList tags, int col, int row, int complex, ResourceLocation icon)
+ public TMResearchItem (String key, AspectList tags, int col, int row, ResourceLocation icon, int complex, int warp)
{
- super(key, category, tags, col, row, complex, icon);
+ super(key, ResearchRegistry.categoryTM, tags, col, row, complex, icon);
+ this.warp = warp;
}
@SideOnly (Side.CLIENT)
@@ -36,7 +43,7 @@ public class TaintedMagicResearchItem extends ResearchItem
@SideOnly (Side.CLIENT)
public String getText ()
{
- return (TaintedMagic.configHandler.researchTags ? "[TM] " : "") + StatCollector.translateToLocal(new StringBuilder("tm.tag.").append(this.key).toString());
+ return (TaintedMagic.configHandler.RESEARCH_TAGS ? "[TM] " : "") + StatCollector.translateToLocal(new StringBuilder("tm.tag.").append(this.key).toString());
}
@Override
@@ -64,4 +71,12 @@ public class TaintedMagicResearchItem extends ResearchItem
}
return super.setPages(par);
}
+
+ @Override
+ public ResearchItem registerResearchItem ()
+ {
+ super.registerResearchItem();
+ if (warp > 0) ThaumcraftApi.addWarpToResearch(key, warp);
+ return this;
+ }
}
\ No newline at end of file
diff --git a/src/main/java/taintedmagic/common/research/ThaumcraftResearchItem.java b/src/main/java/taintedmagic/common/research/ThaumcraftResearchItem.java
index c1b3209..6539a45 100644
--- a/src/main/java/taintedmagic/common/research/ThaumcraftResearchItem.java
+++ b/src/main/java/taintedmagic/common/research/ThaumcraftResearchItem.java
@@ -4,6 +4,7 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
+import taintedmagic.common.registry.ResearchRegistry;
import thaumcraft.api.aspects.AspectList;
import thaumcraft.api.research.ResearchCategories;
import thaumcraft.api.research.ResearchCategoryList;
@@ -18,9 +19,9 @@ public class ThaumcraftResearchItem extends ResearchItem
{
public ResearchItem original;
- public ThaumcraftResearchItem (String tag, String category, String origin, String originCategory, int col, int row, ResourceLocation icon)
+ public ThaumcraftResearchItem (String tag, String origin, String originCategory, int col, int row, ResourceLocation icon)
{
- super(tag, category, new AspectList(), col, row, 1, icon);
+ super(tag, ResearchRegistry.categoryTM, new AspectList(), col, row, 1, icon);
original = ((ResearchCategoryList) ResearchCategories.researchCategories.get(originCategory)).research.get(origin);
bindToOriginal();
setStub();
@@ -28,9 +29,9 @@ public class ThaumcraftResearchItem extends ResearchItem
}
- public ThaumcraftResearchItem (String tag, String category, String origin, String originCategory, int col, int row, ItemStack icon)
+ public ThaumcraftResearchItem (String tag, String origin, String originCategory, int col, int row, ItemStack icon)
{
- super(tag, category, new AspectList(), col, row, 1, icon);
+ super(tag, ResearchRegistry.categoryTM, new AspectList(), col, row, 1, icon);
original = ((ResearchCategoryList) ResearchCategories.researchCategories.get(originCategory)).research.get(origin);
bindToOriginal();
setStub();
diff --git a/src/main/java/taintedmagic/common/world/WorldGenWarpwoodTree.java b/src/main/java/taintedmagic/common/world/WorldGenWarpwoodTree.java
index d4f97ce..79e8ce5 100644
--- a/src/main/java/taintedmagic/common/world/WorldGenWarpwoodTree.java
+++ b/src/main/java/taintedmagic/common/world/WorldGenWarpwoodTree.java
@@ -4,577 +4,204 @@ import java.util.Random;
import net.minecraft.block.Block;
import net.minecraft.block.BlockSapling;
+import net.minecraft.init.Blocks;
import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
import net.minecraft.world.gen.feature.WorldGenAbstractTree;
+import net.minecraft.world.gen.feature.WorldGenerator;
import net.minecraftforge.common.util.ForgeDirection;
import taintedmagic.common.registry.BlockRegistry;
+import thaumcraft.common.config.ConfigBlocks;
+import thaumcraft.common.lib.world.ThaumcraftWorldGenerator;
+import thaumcraft.common.lib.world.WorldGenCustomFlowers;
/**
- * Copy of WorldGenBigTree.class
+ * Modified copy of WorldGenSilverwoodTrees.class
*/
public class WorldGenWarpwoodTree extends WorldGenAbstractTree
{
- public Block trunk;
- public Block leaves;
+ private Block trunk;
+ private Block leaves;
+ private final int minTreeHeight;
+ private final int randomTreeHeight;
+ boolean worldgen = false;
- /**
- * Contains three sets of two values that provide complimentary indices for
- * a given 'major' index - 1 and 2 for 0, 0 and 2 for 1, and 0 and 1 for 2.
- */
- static final byte[] otherCoordPairs = new byte[]{
- (byte) 2,
- (byte) 0,
- (byte) 0,
- (byte) 1,
- (byte) 2,
- (byte) 1 };
- /** random seed for GenBigTree */
- Random rand = new Random();
- /** Reference to the World object. */
- World worldObj;
- int[] basePos = new int[]{
- 0,
- 0,
- 0 };
- int heightLimit;
- int height;
- double heightAttenuation = 0.618D;
- double branchDensity = 1.0D;
- double branchSlope = 0.381D;
- double scaleWidth = 1.0D;
- double leafDensity = 1.0D;
- /**
- * Currently always 1, can be set to 2 in the class constructor to generate
- * a double-sized tree trunk for big trees.
- */
- int trunkSize = 1;
- /** Sets the limit of the random value used to initialize the height limit. */
- int heightLimitLimit = 12;
- /**
- * Sets the distance limit for how far away the generator will populate
- * leaves from the base leaf node.
- */
- int leafDistanceLimit = 4;
- /** Contains a list of a points at which to generate groups of leaves. */
- int[][] leafNodes;
- private static final String __OBFID = "CL_00000400";
-
- public WorldGenWarpwoodTree (boolean b, Block trunk, Block leaves)
+ public WorldGenWarpwoodTree (boolean doBlockNotify, int minTreeHeight, int randomTreeHeight)
{
- super(b);
- this.trunk = trunk;
- this.leaves = leaves;
+ super(doBlockNotify);
+ this.worldgen = !doBlockNotify;
+ this.minTreeHeight = minTreeHeight;
+ this.randomTreeHeight = randomTreeHeight;
+ this.trunk = BlockRegistry.BlockWarpwoodLog;
+ this.leaves = BlockRegistry.BlockWarpwoodLeaves;
}
- /**
- * Generates a list of leaf nodes for the tree, to be populated by
- * generateLeaves.
- */
- void generateLeafNodeList ()
+ public boolean generate (World world, Random random, int x, int y, int z)
{
- this.height = (int) ((double) this.heightLimit * this.heightAttenuation);
-
- if (this.height >= this.heightLimit)
+ int height = random.nextInt(this.randomTreeHeight) + this.minTreeHeight;
+ boolean flag = true;
+ if (y >= 1 && y + height + 1 <= 256)
{
- this.height = this.heightLimit - 1;
- }
-
- int i = (int) (1.382D + Math.pow(this.leafDensity * (double) this.heightLimit / 13.0D, 2.0D));
-
- if (i < 1)
- {
- i = 1;
- }
-
- int[][] aint = new int[i * this.heightLimit][4];
- int j = this.basePos[1] + this.heightLimit - this.leafDistanceLimit;
- int k = 1;
- int l = this.basePos[1] + this.height;
- int i1 = j - this.basePos[1];
- aint[0][0] = this.basePos[0];
- aint[0][1] = j;
- aint[0][2] = this.basePos[2];
- aint[0][3] = l;
- --j;
-
- while (i1 >= 0)
- {
- int j1 = 0;
- float f = this.layerSize(i1);
-
- if (f < 0.0F)
+ for (int i1 = y; i1 <= y + 1 + height; ++i1)
{
- --j;
- --i1;
- }
- else
- {
- for (double d0 = 0.5D; j1 < i; ++j1)
+ byte spread = 1;
+ if (i1 == y)
{
- double d1 = this.scaleWidth * (double) f * ((double) this.rand.nextFloat() + 0.328D);
- double d2 = (double) this.rand.nextFloat() * 2.0D * Math.PI;
- int k1 = MathHelper.floor_double(d1 * Math.sin(d2) + (double) this.basePos[0] + d0);
- int l1 = MathHelper.floor_double(d1 * Math.cos(d2) + (double) this.basePos[2] + d0);
- int[] aint1 = new int[]{
- k1,
- j,
- l1 };
- int[] aint2 = new int[]{
- k1,
- j + this.leafDistanceLimit,
- l1 };
+ spread = 0;
+ }
- if (this.checkBlockLine(aint1, aint2) == -1)
+ if (i1 >= y + 1 + height - 2)
+ {
+ spread = 3;
+ }
+
+ for (int j1 = x - spread; j1 <= x + spread && flag; ++j1)
+ {
+ for (int k1 = z - spread; k1 <= z + spread && flag; ++k1)
{
- int[] aint3 = new int[]{
- this.basePos[0],
- this.basePos[1],
- this.basePos[2] };
- double d3 = Math.sqrt(Math.pow((double) Math.abs(this.basePos[0] - aint1[0]), 2.0D) + Math.pow((double) Math.abs(this.basePos[2] - aint1[2]), 2.0D));
- double d4 = d3 * this.branchSlope;
-
- if ((double) aint1[1] - d4 > (double) l)
+ if (i1 >= 0 && i1 < 256)
{
- aint3[1] = l;
+ Block block = world.getBlock(j1, i1, k1);
+ if (!block.isAir(world, j1, i1, k1) && !block.isLeaves(world, j1, i1, k1) && !block.isReplaceable(world, j1, i1, k1) && i1 > y)
+ {
+ flag = false;
+ }
}
else
{
- aint3[1] = (int) ((double) aint1[1] - d4);
- }
-
- if (this.checkBlockLine(aint3, aint1) == -1)
- {
- aint[k][0] = k1;
- aint[k][1] = j;
- aint[k][2] = l1;
- aint[k][3] = aint3[1];
- ++k;
+ flag = false;
}
}
}
-
- --j;
- --i1;
- }
- }
-
- this.leafNodes = new int[k][4];
- System.arraycopy(aint, 0, this.leafNodes, 0, k);
- }
-
- void func_150529_a (int p_150529_1_, int p_150529_2_, int p_150529_3_, float p_150529_4_, byte p_150529_5_, Block p_150529_6_)
- {
- int l = (int) ((double) p_150529_4_ + 0.618D);
- byte b1 = otherCoordPairs[p_150529_5_];
- byte b2 = otherCoordPairs[p_150529_5_ + 3];
- int[] aint = new int[]{
- p_150529_1_,
- p_150529_2_,
- p_150529_3_ };
- int[] aint1 = new int[]{
- 0,
- 0,
- 0 };
- int i1 = -l;
- int j1 = -l;
-
- for (aint1[p_150529_5_] = aint[p_150529_5_]; i1 <= l; ++i1)
- {
- aint1[b1] = aint[b1] + i1;
- j1 = -l;
-
- while (j1 <= l)
- {
- double d0 = Math.pow((double) Math.abs(i1) + 0.5D, 2.0D) + Math.pow((double) Math.abs(j1) + 0.5D, 2.0D);
-
- if (d0 > (double) (p_150529_4_ * p_150529_4_))
- {
- ++j1;
- }
- else
- {
- aint1[b2] = aint[b2] + j1;
- Block block1 = this.worldObj.getBlock(aint1[0], aint1[1], aint1[2]);
-
- if (!block1.isAir(worldObj, aint1[0], aint1[1], aint1[2]) && !block1.isLeaves(worldObj, aint1[0], aint1[1], aint1[2]))
- {
- ++j1;
- }
- else
- {
- this.setBlockAndNotifyAdequately(this.worldObj, aint1[0], aint1[1], aint1[2], p_150529_6_, 0);
- ++j1;
- }
- }
- }
- }
- }
-
- /**
- * Gets the rough size of a layer of the tree.
- */
- float layerSize (int p_76490_1_)
- {
- if ((double) p_76490_1_ < (double) ((float) this.heightLimit) * 0.3D)
- {
- return -1.618F;
- }
- else
- {
- float f = (float) this.heightLimit / 2.0F;
- float f1 = (float) this.heightLimit / 2.0F - (float) p_76490_1_;
- float f2;
-
- if (f1 == 0.0F)
- {
- f2 = f;
- }
- else if (Math.abs(f1) >= f)
- {
- f2 = 0.0F;
- }
- else
- {
- f2 = (float) Math.sqrt(Math.pow((double) Math.abs(f), 2.0D) - Math.pow((double) Math.abs(f1), 2.0D));
}
- f2 *= 0.5F;
- return f2;
- }
- }
-
- float leafSize (int p_76495_1_)
- {
- return p_76495_1_ >= 0 && p_76495_1_ < this.leafDistanceLimit ? (p_76495_1_ != 0 && p_76495_1_ != this.leafDistanceLimit - 1 ? 3.0F : 2.0F) : -1.0F;
- }
-
- /**
- * Generates the leaves surrounding an individual entry in the leafNodes
- * list.
- */
- void generateLeafNode (int p_76491_1_, int p_76491_2_, int p_76491_3_)
- {
- int l = p_76491_2_;
-
- for (int i1 = p_76491_2_ + this.leafDistanceLimit; l < i1; ++l)
- {
- float f = this.leafSize(l - p_76491_2_);
- this.func_150529_a(p_76491_1_, l, p_76491_3_, f, (byte) 1, leaves);
- }
- }
-
- void func_150530_a (int[] p_150530_1_, int[] p_150530_2_, Block p_150530_3_)
- {
- int[] aint2 = new int[]{
- 0,
- 0,
- 0 };
- byte b0 = 0;
- byte b1;
-
- for (b1 = 0; b0 < 3; ++b0)
- {
- aint2[b0] = p_150530_2_[b0] - p_150530_1_[b0];
-
- if (Math.abs(aint2[b0]) > Math.abs(aint2[b1]))
- {
- b1 = b0;
- }
- }
-
- if (aint2[b1] != 0)
- {
- byte b2 = otherCoordPairs[b1];
- byte b3 = otherCoordPairs[b1 + 3];
- byte b4;
-
- if (aint2[b1] > 0)
- {
- b4 = 1;
- }
- else
- {
- b4 = -1;
- }
-
- double d0 = (double) aint2[b2] / (double) aint2[b1];
- double d1 = (double) aint2[b3] / (double) aint2[b1];
- int[] aint3 = new int[]{
- 0,
- 0,
- 0 };
- int i = 0;
-
- for (int j = aint2[b1] + b4; i != j; i += b4)
- {
- aint3[b1] = MathHelper.floor_double((double) (p_150530_1_[b1] + i) + 0.5D);
- aint3[b2] = MathHelper.floor_double((double) p_150530_1_[b2] + (double) i * d0 + 0.5D);
- aint3[b3] = MathHelper.floor_double((double) p_150530_1_[b3] + (double) i * d1 + 0.5D);
- byte b5 = 0;
- int k = Math.abs(aint3[0] - p_150530_1_[0]);
- int l = Math.abs(aint3[2] - p_150530_1_[2]);
- int i1 = Math.max(k, l);
-
- if (i1 > 0)
- {
- if (k == i1)
- {
- b5 = 4;
- }
- else if (l == i1)
- {
- b5 = 8;
- }
- }
-
- this.setBlockAndNotifyAdequately(this.worldObj, aint3[0], aint3[1], aint3[2], p_150530_3_, b5);
- }
- }
- }
-
- /**
- * Generates the leaf portion of the tree as specified by the leafNodes
- * list.
- */
- void generateLeaves ()
- {
- int i = 0;
-
- for (int j = this.leafNodes.length; i < j; ++i)
- {
- int k = this.leafNodes[i][0];
- int l = this.leafNodes[i][1];
- int i1 = this.leafNodes[i][2];
- this.generateLeafNode(k, l, i1);
- }
- }
-
- /**
- * Indicates whether or not a leaf node requires additional wood to be added
- * to preserve integrity.
- */
- boolean leafNodeNeedsBase (int p_76493_1_)
- {
- return (double) p_76493_1_ >= (double) this.heightLimit * 0.2D;
- }
-
- /**
- * Places the trunk for the big tree that is being generated. Able to
- * generate double-sized trunks by changing a field that is always 1 to 2.
- */
- void generateTrunk ()
- {
- int i = this.basePos[0];
- int j = this.basePos[1];
- int k = this.basePos[1] + this.height;
- int l = this.basePos[2];
- int[] aint = new int[]{
- i,
- j,
- l };
- int[] aint1 = new int[]{
- i,
- k,
- l };
- this.func_150530_a(aint, aint1, trunk);
-
- if (this.trunkSize == 2)
- {
- ++aint[0];
- ++aint1[0];
- this.func_150530_a(aint, aint1, trunk);
- ++aint[2];
- ++aint1[2];
- this.func_150530_a(aint, aint1, trunk);
- aint[0] += -1;
- aint1[0] += -1;
- this.func_150530_a(aint, aint1, trunk);
- }
- }
-
- /**
- * Generates additional wood blocks to fill out the bases of different leaf
- * nodes that would otherwise degrade.
- */
- void generateLeafNodeBases ()
- {
- int i = 0;
- int j = this.leafNodes.length;
-
- for (int[] aint = new int[]{
- this.basePos[0],
- this.basePos[1],
- this.basePos[2] }; i < j; ++i)
- {
- int[] aint1 = this.leafNodes[i];
- int[] aint2 = new int[]{
- aint1[0],
- aint1[1],
- aint1[2] };
- aint[1] = aint1[3];
- int k = aint[1] - this.basePos[1];
-
- if (this.leafNodeNeedsBase(k))
- {
- this.func_150530_a(aint, aint2, trunk);
- }
- }
- }
-
- /**
- * Checks a line of blocks in the world from the first coordinate to triplet
- * to the second, returning the distance (in blocks) before a non-air,
- * non-leaf block is encountered and/or the end is encountered.
- */
- int checkBlockLine (int[] p_76496_1_, int[] p_76496_2_)
- {
- int[] aint2 = new int[]{
- 0,
- 0,
- 0 };
- byte b0 = 0;
- byte b1;
-
- for (b1 = 0; b0 < 3; ++b0)
- {
- aint2[b0] = p_76496_2_[b0] - p_76496_1_[b0];
-
- if (Math.abs(aint2[b0]) > Math.abs(aint2[b1]))
- {
- b1 = b0;
- }
- }
-
- if (aint2[b1] == 0)
- {
- return -1;
- }
- else
- {
- byte b2 = otherCoordPairs[b1];
- byte b3 = otherCoordPairs[b1 + 3];
- byte b4;
-
- if (aint2[b1] > 0)
- {
- b4 = 1;
- }
- else
- {
- b4 = -1;
- }
-
- double d0 = (double) aint2[b2] / (double) aint2[b1];
- double d1 = (double) aint2[b3] / (double) aint2[b1];
- int[] aint3 = new int[]{
- 0,
- 0,
- 0 };
- int i = 0;
- int j;
-
- for (j = aint2[b1] + b4; i != j; i += b4)
- {
- aint3[b1] = p_76496_1_[b1] + i;
- aint3[b2] = MathHelper.floor_double((double) p_76496_1_[b2] + (double) i * d0);
- aint3[b3] = MathHelper.floor_double((double) p_76496_1_[b3] + (double) i * d1);
- Block block = this.worldObj.getBlock(aint3[0], aint3[1], aint3[2]);
-
- if (!this.isReplaceable(worldObj, aint3[0], aint3[1], aint3[2]))
- {
- break;
- }
- }
-
- return i == j ? -1 : Math.abs(i);
- }
- }
-
- /**
- * Returns a boolean indicating whether or not the current location for the
- * tree, spanning basePos to to the height limit, is valid.
- */
- boolean validTreeLocation ()
- {
- int[] aint = new int[]{
- this.basePos[0],
- this.basePos[1],
- this.basePos[2] };
- int[] aint1 = new int[]{
- this.basePos[0],
- this.basePos[1] + this.heightLimit - 1,
- this.basePos[2] };
- Block block = this.worldObj.getBlock(this.basePos[0], this.basePos[1] - 1, this.basePos[2]);
-
- boolean isSoil = block.canSustainPlant(worldObj, basePos[0], basePos[1] - 1, basePos[2], ForgeDirection.UP, (BlockSapling) BlockRegistry.BlockWarpwoodSapling);
- if (!isSoil)
- {
- return false;
- }
- else
- {
- int i = this.checkBlockLine(aint, aint1);
-
- if (i == -1)
- {
- return true;
- }
- else if (i < 6)
+ if (!flag)
{
return false;
}
else
{
- this.heightLimit = i;
- return true;
+ Block block1 = world.getBlock(x, y - 1, z);
+ boolean isSoil = block1.canSustainPlant(world, x, y - 1, z, ForgeDirection.UP, (BlockSapling) Blocks.sapling);
+ if (isSoil && y < 256 - height - 1)
+ {
+ block1.onPlantGrow(world, x, y - 1, z, x, y, z);
+ int start = y + height - 5;
+ int end = y + height + 3 + random.nextInt(3);
+
+ int k2;
+ for (k2 = start; k2 <= end; ++k2)
+ {
+ int cty = MathHelper.clamp_int(k2, y + height - 3, y + height);
+
+ for (int xx = x - 5; xx <= x + 5; ++xx)
+ {
+ for (int zz = z - 5; zz <= z + 5; ++zz)
+ {
+ double d3 = (double) (xx - x);
+ double d4 = (double) (k2 - cty);
+ double d5 = (double) (zz - z);
+ double dist = d3 * d3 + d4 * d4 + d5 * d5;
+ if (dist < (double) (10 + random.nextInt(8)) && world.getBlock(xx, k2, zz).canBeReplacedByLeaves(world, xx, k2, zz))
+ {
+ this.setBlockAndNotifyAdequately(world, xx, k2, zz, this.leaves, 1);
+ }
+ }
+ }
+ }
+
+ int chance = (int) ((double) height * 1.5D);
+ boolean lastblock = false;
+
+ for (k2 = 0; k2 < height; ++k2)
+ {
+ Block block2 = world.getBlock(x, y + k2, z);
+ if (block2.isAir(world, x, y + k2, z) || block2.isLeaves(world, x, y + k2, z) || block2.isReplaceable(world, x, y + k2, z))
+ {
+ this.setBlockAndNotifyAdequately(world, x, y + k2, z, this.trunk, 1);
+ this.setBlockAndNotifyAdequately(world, x - 1, y + k2, z, this.trunk, 1);
+ this.setBlockAndNotifyAdequately(world, x + 1, y + k2, z, this.trunk, 1);
+ this.setBlockAndNotifyAdequately(world, x, y + k2, z - 1, this.trunk, 1);
+ this.setBlockAndNotifyAdequately(world, x, y + k2, z + 1, this.trunk, 1);
+ }
+ }
+
+ this.setBlockAndNotifyAdequately(world, x, y + k2, z, this.trunk, 1);
+ this.setBlockAndNotifyAdequately(world, x - 1, y, z - 1, this.trunk, 1);
+ this.setBlockAndNotifyAdequately(world, x + 1, y, z + 1, this.trunk, 1);
+ this.setBlockAndNotifyAdequately(world, x - 1, y, z + 1, this.trunk, 1);
+ this.setBlockAndNotifyAdequately(world, x + 1, y, z - 1, this.trunk, 1);
+ if (random.nextInt(3) != 0)
+ {
+ this.setBlockAndNotifyAdequately(world, x - 1, y + 1, z - 1, this.trunk, 1);
+ }
+
+ if (random.nextInt(3) != 0)
+ {
+ this.setBlockAndNotifyAdequately(world, x + 1, y + 1, z + 1, this.trunk, 1);
+ }
+
+ if (random.nextInt(3) != 0)
+ {
+ this.setBlockAndNotifyAdequately(world, x - 1, y + 1, z + 1, this.trunk, 1);
+ }
+
+ if (random.nextInt(3) != 0)
+ {
+ this.setBlockAndNotifyAdequately(world, x + 1, y + 1, z - 1, this.trunk, 1);
+ }
+
+ this.setBlockAndNotifyAdequately(world, x - 2, y, z, this.trunk, 5);
+ this.setBlockAndNotifyAdequately(world, x + 2, y, z, this.trunk, 5);
+ this.setBlockAndNotifyAdequately(world, x, y, z - 2, this.trunk, 9);
+ this.setBlockAndNotifyAdequately(world, x, y, z + 2, this.trunk, 9);
+ this.setBlockAndNotifyAdequately(world, x - 2, y - 1, z, this.trunk, 1);
+ this.setBlockAndNotifyAdequately(world, x + 2, y - 1, z, this.trunk, 1);
+ this.setBlockAndNotifyAdequately(world, x, y - 1, z - 2, this.trunk, 1);
+ this.setBlockAndNotifyAdequately(world, x, y - 1, z + 2, this.trunk, 1);
+ this.setBlockAndNotifyAdequately(world, x - 1, y + (height - 4), z - 1, this.trunk, 1);
+ this.setBlockAndNotifyAdequately(world, x + 1, y + (height - 4), z + 1, this.trunk, 1);
+ this.setBlockAndNotifyAdequately(world, x - 1, y + (height - 4), z + 1, this.trunk, 1);
+ this.setBlockAndNotifyAdequately(world, x + 1, y + (height - 4), z - 1, this.trunk, 1);
+ if (random.nextInt(3) == 0)
+ {
+ this.setBlockAndNotifyAdequately(world, x - 1, y + (height - 5), z - 1, this.trunk, 1);
+ }
+
+ if (random.nextInt(3) == 0)
+ {
+ this.setBlockAndNotifyAdequately(world, x + 1, y + (height - 5), z + 1, this.trunk, 1);
+ }
+
+ if (random.nextInt(3) == 0)
+ {
+ this.setBlockAndNotifyAdequately(world, x - 1, y + (height - 5), z + 1, this.trunk, 1);
+ }
+
+ if (random.nextInt(3) == 0)
+ {
+ this.setBlockAndNotifyAdequately(world, x + 1, y + (height - 5), z - 1, this.trunk, 1);
+ }
+
+ this.setBlockAndNotifyAdequately(world, x - 2, y + (height - 4), z, this.trunk, 5);
+ this.setBlockAndNotifyAdequately(world, x + 2, y + (height - 4), z, this.trunk, 5);
+ this.setBlockAndNotifyAdequately(world, x, y + (height - 4), z - 2, this.trunk, 9);
+ this.setBlockAndNotifyAdequately(world, x, y + (height - 4), z + 2, this.trunk, 9);
+
+ WorldGenerator flowers = new WorldGenCustomFlowers(BlockRegistry.BlockNightshadeBush, 0);
+ flowers.generate(world, random, x, y, z);
+
+ return true;
+ }
+ else
+ {
+ return false;
+ }
}
}
- }
-
- /**
- * Rescales the generator settings, only used in WorldGenBigTree
- */
- public void setScale (double p_76487_1_, double p_76487_3_, double p_76487_5_)
- {
- this.heightLimitLimit = (int) (p_76487_1_ * 12.0D);
-
- if (p_76487_1_ > 0.5D)
- {
- this.leafDistanceLimit = 5;
- }
-
- this.scaleWidth = p_76487_3_;
- this.leafDensity = p_76487_5_;
- }
-
- public boolean generate (World p_76484_1_, Random p_76484_2_, int p_76484_3_, int p_76484_4_, int p_76484_5_)
- {
- this.worldObj = p_76484_1_;
- long l = p_76484_2_.nextLong();
- this.rand.setSeed(l);
- this.basePos[0] = p_76484_3_;
- this.basePos[1] = p_76484_4_;
- this.basePos[2] = p_76484_5_;
-
- if (this.heightLimit == 0)
- {
- this.heightLimit = 5 + this.rand.nextInt(this.heightLimitLimit);
- }
-
- if (!this.validTreeLocation())
- {
- this.worldObj = null; // Fix vanilla Mem leak, holds latest world
- return false;
- }
else
{
- this.generateLeafNodeList();
- this.generateLeaves();
- this.generateTrunk();
- this.generateLeafNodeBases();
- this.worldObj = null; // Fix vanilla Mem leak, holds latest world
- return true;
+ return false;
}
}
}
\ No newline at end of file
diff --git a/src/main/resources/assets/taintedmagic/lang/en_US.lang b/src/main/resources/assets/taintedmagic/lang/en_US.lang
index 2829554..d93748b 100644
--- a/src/main/resources/assets/taintedmagic/lang/en_US.lang
+++ b/src/main/resources/assets/taintedmagic/lang/en_US.lang
@@ -1,3 +1,5 @@
+#Tainted Magic English (US) localization
+
#MISC
itemGroup.TaintedMagic=Tainted Magic
@@ -9,10 +11,11 @@ text.voidtouched=Voidtouched
text.attackdamageequipped=Attack Damage (When Equipped)
text.attackdamage=Attack Damage
text.radius=Block Radius
-text.burnTime=Burn Time
text.eldritchsapping=Eldritch Sapping
+death.attack.nightshade=%1$s was poisoned by Nightshade Berries.
+
#FOCI
item.ItemFocusShockwave.name=Wand Focus: Shockwave
@@ -42,44 +45,51 @@ focus.upgrade.diffusion.text=This upgrade will allow the focus to conjure a cons
#BLOCKS
tile.BlockShadowOre.name=Shadow Ore
-tile.BlockWarpwoodLog.name=Warpwood
+tile.BlockWarpwoodLog.name=Warpwood Log
tile.BlockWarpwoodSapling.name=Warpwood Sapling
-tile.BlockWarpwoodLeaves.name=Warped Leaves
-tile.BlockShadowmetal.name=Block of Shadowmetal
+tile.BlockWarpwoodLeaves.name=Warpwood Leaves
+tile.BlockShadowmetal.name=Block of Shadow Metal
tile.BlockWarpwoodPlanks.name=Warpwood Planks
tile.BlockLumos.name=Lumos
+tile.BlockNightshadeBush.name=Atropa Belladonna
#ITEMS
-item.ItemMaterial.0.name=Shadowmetal Ingot
-item.ItemMaterial.1.name=Shadow-Imbued Cloth
-item.ItemMaterial.2.name=Crimson-Stained Cloth
-item.ItemMaterial.3.name=Warped Shard
-item.ItemMaterial.4.name=Fluxed Shard
+item.ItemMaterial.0.name=Shadow Metal Ingot
+item.ItemMaterial.1.name=Shadow-imbued Cloth
+item.ItemMaterial.2.name=Crimson-stained Cloth
+item.ItemMaterial.3.name=Warped Unbalanced Shard
+item.ItemMaterial.4.name=Tainted Unbalanced Shard
item.ItemMaterial.5.name=Shard of Creation
-text.shard.1=The veil between worlds wavers as
-text.shard.2=you look into its crystalline surface.
-item.ItemMaterial.6.name=Thaumic Alloy
-item.ItemMaterial.7.name=Phial of Crimson Blood
-item.ItemMaterial.8.name=Crimson Plating
-item.ItemMaterial.9.name=Shadowmetal Nugget
-item.ItemMaterial.10.name=Primordial Nodule
-item.ItemMaterial.11.name=Primordial Mote
-item.ItemMaterial.12.name=Fragment of Creation
+text.shard.1=The key to how it all came to be.
+item.ItemMaterial.6.name=Thaumic Alloy Plate
+item.ItemMaterial.7.name=Crimson Alloy Plate
+item.ItemMaterial.8.name=Shadow Metal Nugget
+item.ItemMaterial.9.name=Primordial Nodule
+item.ItemMaterial.10.name=Primordial Mote
+item.ItemMaterial.11.name=Fragment of Creation
+item.ItemMaterial.12.name=Warping Fertilizer
-item.ItemVoidsentBlood.name=Phial of Voidsent Blood
+item.ItemNightshadeBerries.name=Nightshade Berries
+item.ItemVoidsentBlood.name=Phial of Void-infused Blood
+item.ItemCrimsonBlood.name=Phial of Crimson Blood
item.ItemHollowDagger.name=Hollow Dagger
item.ItemMagicFunguar.name=Magic Funguar
item.ItemFlyteCharm.name=Flyte Charm
item.ItemLumosRing.name=Ring of Lumos
+item.ItemGatekey.name=Celestial Gatekey
+gatekey.bound=Bound
+gatekey.inactive=Inactive
+gatekey.error=Destination obstructed
+gatekey.invaliddim=Invalid dimension
item.ItemSalis.0.name=Salis Tempestas
item.ItemSalis.1.name=Salis Aevus
item.ItemVoidwalkerSash.name=Voidwalker's Sash of Runic Shielding
-text.sash.on=ENABLED
-text.sash.off=DISABLED
-text.sash.mode=Speed boost:
+text.sash.mode=Speed boost
+text.sash.on=enabled
+text.sash.off=disabled
item.ItemVoidwalkerBoots.name=Boots of the Voidwalker
@@ -88,9 +98,9 @@ item.ItemVoidmetalGoggles.name=Voidmetal Goggles of Revealing
item.ItemKatana.0.name=Thaumium Fortress Blade
item.ItemKatana.1.name=Voidmetal Fortress Blade
-item.ItemKatana.2.name=Shadowmetal Fortress Blade
+item.ItemKatana.2.name=Shadow Metal Fortress Blade
text.katana.inscription.0=Volcanic Inscription
-text.katana.inscription.1=Tainted Inscription
+text.katana.inscription.1=Thunderclap Inscription
text.katana.inscription.2=Undead Inscription
item.ItemVoidFortressHelmet.name=Void Fortress Helm
@@ -105,11 +115,11 @@ text.disassembler.fast=Fast
text.disassembler.slow=Slow
text.disassembler.off=Off
-item.ItemShadowmetalPick.name=Shadowmetal Pickaxe
-item.ItemShadowmetalAxe.name=Shadowmetal Hatchet
-item.ItemShadowmetalHoe.name=Shadowmetal Hoe
-item.ItemShadowmetalSpade.name=Shadowmetal Spade
-item.ItemShadowmetalSword.name=Shadowmetal Sword
+item.ItemShadowmetalPick.name=Shadow Metal Pickaxe
+item.ItemShadowmetalAxe.name=Shadow Metal Hatchet
+item.ItemShadowmetalHoe.name=Shadow Metal Hoe
+item.ItemShadowmetalSpade.name=Shadow Metal Spade
+item.ItemShadowmetalSword.name=Shadow Metal Blade
item.ItemPrimordialEdge.name=Edge of the Primordials
@@ -122,298 +132,265 @@ item.ItemShadowFortressLeggings.name=Shadow Fortress Thigh Guards
item.ItemWandRod.0.name=Warpwood Rod
item.ItemWandRod.1.name=Warpwood Staff Core
-item.ItemWandCap.0.name=Shadowmetal Cap
+item.ItemWandCap.0.name=Shadow Metal Cap
item.ItemWandCap.1.name=Enchanted Cloth Cap
-item.ItemWandCap.2.name=Crimson-Stained Cloth Cap
-item.ItemWandCap.3.name=Shadow-Imbued Cloth Cap
+item.ItemWandCap.2.name=Crimson-stained Cloth Cap
+item.ItemWandCap.3.name=Shadow-imbued Cloth Cap
item.Wand.warpwood.rod=Warpwood
-item.Wand.shadowmetal.cap=Shadowmetal Attuned
-item.Wand.cloth.cap=Satin Entwined
-item.Wand.crimsoncloth.cap=Crimson Stained
-item.Wand.shadowcloth.cap=Shadow Entangled
+item.Wand.shadowmetal.cap=Shadow Metal Attuned
+item.Wand.cloth.cap=Satin-tied
+item.Wand.crimsoncloth.cap=Crimson-stained
+item.Wand.shadowcloth.cap=Shadow-imbued
-#RESEARCH=========================================================================================================================================
+#RESEARCH ----------------------------------------------------------------------------------------------------------------------
-tc.research_category.TM=Maleficia
+tc.research_category.TAINTEDMAGIC=Obscura
#TAINTEDMAGIC
-
tm.name.TAINTEDMAGIC=A Disturbing Find
tm.tag.TAINTEDMAGIC=Who wrote this?
-tm.text.TAINTEDMAGIC.1=While you were out and about gathering magical knowledge, you came across something rather disturbing: a blood-stained, ripped page from another Thaumaturge’s Thaumonomicon. From your understanding, it gives an ideal for a darker side of magic...
The 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?
+tm.text.TAINTEDMAGIC.1=While you were exploring the world and gathering magical knowledge, you came across something rather disturbing: a blood-stained page that seems to be from a Thaumonomicon. From your understanding, it presents an ideal for a darker type of magic.
The darkness intrigues you, even though it ensues a dangerous path. The thought of an adventure into the unknown excites you.
The page is still unclear, you can only make out bits and pieces. You feel it in your very soul; one day, you will decipher this page and have a newfound mastery...one day...
+tm.text.TAINTEDMAGIC.2=
taintedmagic:textures/misc/p_taintedmagic.png:0:255:255:255:.5
Who wrote this?
#SHADOWMETAL
-
-tm.name.SHADOWMETAL=Shadowmetal
+tm.name.SHADOWMETAL=Shadow Metal
tm.tag.SHADOWMETAL=An accidental discovery
-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 stone into the bubbling mess. The result was Shadowmetal Ore.
All it took was a mundane furnace to smelt it, resulting in a Shadowmetal Ingot. It is extremely heavy and seems very durable. Nonetheless, you think you will need to research some more to find out if it will be useful.
§oYou listen closely and hear a dull, incomprehensible whisper coming from within this strange substance. Are you crazy? Who knows.
+tm.text.SHADOWMETAL.1=Once upon a time you were transmuting §osomething§r in your crucible. After severely botching a recipe, in panic, you accidentally dropped a chunk of stone into the bubbling mess. Out came a new and mysterious metallic ore. You have decided to name it Shadow Metal.
A mundane furnace seems to do a fine job smelting it into Shadow Metal Ingots. It is extremely heavy and seems very durable. You think you will need to conduct more research to find out if it will be useful.
§oYou place your ear against this strange metal and hear a quiet, incomprehensible whisper. Are you going mad? Who knows.
#CAP_shadowmetal
-
-tm.name.CAP_shadowmetal=Shadowmetal Wand Caps
+tm.name.CAP_shadowmetal=Shadow Metal Wand Caps
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.
+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 Shadow Metal, as well as the primal aspects of a Primordial Pearl. This proved very successful.
The Shadow Metal Caps are extremely efficient at channeling vis, and will grant a hefty 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 this question.
Using the Pearl as a source of power, a Zombie Brain to contain the warp, and some other magical materials, you have created the most powerful wand rod.
The wood proves to be perfect for Wandcraft as it very dense, 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 user's own warp reacts with this rod. Vis is created from this reaction and is stored within your wand. The more warp you amass, the greater the reactivity, and the faster your wand recharges.
Seeing as it wards off all warp effects, The Warp Ward buff seems to negate the reaction completely.
§oToday my wand started whispering strangely to me. My wand grows stronger...as if it is an extension of myself.
+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 this question.
Using the Pearl as a source of power, a Zombie Brain to contain the warp, and some other magical materials, you have created the most powerful wand rod.
The wood proves to be perfect for Wandcraft as it very dense, 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 user's own warp reacts with this rod. vis is created from this reaction and is stored within your wand. The more warp you amass, the greater the reactivity, and the faster your wand recharges.
Seeing as it wards off all warp effects, The Warp Ward buff seems to negate the reaction completely.
§oToday my wand started whispering strangely to me. My wand grows stronger...as if it is an extension of myself.
#ROD_warpwood_staff
-
tm.name.ROD_warpwood_staff=Warpwood Staff Core
-tm.tag.ROD_warpwood_staff=it's not always clear why.
-tm.text.ROD_warpwood_staff.1=After having become quite acquainted with your Warpwood Wand, it was no struggle to create a staff from Warpwood as well.
The same vis-generating traits apply, and this staff core offers enough space to store 500 primal vis.
+tm.tag.ROD_warpwood_staff=... it's not always clear why.
+tm.text.ROD_warpwood_staff.1=After having become quite acquainted with your Warpwood Wand, it was no struggle to create a staff from Warpwood as well.
The same vis-generating traits apply, and this staff core offers enough space to store 500 of each primal vis.
-#EVILSHARDS
-
-tm.name.EVILSHARDS=Unbalanced Shards
-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.
+#UNBALANCEDSHARDS
+tm.name.UNBALANCEDSHARDS=Unbalanced Shards
+tm.tag.UNBALANCEDSHARDS=A heartbeat without harmony
+tm.text.UNBALANCEDSHARDS.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 Tainted Shards, and Warped Shards.
#CRIMSONROBES
-
-tm.name.CRIMSONROBES=Crimson Seamstry
+tm.name.CRIMSONROBES=Crimson Clothcraft
tm.tag.CRIMSONROBES=Red like roses
-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.
+tm.text.CRIMSONROBES.1=By staining some Enchanted Fabric with Crimson Blood, you have perfectly replicated the mysterious material from which the Crimson Cult makes their robes.
Using Crimson-stained Cloth (see right), and some other mundane materials, you were able to reproduce all of the various robe pieces worn by a Crimson Cleric. Their recipes are inscribed on the following pages.
#VOIDFORTRESS
-
-tm.name.VOIDFORTRESS=Void Fortress Armor
+tm.name.VOIDFORTRESS=Void Fortress Armour
tm.tag.VOIDFORTRESS=Nothing is getting out
-tm.text.VOIDFORTRESS.1=This is a simple improvement on the concepts laid down by the discovery of fortress armor. By using Void Metal instead of Thaumium you are not only increasing the effectiveness of the armor, but also it's durability.
Of course some people claim that wearing such a large amount of Void metal is probably not good, but there will always be doubters and they should be ignored. You find the dull ache that settles into your bones as you wear it comforting.
Like normal fortress armor this armor can be enhanced by various different faceplates and modifications.
+tm.text.VOIDFORTRESS.1=Using the same design principles with which you crafted Thaumium Fortress Armour, you have fashioned a similar set from Void Metal. By using Void Metal instead of Thaumium, not only did you increase the effectiveness of the armour, but also it's durability. Like anything made primarily from Void Metal, this armour will repair itself over time.
Of course some people claim that wearing such a large amount of Void metal is probably not good, but there will always be doubters and they should be ignored. You find the dull ache that settles into your bones as you wear it comforting.
Like normal fortress armour this armour can be enhanced by various different faceplates and modifications.
#WARPEDGOGGLES
-
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 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?
+tm.text.WARPEDGOGGLES.1=By infusing your Goggles of Revealing with Shadow Metal and a bit of Ethereal Essence you have solved an everlasting problem.
A thaumaturge like yourself must choose between function and protection. By using Shadow Metal to strengthen your goggles, they now offer better protection.
§oIt seems that one of the lenses became clouded over...causing you to have strange visions at times. But no problem, it could be worse, right?
#TAINTFOCUS
-
tm.name.TAINTFOCUS=Wand Focus: Taint Swarm
tm.tag.TAINTFOCUS=A curious familiar
-tm.text.TAINTFOCUS.1=Using your knowledge of tainted creatures, you have created a wand focus to summon a Taint Swarm to fight alongside you. The swarm will be bound to and will attack whichever enemy you are looking at when you cast the focus. If the target dies, or mysteriously disappears, the swarm will die as well.
Take necessary precautions when using this focus, as it isn't uncommon to contract various taint-related ailments while using it.
+tm.text.TAINTFOCUS.1=By combining your knowledge of tainted creatures and wand foci, you have created a wand focus to summon a friendly Taint Swarm to fight alongside you. The swarm will attack only the enemy you are looking at when you cast the focus. If the target dies, or mysteriously disappears, the swarm will also die.
Unfortunately, it would seem that this focus does not work in "peaceful" worlds.
One should be cautious when using this focus, as it is not uncommon to contract various taint-related ailments while using it.
#ELDRITCHFOCUS
-
tm.name.ELDRITCHFOCUS=Wand Focus: Dark Matter
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!
+tm.text.ELDRITCHFOCUS.1=Using the Primordial Pearl to bend the very fabric of magic, you have created a focus with which you have the power to wield dark matter.
0This magic, it feels like nothing you have ever felt before.
§oI stare into the glossy surface of the focus and wonder - what has become of myself? Nothing can stop me... §r§lNOTHING!
+
+tm.name.DIFFUSIONUPGRADE=Tier 5 Upgrade: Diffusion
+tm.tag.DIFFUSIONUPGRADE=Crucio
+tm.text.DIFFUSIONUPGRADE.1=You have created a Tier 5 upgrade applicable to the Dark Matter focus. With this upgrade, the focus will cast a swathe of dark matter, draining the life of anything in its path.
#KNIGHTROBES
-
tm.name.KNIGHTROBES=Crimson Forgery
tm.tag.KNIGHTROBES=Knights of the Round
-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.
+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 armour 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 armour 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=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.tag.PRAETORARMOR=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 armour.
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 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=Black Veil Cloth
-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.
+tm.text.SHADOWCLOTH.1=When you first discovered Shadow Metal, 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=Cloud of Darkness
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
+#BREAKPEARL
+tm.name.BREAKPEARL=Primordial Pearl Fragmentation
+tm.tag.BREAKPEARL=Close precision
+tm.text.BREAKPEARL.1=While working with Primordial Pearls, you have noticed that you do not always require an §oentire§r pearl. To solve this problem, you have perfected a method to magically fragmentate the pearl into medium and small sized pieces.
+#CREATIONSHARD
tm.name.CREATIONSHARD=Shard of Creation
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
+#CREATION
tm.name.CREATION=Creation
tm.tag.CREATION=Ordo ab Chao
tm.text.CREATION.1=The moment you touched this new shard, a substance forged of power you barely understand, you felt something. You felt as if the entire universe had shifted.
Your body went stiff, and for the first time since you opened the Thaumonomicon, the voices... They stopped.
You saw through what the voices have always kept hidden. You saw through the lies. Through the insanity. Through the veil between worlds. You saw... §5Creation.§0
Eons ago, when the world you know was yet to exist, the formation of another universe began.
-
tm.text.CREATION.2=The primal energies, in the form of vis, flowing from beyond reality clashed, combined, and, given time, created.
A blank universe, exploding from nothing, into existence.
The energies which created this world, however, did not leave. They stayed, they twisted, and became a part of this new place, just as water or air are in your world.
If enough time is given to any universe, it will eventually develop life, and this universe was no exception. A race of beings, warped by power and twisted by magic. Every reference to them you've ever read always names them... The Eldritch.
-
tm.text.CREATION.3=Time passed, as time is prone to do, and the Eldritch developed magic. They practiced it, refined it, and it became quite similar to the Thaumaturgy you practice - except for one difference.
Warp was in every word they wrote. Twisting, fluxing, and tainting. Their magic couldn't do anything without a far greater than equal reaction.
So, they decided they would break the rules. They decided to create a new universe. A universe without their limits, without the warp their universe underwent.
They began to manipulate primal energy, clashing it into the forms that would spark and create.
-
tm.text.CREATION.4=However, right before this universe was created, they split the forces in two.
All the power of creation was shoved into one half, and the matter created into another.
They ended up with two worlds... A never ending voidscape, and the Overworld.
Nonetheless, the veil between these two worlds was weak, and the power contained within the voidscape was too dangerous to let the untrained hold.
So, the Eldritch constructed a trap. They laid out mazes upon mazes, each centered around a piece of creation... The Primordial Pearls.
-
tm.text.CREATION.5=To protect the Pearls, they created the guardians, this ensured the weak could not obtain this power, as it could be devastating if a fool were to use it incorrectly.
Eons later, here you stand; one who has marched into eternity and emerged triumphant.
You hold a piece of the power used to create the world... The Pearl.
With this piece of creation, you have forged the final piece of the puzzle - The Shard of Creation.
The limits you once were bound by have been cast aside, just as the Eldritch cast aside theirs. With this, even the gods will flee before you.
#THAUMICDISASSEMBLER
-
tm.name.THAUMICDISASSEMBLER=Thaumic Disassembler
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.
+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.
#SKYSALT
-
tm.name.SKYSALT=Salis Tempestas
-tm.tag.SKYSALT=Salt of the Sky
-tm.text.SKYSALT.1=By combining a fragment of the Shard of Creation with some other magical items, you have created a fine magical salt.
When this salt is thrown into the air, it instantly interacts with the primal aspects of the atmosphere. In the event of a storm, it will be instantly brought to a halt. If the skies are clear, they will promptly begin to rain down.
+tm.tag.SKYSALT=Rain or shine
+tm.text.SKYSALT.1=By combining a fragment of the Shard of Creation with some other magical items, you have created a fine magical salt.
When this salt is thrown into the air (via right-click), it instantly interacts with the primal aspects of the atmosphere. In the event of a storm, it will be instantly brought to a halt. If the skies are clear, they will promptly begin to rain down.
#TIMESALT
-
tm.name.TIMESALT=Salis Aevus
-tm.tag.TIMESALT=Salt of Time
-tm.text.TIMESALT.1=By combining a fragment of the Shard of Creation with some other magical items, you have created a fine magical salt.
When this salt is thrown into the air, it instantly interacts with the primal aspects of the space-time continuum. If the time is night, it will become day, and vice-versa.
+tm.tag.TIMESALT=Time Turner
+tm.text.TIMESALT.1=By combining a fragment of the Shard of Creation with some other magical items, you have created a fine magical salt.
When this salt is thrown into the air (via right-click), it instantly interacts with the primal aspects of the space-time continuum. If the time is night, it will become day, and vice-versa.
#VOIDSASH
-
tm.name.VOIDSASH=Voidwalker's Sash of Runic Shielding
tm.tag.VOIDSASH=Lightspeed
-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.
+tm.text.VOIDSASH.1=With extensive study of Runic Shielding, you had a bizarre idea.
Using Void Metal, Shadow Metal, 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.
#VISHROOMCRAFT
-
tm.name.VISHROOMCRAFT=Vishroom Transmutation
tm.tag.VISHROOMCRAFT=Pesky 'shrooms
tm.text.VISHROOMCRAFT.1=Vishrooms: 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, leaving you feeling sick.
After stepping on one-too-many of these mushrooms, you had a (likely mushroom-induced) vision. This short-lived epiphany led to you to discover a way to create Vishrooms from ordinary, mundane mushrooms. Why you might ever want to transmute Vishrooms? You have no idea.
#MAGICFUNGUAR
-
tm.name.MAGICFUNGUAR=Magic Funguar
tm.tag.MAGICFUNGUAR=Edibles
-tm.text.MAGICFUNGUAR.1=You have been experimenting with Vishrooms lately and you have come to believe that the effects they induce are not all that bad.
After combining a Vishroom with some mundane ingredients, and a magical shard, the mushroom had become §oedible.§r When eaten, you will gain research points at random, and a short burst of beneficial effects.
+tm.text.MAGICFUNGUAR.1=You have been experimenting with Vishrooms lately and you have come to believe that the effects they induce are not all that bad.
After combining a Vishroom with a magical shard, and some mundane ingredients, the mushroom became §oedible.§r When eaten, you receive a short burst of beneficial effects as well as random research points.
-#CRYSTALDAGGER
-
-tm.name.CRYSTALDAGGER=Hollow Dagger
-tm.tag.CRYSTALDAGGER=Type O-
-tm.text.CRYSTALDAGGER.1=By fashioning a dagger from a hollow Bone Rod, and some other materials, you now have an efficient way to collect blood from your enemies. If you posses an empty Glass Phial in your inventory, a phial will fill with blood upon stabbing a foe with this blade.
Upon closer inspection, you notice that this blood is not ordinary. The blood is the deepest of crimson like none you have ever seen. What is even more interesting is that this blood has similar properties to the artifacts you have previously retrieved from the Crimson Cult.
+#HOLLOWDAGGER
+tm.name.HOLLOWDAGGER=Hollow Dagger
+tm.tag.HOLLOWDAGGER=Type O-
+tm.text.HOLLOWDAGGER.1=By fashioning a dagger from a hollow Bone Rod, and some other materials, you now have an efficient way to collect blood from your enemies. If you posses an empty Glass Phial in your inventory, a phial will fill with blood upon stabbing a foe with this blade.
Upon closer inspection, you notice that this blood is not ordinary. The blood is the deepest of crimson like none you have ever seen. What is even more interesting is that this blood has similar properties to the artifacts you have previously retrieved from the Crimson Cult.
#MACEFOCUS
-
tm.name.MACEFOCUS=Wand Focus: Mage's Mace
-tm.tag.MACEFOCUS=From wizard to warrior
+tm.tag.MACEFOCUS=Requip
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 Iron, 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. 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=Samurai of the night
-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.
+#SHADOWFORTRESS
+tm.name.SHADOWFORTRESS=Shadow Fortress Armour
+tm.tag.SHADOWFORTRESS=Samurai by night
+tm.text.SHADOWFORTRESS.1=After having discovered Thaumium and Void Fortress Armour, you thought to yourself that Shadow Metal 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=Tied with a bow
-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.
+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=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=Tied with a (black) bow
-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.
+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.
#FOCUSSHOCKWAVE
-
tm.name.FOCUSSHOCKWAVE=Wand Focus: Shockwave
tm.tag.FOCUSSHOCKWAVE=Magical opposition
tm.text.FOCUSSHOCKWAVE.1=After having designed many foci, you felt the need for a focus that is defensive, rather than offensive or utile.
This focus will hurl a violent bolt of lightning to each nearby enemy, picking them up and knocking them far away from you, as well as dealing a hefty blow of damage.
#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 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...
#VOIDSENTBLOOD
-
tm.name.VOIDSENTBLOOD=Voidsent Blood
tm.tag.VOIDSENTBLOOD=Cthulhu juice
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
-
tm.name.THAUMIUMKATANA=Thaumium Fortress Blade
tm.tag.THAUMIUMKATANA=Nothing will survive
tm.text.THAUMIUMKATANA.1=Using a design similar to Thaumium Fortress Armor, you have designed a blade that will fit the set perfectly.
By improving the construction process of a Thaumium Sword, you have increased the damage it will deal. This blade will also never take damage from use.
Furthermore, you can charge your blade by holding down right click. Upon releasing, a strike will be delivered with increased damage based on how charged the blade is. At full charge, the blade has the potential to deal up to 2 times its attack damage. The blade will remain sheathed at your hip when it is not in use.
#VOIDMETALKATANA
-
tm.name.VOIDMETALKATANA=Voidmetal Fortress Blade
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.name.SHADOWMETALKATANA=Shadow Metal Fortress Blade
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.
+tm.text.SHADOWMETALKATANA.1=After having discovered Shadow Metal Fortress Armor, you were certain that you could make a Fortress Blade from Shadow Metal 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
-
tm.name.INSCRIPTIONFIRE=Volcanic Inscription
-tm.tag.INSCRIPTIONFIRE=Thaumium Fortress Blade upgrade
-tm.text.INSCRIPTIONFIRE.1=You have upgraded your Fortress Blade by inscribing runes upon it.
This inscription will convert damage dealt into fire damage, which will bypass armor. Any target hit will be set aflame.
Furthermore, when releasing a fully charged strike, an explosive fireball will be emit from your blade. One would hold down shift to cancel this effect and release a normal strike.
+tm.tag.INSCRIPTIONFIRE=Fortress Blade upgrade
+tm.text.INSCRIPTIONFIRE.1=You have upgraded your Fortress Blade by inscribing runes upon it.
This inscription will cause your blade to deal fire damage, which bypasses armor. Your target will also be set aflame.
Furthermore, when releasing a fully charged strike, an explosive fireball will be cast from your blade. One would hold down shift to cancel this effect and release a normal charged strike.
-#INSCRIPTIONTAINT
-
-tm.name.INSCRIPTIONTAINT=Tainted Inscription
-tm.tag.INSCRIPTIONTAINT=Thaumium Fortress Blade upgrade
-tm.text.INSCRIPTIONTAINT.1=You have upgraded your Fortress Blade by inscribing runes upon it.
This inscription will cause your blade to deal magic damage, bypassing armor. Anything you hit will also be inflicted with Taint Poison.
Moreover, if you release a fully charged strike, a cloud of taint will be emit from your blade. One would hold down shift to cancel this effect and release a normal strike.
+#INSCRIPTIONTHUNDER
+tm.name.INSCRIPTIONTHUNDER=Thunderclap Inscription
+tm.tag.INSCRIPTIONTHUNDER=Fortress Blade upgrade
+tm.text.INSCRIPTIONTHUNDER.1=You have upgraded your Fortress Blade by inscribing runes upon it.
This inscription will cause your blade to deal magic damage, which bypasses armor. Your target will also be inflicted with a strong Weakness effect.
Furthermore, when releasing a fully charged strike, all nearby enemies will be hurled away from you, and damaged by means of magic. One would hold down shift to cancel this effect and release a normal charged strike.
#INSCRIPTIONUNDEAD
-
tm.name.INSCRIPTIONUNDEAD=Undead Inscription
-tm.tag.INSCRIPTIONUNDEAD=Thaumium Fortress Blade upgrade
-tm.text.INSCRIPTIONUNDEAD.1=You have upgraded your Fortress Blade by inscribing runes upon it.
This inscription inscribes a formula to deal withering damage, which bypasses armor. Your target will also be inflicted a withering damage over time.
In addition, when releasing a fully charged strike on a target, you will be healed for 25% of damage dealt.
+tm.tag.INSCRIPTIONUNDEAD=Fortress Blade upgrade
+tm.text.INSCRIPTIONUNDEAD.1=You have upgraded your Fortress Blade by inscribing runes upon it.
This inscription will cause your blade to deal withering damage, which bypasses armor. Your target will also be inflicted with withering damage over time.
Furthermore, when releasing a fully charged strike, you will be healed for 25% of damage dealt.
#VOIDGOGGLES
-
tm.name.VOIDGOGGLES=Voidmetal Goggles of Revealing
tm.tag.VOIDGOGGLES=Madmen know nothing
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.
#FOCUSLUMOS
-
tm.name.FOCUSLUMOS=Wand Focus: Lumos
tm.tag.FOCUSLUMOS=It's LeviOsa not LevioSA
-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.
+tm.text.FOCUSLUMOS.1=You have designed a focus which converts vis into light.
Simply point 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.
Furthermore, while this focus is equipped, your wand will light the area around you.
#LUMOSRING
-
tm.name.LUMOSRING=Ring of Lumos
tm.tag.LUMOSRING=Lighting the way
-tm.text.LUMOSRING.1=PLACEHOLD
+tm.text.LUMOSRING.1=You have created a ring using the Lumos focus. When the Ring of Lumos is equipped, the area around you will be perpetually illuminated.
#FLYTECHARM
tm.name.FLYTECHARM=Flyte Charm
tm.tag.FLYTECHARM=The spiders of Aurum
tm.text.FLYTECHARM.1=By infusing an Air Arrow with a Shard of Creation - and some other magical objects - you have created a powerful charm which allows the user to fly.
While you have the charm stored in your inventory, you will be granted Flyte at the cost of some Aer vis from your inventory. About 0.1 per tick while flying.
Furthermore, while flying, you can press your Sprint key to burst forward at the cost of some Ignis vis. While falling, press your Sneak key to glide gently to the ground.
+
+#GATEKEY
+tm.name.GATEKEY=Celestial Gatekey
+tm.tag.GATEKEY=The 13th gate
+tm.text.GATEKEY.1=You have designed a key which opens a gate, acting as a 'shortcut' between two points in your world. The Celestial Gatekey allows you to teleport back to a bound return point. Unfortunately, interdimensional travel is impossible using this device.
To bind the key's return point, one would right-click on the block they wish to return to. Once bound, the key's bow will take on a unique colour and will be §opermanently§r bound to this location.
To return to the specified location, one must simply hold right-click for a few seconds with the item in hand.
diff --git a/src/main/resources/assets/taintedmagic/textures/blocks/BlockNightshadeBush.png b/src/main/resources/assets/taintedmagic/textures/blocks/BlockNightshadeBush.png
new file mode 100644
index 0000000..4b0a07f
Binary files /dev/null and b/src/main/resources/assets/taintedmagic/textures/blocks/BlockNightshadeBush.png differ
diff --git a/src/main/resources/assets/taintedmagic/textures/blocks/BlockWarpwoodLeaves_opaque.png b/src/main/resources/assets/taintedmagic/textures/blocks/BlockWarpwoodLeaves_opaque.png
index ea68aa5..420462d 100644
Binary files a/src/main/resources/assets/taintedmagic/textures/blocks/BlockWarpwoodLeaves_opaque.png and b/src/main/resources/assets/taintedmagic/textures/blocks/BlockWarpwoodLeaves_opaque.png differ
diff --git a/src/main/resources/assets/taintedmagic/textures/blocks/BlockWarpwoodLeaves_transparent.png b/src/main/resources/assets/taintedmagic/textures/blocks/BlockWarpwoodLeaves_transparent.png
index 2e9b921..c07be27 100644
Binary files a/src/main/resources/assets/taintedmagic/textures/blocks/BlockWarpwoodLeaves_transparent.png and b/src/main/resources/assets/taintedmagic/textures/blocks/BlockWarpwoodLeaves_transparent.png differ
diff --git a/src/main/resources/assets/taintedmagic/textures/blocks/BlockWarpwoodLog_side.png b/src/main/resources/assets/taintedmagic/textures/blocks/BlockWarpwoodLog_side.png
index 8df2abb..530ae2f 100644
Binary files a/src/main/resources/assets/taintedmagic/textures/blocks/BlockWarpwoodLog_side.png and b/src/main/resources/assets/taintedmagic/textures/blocks/BlockWarpwoodLog_side.png differ
diff --git a/src/main/resources/assets/taintedmagic/textures/blocks/BlockWarpwoodLog_sideold.png b/src/main/resources/assets/taintedmagic/textures/blocks/BlockWarpwoodLog_sideold.png
new file mode 100644
index 0000000..e55bd9d
Binary files /dev/null and b/src/main/resources/assets/taintedmagic/textures/blocks/BlockWarpwoodLog_sideold.png differ
diff --git a/src/main/resources/assets/taintedmagic/textures/blocks/BlockWarpwoodLog_top.png b/src/main/resources/assets/taintedmagic/textures/blocks/BlockWarpwoodLog_top.png
index 7a99fc4..91831ab 100644
Binary files a/src/main/resources/assets/taintedmagic/textures/blocks/BlockWarpwoodLog_top.png and b/src/main/resources/assets/taintedmagic/textures/blocks/BlockWarpwoodLog_top.png differ
diff --git a/src/main/resources/assets/taintedmagic/textures/blocks/BlockWarpwoodPlanks.png b/src/main/resources/assets/taintedmagic/textures/blocks/BlockWarpwoodPlanks.png
index 5cafc8e..a882c72 100644
Binary files a/src/main/resources/assets/taintedmagic/textures/blocks/BlockWarpwoodPlanks.png and b/src/main/resources/assets/taintedmagic/textures/blocks/BlockWarpwoodPlanks.png differ
diff --git a/src/main/resources/assets/taintedmagic/textures/blocks/BlockWarpwoodSapling.png b/src/main/resources/assets/taintedmagic/textures/blocks/BlockWarpwoodSapling.png
index 09fbbf7..77fdd2d 100644
Binary files a/src/main/resources/assets/taintedmagic/textures/blocks/BlockWarpwoodSapling.png and b/src/main/resources/assets/taintedmagic/textures/blocks/BlockWarpwoodSapling.png differ
diff --git a/src/main/resources/assets/taintedmagic/textures/foci/IconAntibody.png b/src/main/resources/assets/taintedmagic/textures/foci/IconAntibody.png
index b4fc96e..60e407e 100644
Binary files a/src/main/resources/assets/taintedmagic/textures/foci/IconAntibody.png and b/src/main/resources/assets/taintedmagic/textures/foci/IconAntibody.png differ
diff --git a/src/main/resources/assets/taintedmagic/textures/foci/IconSanity.png b/src/main/resources/assets/taintedmagic/textures/foci/IconSanity.png
index c16f78d..1d82df2 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/gui/GUIThaumonomiconTab.png b/src/main/resources/assets/taintedmagic/textures/gui/gui_tm_researchback.png
similarity index 100%
rename from src/main/resources/assets/taintedmagic/textures/gui/GUIThaumonomiconTab.png
rename to src/main/resources/assets/taintedmagic/textures/gui/gui_tm_researchback.png
diff --git a/src/main/resources/assets/taintedmagic/textures/gui/GUIThaumonomiconTab.png.mcmeta b/src/main/resources/assets/taintedmagic/textures/gui/gui_tm_researchback.png.mcmeta
similarity index 100%
rename from src/main/resources/assets/taintedmagic/textures/gui/GUIThaumonomiconTab.png.mcmeta
rename to src/main/resources/assets/taintedmagic/textures/gui/gui_tm_researchback.png.mcmeta
diff --git a/src/main/resources/assets/taintedmagic/textures/items/ItemCrimsonBlood.png b/src/main/resources/assets/taintedmagic/textures/items/ItemCrimsonBlood.png
new file mode 100644
index 0000000..b2f2c4f
Binary files /dev/null and b/src/main/resources/assets/taintedmagic/textures/items/ItemCrimsonBlood.png differ
diff --git a/src/main/resources/assets/taintedmagic/textures/items/ItemFocusMageMace_orn.png b/src/main/resources/assets/taintedmagic/textures/items/ItemFocusMageMace_orn.png
index 4e44464..7f7f241 100644
Binary files a/src/main/resources/assets/taintedmagic/textures/items/ItemFocusMageMace_orn.png and b/src/main/resources/assets/taintedmagic/textures/items/ItemFocusMageMace_orn.png differ
diff --git a/src/main/resources/assets/taintedmagic/textures/items/ItemGatekey.png b/src/main/resources/assets/taintedmagic/textures/items/ItemGatekey.png
new file mode 100644
index 0000000..870ab94
Binary files /dev/null and b/src/main/resources/assets/taintedmagic/textures/items/ItemGatekey.png differ
diff --git a/src/main/resources/assets/taintedmagic/textures/items/ItemGatekey_overlay.png b/src/main/resources/assets/taintedmagic/textures/items/ItemGatekey_overlay.png
new file mode 100644
index 0000000..d0fcbb6
Binary files /dev/null and b/src/main/resources/assets/taintedmagic/textures/items/ItemGatekey_overlay.png differ
diff --git a/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial10.png b/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial10.png
index 4c39f95..7368f09 100644
Binary files a/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial10.png and b/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial10.png differ
diff --git a/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial10.png.mcmeta b/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial10.png.mcmeta
index f6e326d..4f0718a 100644
--- a/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial10.png.mcmeta
+++ b/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial10.png.mcmeta
@@ -1,4 +1,3 @@
{
- "animation": {
- }
-}
+ "animation": {}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial11.png b/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial11.png
index 7368f09..0a4cf6a 100644
Binary files a/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial11.png and b/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial11.png differ
diff --git a/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial11.png.mcmeta b/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial11.png.mcmeta
index 4f0718a..3d7625c 100644
--- a/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial11.png.mcmeta
+++ b/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial11.png.mcmeta
@@ -1,3 +1,6 @@
{
- "animation": {}
+ "animation":
+ {
+ "frametime": 2
+ }
}
\ No newline at end of file
diff --git a/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial12.png b/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial12.png
index 0a4cf6a..505b0cc 100644
Binary files a/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial12.png and b/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial12.png differ
diff --git a/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial12.png.mcmeta b/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial12.png.mcmeta
deleted file mode 100644
index 3d7625c..0000000
--- a/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial12.png.mcmeta
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "animation":
- {
- "frametime": 2
- }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial3.png b/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial3.png
index 625fe9c..74b5646 100644
Binary files a/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial3.png and b/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial3.png differ
diff --git a/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial6.png b/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial6.png
index 3b6e82f..e42aeef 100644
Binary files a/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial6.png and b/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial6.png differ
diff --git a/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial7.png b/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial7.png
index b2f2c4f..e7792ed 100644
Binary files a/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial7.png and b/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial7.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 60a3e8e..3c96a9f 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
index 3c96a9f..4c39f95 100644
Binary files a/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial9.png and b/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial9.png differ
diff --git a/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial9.png.mcmeta b/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial9.png.mcmeta
new file mode 100644
index 0000000..f6e326d
--- /dev/null
+++ b/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial9.png.mcmeta
@@ -0,0 +1,4 @@
+{
+ "animation": {
+ }
+}
diff --git a/src/main/resources/assets/taintedmagic/textures/items/ItemNightshadeBerries.png b/src/main/resources/assets/taintedmagic/textures/items/ItemNightshadeBerries.png
new file mode 100644
index 0000000..e90ed66
Binary files /dev/null and b/src/main/resources/assets/taintedmagic/textures/items/ItemNightshadeBerries.png differ
diff --git a/src/main/resources/assets/taintedmagic/textures/misc/IconCREATION.png b/src/main/resources/assets/taintedmagic/textures/misc/IconCREATION.png
deleted file mode 100644
index 9e93ddd..0000000
Binary files a/src/main/resources/assets/taintedmagic/textures/misc/IconCREATION.png and /dev/null differ
diff --git a/src/main/resources/assets/taintedmagic/textures/misc/IconINSCRIPTIONFIRE.png b/src/main/resources/assets/taintedmagic/textures/misc/IconINSCRIPTIONFIRE.png
deleted file mode 100644
index ccc34ab..0000000
Binary files a/src/main/resources/assets/taintedmagic/textures/misc/IconINSCRIPTIONFIRE.png and /dev/null differ
diff --git a/src/main/resources/assets/taintedmagic/textures/misc/IconINSCRIPTIONTAINT.png b/src/main/resources/assets/taintedmagic/textures/misc/IconINSCRIPTIONTAINT.png
deleted file mode 100644
index d8ca6f1..0000000
Binary files a/src/main/resources/assets/taintedmagic/textures/misc/IconINSCRIPTIONTAINT.png and /dev/null differ
diff --git a/src/main/resources/assets/taintedmagic/textures/misc/IconINSCRIPTIONUNDEAD.png b/src/main/resources/assets/taintedmagic/textures/misc/IconINSCRIPTIONUNDEAD.png
deleted file mode 100644
index a644a50..0000000
Binary files a/src/main/resources/assets/taintedmagic/textures/misc/IconINSCRIPTIONUNDEAD.png and /dev/null differ
diff --git a/src/main/resources/assets/taintedmagic/textures/misc/PageTAINTEDMAGIC.png b/src/main/resources/assets/taintedmagic/textures/misc/p_taintedmagic.png
similarity index 100%
rename from src/main/resources/assets/taintedmagic/textures/misc/PageTAINTEDMAGIC.png
rename to src/main/resources/assets/taintedmagic/textures/misc/p_taintedmagic.png
diff --git a/src/main/resources/assets/taintedmagic/textures/misc/r_creation.png b/src/main/resources/assets/taintedmagic/textures/misc/r_creation.png
new file mode 100644
index 0000000..a54a7fd
Binary files /dev/null and b/src/main/resources/assets/taintedmagic/textures/misc/r_creation.png differ
diff --git a/src/main/resources/assets/taintedmagic/textures/misc/r_creation_1.png b/src/main/resources/assets/taintedmagic/textures/misc/r_creation_1.png
new file mode 100644
index 0000000..3f536ce
Binary files /dev/null and b/src/main/resources/assets/taintedmagic/textures/misc/r_creation_1.png differ
diff --git a/src/main/resources/assets/taintedmagic/textures/misc/r_fire.png b/src/main/resources/assets/taintedmagic/textures/misc/r_fire.png
new file mode 100644
index 0000000..a5be874
Binary files /dev/null and b/src/main/resources/assets/taintedmagic/textures/misc/r_fire.png differ
diff --git a/src/main/resources/assets/taintedmagic/textures/misc/r_thunder.png b/src/main/resources/assets/taintedmagic/textures/misc/r_thunder.png
new file mode 100644
index 0000000..fe4eb3e
Binary files /dev/null and b/src/main/resources/assets/taintedmagic/textures/misc/r_thunder.png differ
diff --git a/src/main/resources/assets/taintedmagic/textures/misc/r_undead.png b/src/main/resources/assets/taintedmagic/textures/misc/r_undead.png
new file mode 100644
index 0000000..e47b028
Binary files /dev/null and b/src/main/resources/assets/taintedmagic/textures/misc/r_undead.png differ
diff --git a/src/main/resources/assets/taintedmagic/textures/misc/tab_tm.png b/src/main/resources/assets/taintedmagic/textures/misc/tab_tm.png
new file mode 100644
index 0000000..6cdc841
Binary files /dev/null and b/src/main/resources/assets/taintedmagic/textures/misc/tab_tm.png differ
diff --git a/src/main/resources/assets/taintedmagic/textures/misc/tab_tm_1.png b/src/main/resources/assets/taintedmagic/textures/misc/tab_tm_1.png
new file mode 100644
index 0000000..607b556
Binary files /dev/null and b/src/main/resources/assets/taintedmagic/textures/misc/tab_tm_1.png differ
diff --git a/src/main/resources/assets/taintedmagic/textures/misc/tab_tm_2.png b/src/main/resources/assets/taintedmagic/textures/misc/tab_tm_2.png
new file mode 100644
index 0000000..7ae1c8f
Binary files /dev/null and b/src/main/resources/assets/taintedmagic/textures/misc/tab_tm_2.png differ
diff --git a/src/main/resources/assets/taintedmagic/textures/misc/tab_tm_3.png b/src/main/resources/assets/taintedmagic/textures/misc/tab_tm_3.png
new file mode 100644
index 0000000..ffa6399
Binary files /dev/null and b/src/main/resources/assets/taintedmagic/textures/misc/tab_tm_3.png differ
diff --git a/src/main/resources/assets/taintedmagic/textures/misc/tab_tm_alt1.png b/src/main/resources/assets/taintedmagic/textures/misc/tab_tm_alt1.png
new file mode 100644
index 0000000..903909b
Binary files /dev/null and b/src/main/resources/assets/taintedmagic/textures/misc/tab_tm_alt1.png differ
diff --git a/src/main/resources/assets/taintedmagic/textures/misc/IconThaumonomiconTab.png b/src/main/resources/assets/taintedmagic/textures/misc/tab_tm_old.png
similarity index 100%
rename from src/main/resources/assets/taintedmagic/textures/misc/IconThaumonomiconTab.png
rename to src/main/resources/assets/taintedmagic/textures/misc/tab_tm_old.png
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 988e8cd..f6a49ee 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
diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info
index ebe81ce..93a5288 100644
--- a/src/main/resources/mcmod.info
+++ b/src/main/resources/mcmod.info
@@ -2,13 +2,13 @@
{
"modid": "TaintedMagic",
"name": "Tainted Magic",
- "description": "An intercrete addon to Thaumcraft 4 that elaborates the darker nuances of Thaumaturgy.",
+ "description": "Tainted Magic is an addon to Thaumcraft 4 which focuses on the dark side of Thaumaturgy.",
"version": "r7.82",
"mcversion": "1.7.10",
"url": "http://bitly.com/1HV2VSK",
"updateUrl": "",
"authorList": ["John Yorke (yorkemc)"],
- "credits": "John Yorke (yorkemc), and special thanks to FastieTheWolf and RapidMelons",
+ "credits": "Special thanks to FastieTheWolf, RapidMelons and wiiv.",
"logoFile": "TaintedMagic.png",
"screenshots": [],
"dependencies": []
diff --git a/tainted_magic_logo.png b/tainted_magic_logo.png
new file mode 100644
index 0000000..6873ada
Binary files /dev/null and b/tainted_magic_logo.png differ