etc/BiomesOPlenty
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Updated to an experimental Thaumcraft 3.1 API

Browse source
This commit is contained in:
Adubbz 2013-08-28 18:32:01 +10:00
parent 3e7eceb3f7
commit 39ee1ed874
42 changed files with 3185 additions and 2950 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

312
src/minecraft/biomesoplenty/integration/ThaumcraftIntegration.java
View file

@ -1,9 +1,9 @@
package biomesoplenty.integration; package biomesoplenty.integration;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import thaumcraft.api.EnumTag;
import thaumcraft.api.ObjectTags;
import thaumcraft.api.ThaumcraftApi; import thaumcraft.api.ThaumcraftApi;
import thaumcraft.api.aspects.Aspect;
import thaumcraft.api.aspects.AspectList;
import biomesoplenty.api.BlockReferences; import biomesoplenty.api.BlockReferences;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.api.Fluids; import biomesoplenty.api.Fluids;
@ -28,192 +28,192 @@ public class ThaumcraftIntegration {
private static void addAspects() private static void addAspects()
{ {
//TODO: Ensure all tags are balanced (Logs shouldn't give more light when turned into planks) //TODO: Compare against Thaumcraft 3.1 defaults and check balancing
//Woods //Woods
ThaumcraftApi.registerObjectTag(getBID("acaciaLog"), getBMeta("acaciaLog"), (new ObjectTags()).add(EnumTag.WOOD, 8)); ThaumcraftApi.registerObjectTag(getBID("acaciaLog"), getBMeta("acaciaLog"), (new AspectList()).add(Aspect.TREE, 4));
ThaumcraftApi.registerObjectTag(getBID("cherryLog"), getBMeta("cherryLog"), (new ObjectTags()).add(EnumTag.WOOD, 8)); ThaumcraftApi.registerObjectTag(getBID("cherryLog"), getBMeta("cherryLog"), (new AspectList()).add(Aspect.TREE, 4));
ThaumcraftApi.registerObjectTag(getBID("darkLog"), getBMeta("darkLog"), (new ObjectTags()).add(EnumTag.WOOD, 8).add(EnumTag.DARK, 2)); ThaumcraftApi.registerObjectTag(getBID("darkLog"), getBMeta("darkLog"), (new AspectList()).add(Aspect.TREE, 4).add(Aspect.DARKNESS, 2));
ThaumcraftApi.registerObjectTag(getBID("firLog"), getBMeta("firLog"), (new ObjectTags()).add(EnumTag.WOOD, 8)); ThaumcraftApi.registerObjectTag(getBID("firLog"), getBMeta("firLog"), (new AspectList()).add(Aspect.TREE, 4));
ThaumcraftApi.registerObjectTag(getBID("holyLog"), getBMeta("holyLog"), (new ObjectTags()).add(EnumTag.WOOD, 8).add(EnumTag.LIGHT, 2)); ThaumcraftApi.registerObjectTag(getBID("holyLog"), getBMeta("holyLog"), (new AspectList()).add(Aspect.TREE, 4).add(Aspect.LIGHT, 2));
ThaumcraftApi.registerObjectTag(getBID("magicLog"), getBMeta("magicLog"), (new ObjectTags()).add(EnumTag.WOOD, 8).add(EnumTag.MAGIC, 2)); ThaumcraftApi.registerObjectTag(getBID("magicLog"), getBMeta("magicLog"), (new AspectList()).add(Aspect.TREE, 4).add(Aspect.MAGIC, 2));
ThaumcraftApi.registerObjectTag(getBID("mangroveLog"), getBMeta("mangroveLog"), (new ObjectTags()).add(EnumTag.WOOD, 8)); ThaumcraftApi.registerObjectTag(getBID("mangroveLog"), getBMeta("mangroveLog"), (new AspectList()).add(Aspect.TREE, 4));
ThaumcraftApi.registerObjectTag(getBID("palmLog"), getBMeta("palmLog"), (new ObjectTags()).add(EnumTag.WOOD, 8)); ThaumcraftApi.registerObjectTag(getBID("palmLog"), getBMeta("palmLog"), (new AspectList()).add(Aspect.TREE, 4));
ThaumcraftApi.registerObjectTag(getBID("redwoodLog"), getBMeta("redwoodLog"), (new ObjectTags()).add(EnumTag.WOOD, 8)); ThaumcraftApi.registerObjectTag(getBID("redwoodLog"), getBMeta("redwoodLog"), (new AspectList()).add(Aspect.TREE, 4));
ThaumcraftApi.registerObjectTag(getBID("willowLog"), getBMeta("willowLog"), (new ObjectTags()).add(EnumTag.WOOD, 8)); ThaumcraftApi.registerObjectTag(getBID("willowLog"), getBMeta("willowLog"), (new AspectList()).add(Aspect.TREE, 4));
ThaumcraftApi.registerObjectTag(getBID("pineLog"), getBMeta("pineLog"), (new ObjectTags()).add(EnumTag.WOOD, 8)); ThaumcraftApi.registerObjectTag(getBID("pineLog"), getBMeta("pineLog"), (new AspectList()).add(Aspect.TREE, 4));
ThaumcraftApi.registerObjectTag(getBID("hellBarkLog"), getBMeta("hellBarkLog"), (new ObjectTags()).add(EnumTag.WOOD, 8).add(EnumTag.FIRE, 2)); ThaumcraftApi.registerObjectTag(getBID("hellBarkLog"), getBMeta("hellBarkLog"), (new AspectList()).add(Aspect.TREE, 4).add(Aspect.FIRE, 2));
ThaumcraftApi.registerObjectTag(getBID("jacarandaLog"), getBMeta("jacarandaLog"), (new ObjectTags()).add(EnumTag.WOOD, 8)); ThaumcraftApi.registerObjectTag(getBID("jacarandaLog"), getBMeta("jacarandaLog"), (new AspectList()).add(Aspect.TREE, 4));
ThaumcraftApi.registerObjectTag(getBID("deadLog"), getBMeta("deadLog"), (new ObjectTags()).add(EnumTag.WOOD, 8)); ///Working ThaumcraftApi.registerObjectTag(getBID("deadLog"), getBMeta("deadLog"), (new AspectList()).add(Aspect.TREE, 4)); ///Working
ThaumcraftApi.registerObjectTag(getBID("bigFlowerStem"), getBMeta("bigFlowerStem"), (new ObjectTags()).add(EnumTag.FLOWER, 4).add(EnumTag.MAGIC, 1)); ThaumcraftApi.registerObjectTag(getBID("bigFlowerStem"), getBMeta("bigFlowerStem"), (new AspectList()).add(Aspect.PLANT, 4).add(Aspect.MAGIC, 1));
//Planks //Planks
ThaumcraftApi.registerObjectTag(getBID("acaciaPlank"), getBMeta("acaciaPlank"), (new ObjectTags()).add(EnumTag.WOOD, 2)); ThaumcraftApi.registerObjectTag(getBID("acaciaPlank"), getBMeta("acaciaPlank"), (new AspectList()).add(Aspect.TREE, 1));
ThaumcraftApi.registerObjectTag(getBID("cherryPlank"), getBMeta("cherryPlank"), (new ObjectTags()).add(EnumTag.WOOD, 2)); ThaumcraftApi.registerObjectTag(getBID("cherryPlank"), getBMeta("cherryPlank"), (new AspectList()).add(Aspect.TREE, 1));
ThaumcraftApi.registerObjectTag(getBID("darkPlank"), getBMeta("darkPlank"), (new ObjectTags()).add(EnumTag.WOOD, 2)/*.add(EnumTag.DARK, 1)*/); ThaumcraftApi.registerObjectTag(getBID("darkPlank"), getBMeta("darkPlank"), (new AspectList()).add(Aspect.TREE, 1)/*.add(Aspect.DARK, 1)*/);
ThaumcraftApi.registerObjectTag(getBID("firPlank"), getBMeta("firPlank"), (new ObjectTags()).add(EnumTag.WOOD, 2)); ThaumcraftApi.registerObjectTag(getBID("firPlank"), getBMeta("firPlank"), (new AspectList()).add(Aspect.TREE, 1));
ThaumcraftApi.registerObjectTag(getBID("holyPlank"), getBMeta("holyPlank"), (new ObjectTags()).add(EnumTag.WOOD, 2)/*.add(EnumTag.LIGHT, 1)*/); ThaumcraftApi.registerObjectTag(getBID("holyPlank"), getBMeta("holyPlank"), (new AspectList()).add(Aspect.TREE, 1)/*.add(Aspect.LIGHT, 1)*/);
ThaumcraftApi.registerObjectTag(getBID("magicPlank"), getBMeta("magicPlank"), (new ObjectTags()).add(EnumTag.WOOD, 2)/*.add(EnumTag.MAGIC, 1)*/); ThaumcraftApi.registerObjectTag(getBID("magicPlank"), getBMeta("magicPlank"), (new AspectList()).add(Aspect.TREE, 1)/*.add(Aspect.MAGIC, 1)*/);
ThaumcraftApi.registerObjectTag(getBID("mangrovePlank"), getBMeta("mangrovePlank"), (new ObjectTags()).add(EnumTag.WOOD, 2)); ThaumcraftApi.registerObjectTag(getBID("mangrovePlank"), getBMeta("mangrovePlank"), (new AspectList()).add(Aspect.TREE, 1));
ThaumcraftApi.registerObjectTag(getBID("palmPlank"), getBMeta("palmPlank"), (new ObjectTags()).add(EnumTag.WOOD, 2)); ThaumcraftApi.registerObjectTag(getBID("palmPlank"), getBMeta("palmPlank"), (new AspectList()).add(Aspect.TREE, 1));
ThaumcraftApi.registerObjectTag(getBID("redwoodPlank"), getBMeta("redwoodPlank"), (new ObjectTags()).add(EnumTag.WOOD, 2)); ThaumcraftApi.registerObjectTag(getBID("redwoodPlank"), getBMeta("redwoodPlank"), (new AspectList()).add(Aspect.TREE, 1));
ThaumcraftApi.registerObjectTag(getBID("willowPlank"), getBMeta("willowPlank"), (new ObjectTags()).add(EnumTag.WOOD, 2)); ThaumcraftApi.registerObjectTag(getBID("willowPlank"), getBMeta("willowPlank"), (new AspectList()).add(Aspect.TREE, 1));
ThaumcraftApi.registerObjectTag(getBID("pinePlank"), getBMeta("pinePlank"), (new ObjectTags()).add(EnumTag.WOOD, 2)); ThaumcraftApi.registerObjectTag(getBID("pinePlank"), getBMeta("pinePlank"), (new AspectList()).add(Aspect.TREE, 1));
ThaumcraftApi.registerObjectTag(getBID("hellBarkPlank"), getBMeta("hellBarkPlank"), (new ObjectTags()).add(EnumTag.WOOD, 2).add(EnumTag.FIRE, 2)); ThaumcraftApi.registerObjectTag(getBID("hellBarkPlank"), getBMeta("hellBarkPlank"), (new AspectList()).add(Aspect.TREE, 1).add(Aspect.FIRE, 2));
ThaumcraftApi.registerObjectTag(getBID("jacarandaPlank"), getBMeta("jacarandaPlank"), (new ObjectTags()).add(EnumTag.WOOD, 2)); ThaumcraftApi.registerObjectTag(getBID("jacarandaPlank"), getBMeta("jacarandaPlank"), (new AspectList()).add(Aspect.TREE, 1));
ThaumcraftApi.registerObjectTag(getBID("bambooThatching"), getBMeta("bambooThatching"), (new ObjectTags()).add(EnumTag.WATER, 14).add(EnumTag.PLANT, 14)); ThaumcraftApi.registerObjectTag(getBID("bambooThatching"), getBMeta("bambooThatching"), (new AspectList()).add(Aspect.WATER, 14).add(Aspect.PLANT, 14));
//Leaves //Leaves
ThaumcraftApi.registerObjectTag(getBID("holyLeaves"), getBMeta("holyLeaves"), (new ObjectTags()).add(EnumTag.PLANT, 1).add(EnumTag.LIGHT, 1)); ThaumcraftApi.registerObjectTag(getBID("holyLeaves"), getBMeta("holyLeaves"), (new AspectList()).add(Aspect.PLANT, 1).add(Aspect.LIGHT, 1));
ThaumcraftApi.registerObjectTag(getBID("magicLeaves"), getBMeta("magicLeaves"), (new ObjectTags()).add(EnumTag.PLANT, 1).add(EnumTag.MAGIC, 1)); ThaumcraftApi.registerObjectTag(getBID("magicLeaves"), getBMeta("magicLeaves"), (new AspectList()).add(Aspect.PLANT, 1).add(Aspect.MAGIC, 1));
ThaumcraftApi.registerObjectTag(getBID("darkLeaves"), getBMeta("darkLeaves"), (new ObjectTags()).add(EnumTag.PLANT, 1).add(EnumTag.DARK, 1)); ThaumcraftApi.registerObjectTag(getBID("darkLeaves"), getBMeta("darkLeaves"), (new AspectList()).add(Aspect.PLANT, 1).add(Aspect.DARKNESS, 1));
ThaumcraftApi.registerObjectTag(getBID("deadLeaves"), getBMeta("deadLeaves"), (new ObjectTags()).add(EnumTag.PLANT, 1).add(EnumTag.DEATH, 1)); ThaumcraftApi.registerObjectTag(getBID("deadLeaves"), getBMeta("deadLeaves"), (new AspectList()).add(Aspect.PLANT, 1).add(Aspect.DEATH, 1));
ThaumcraftApi.registerObjectTag(getBID("appleLeaves"), getBMeta("appleLeaves"), (new ObjectTags()).add(EnumTag.PLANT, 1).add(EnumTag.LIFE, 1)); ThaumcraftApi.registerObjectTag(getBID("appleLeaves"), getBMeta("appleLeaves"), (new AspectList()).add(Aspect.PLANT, 1).add(Aspect.LIFE, 1));
ThaumcraftApi.registerObjectTag(getBID("acaciaLeaves"), getBMeta("acaciaLeaves"), (new ObjectTags()).add(EnumTag.PLANT, 2)); ThaumcraftApi.registerObjectTag(getBID("acaciaLeaves"), getBMeta("acaciaLeaves"), (new AspectList()).add(Aspect.PLANT, 2));
ThaumcraftApi.registerObjectTag(getBID("firLeaves"), getBMeta("firLeaves"), (new ObjectTags()).add(EnumTag.PLANT, 2)); ThaumcraftApi.registerObjectTag(getBID("firLeaves"), getBMeta("firLeaves"), (new AspectList()).add(Aspect.PLANT, 2));
ThaumcraftApi.registerObjectTag(getBID("mangroveLeaves"), getBMeta("mangroveLeaves"), (new ObjectTags()).add(EnumTag.PLANT, 2)); ThaumcraftApi.registerObjectTag(getBID("mangroveLeaves"), getBMeta("mangroveLeaves"), (new AspectList()).add(Aspect.PLANT, 2));
ThaumcraftApi.registerObjectTag(getBID("palmLeaves"), getBMeta("palmLeaves"), (new ObjectTags()).add(EnumTag.PLANT, 2)); ThaumcraftApi.registerObjectTag(getBID("palmLeaves"), getBMeta("palmLeaves"), (new AspectList()).add(Aspect.PLANT, 2));
ThaumcraftApi.registerObjectTag(getBID("redwoodLeaves"), getBMeta("redwoodLeaves"), (new ObjectTags()).add(EnumTag.PLANT, 2)); ThaumcraftApi.registerObjectTag(getBID("redwoodLeaves"), getBMeta("redwoodLeaves"), (new AspectList()).add(Aspect.PLANT, 2));
ThaumcraftApi.registerObjectTag(getBID("willowLeaves"), getBMeta("willowLeaves"), (new ObjectTags()).add(EnumTag.PLANT, 2)); ThaumcraftApi.registerObjectTag(getBID("willowLeaves"), getBMeta("willowLeaves"), (new AspectList()).add(Aspect.PLANT, 2));
ThaumcraftApi.registerObjectTag(getBID("yellowAutumnLeaves"), getBMeta("yellowAutumnLeaves"), (new ObjectTags()).add(EnumTag.PLANT, 2)); ThaumcraftApi.registerObjectTag(getBID("yellowAutumnLeaves"), getBMeta("yellowAutumnLeaves"), (new AspectList()).add(Aspect.PLANT, 2));
ThaumcraftApi.registerObjectTag(getBID("mapleLeaves"), getBMeta("mapleLeaves"), (new ObjectTags()).add(EnumTag.PLANT, 2)); ThaumcraftApi.registerObjectTag(getBID("mapleLeaves"), getBMeta("mapleLeaves"), (new AspectList()).add(Aspect.PLANT, 2));
ThaumcraftApi.registerObjectTag(getBID("orangeAutumnLeaves"), getBMeta("orangeAutumnLeaves"), (new ObjectTags()).add(EnumTag.PLANT, 2)); ThaumcraftApi.registerObjectTag(getBID("orangeAutumnLeaves"), getBMeta("orangeAutumnLeaves"), (new AspectList()).add(Aspect.PLANT, 2));
ThaumcraftApi.registerObjectTag(getBID("pinkCherryLeaves"), getBMeta("pinkCherryLeaves"), (new ObjectTags()).add(EnumTag.PLANT, 2)); ThaumcraftApi.registerObjectTag(getBID("pinkCherryLeaves"), getBMeta("pinkCherryLeaves"), (new AspectList()).add(Aspect.PLANT, 2));
ThaumcraftApi.registerObjectTag(getBID("whiteCherryLeaves"), getBMeta("whiteCherryLeaves"), (new ObjectTags()).add(EnumTag.PLANT, 2)); ThaumcraftApi.registerObjectTag(getBID("whiteCherryLeaves"), getBMeta("whiteCherryLeaves"), (new AspectList()).add(Aspect.PLANT, 2));
ThaumcraftApi.registerObjectTag(getBID("pineLeaves"), getBMeta("pineLeaves"), (new ObjectTags()).add(EnumTag.PLANT, 2)); ThaumcraftApi.registerObjectTag(getBID("pineLeaves"), getBMeta("pineLeaves"), (new AspectList()).add(Aspect.PLANT, 2));
ThaumcraftApi.registerObjectTag(getBID("hellBarkLeaves"), getBMeta("hellBarkLeaves"), (new ObjectTags()).add(EnumTag.PLANT, 2)); ThaumcraftApi.registerObjectTag(getBID("hellBarkLeaves"), getBMeta("hellBarkLeaves"), (new AspectList()).add(Aspect.PLANT, 2));
ThaumcraftApi.registerObjectTag(getBID("jacarandaLeaves"), getBMeta("jacarandaLeaves"), (new ObjectTags()).add(EnumTag.PLANT, 2).add(EnumTag.FIRE, 2)); ThaumcraftApi.registerObjectTag(getBID("jacarandaLeaves"), getBMeta("jacarandaLeaves"), (new AspectList()).add(Aspect.PLANT, 2).add(Aspect.FIRE, 2));
ThaumcraftApi.registerObjectTag(getBID("bambooLeaves"), getBMeta("bambooLeaves"), (new ObjectTags()).add(EnumTag.PLANT, 2)); ThaumcraftApi.registerObjectTag(getBID("bambooLeaves"), getBMeta("bambooLeaves"), (new AspectList()).add(Aspect.PLANT, 2));
ThaumcraftApi.registerObjectTag(getBID("originLeaves"), getBMeta("originLeaves"), (new ObjectTags()).add(EnumTag.PLANT, 2)); ThaumcraftApi.registerObjectTag(getBID("originLeaves"), getBMeta("originLeaves"), (new AspectList()).add(Aspect.PLANT, 2));
ThaumcraftApi.registerObjectTag(getBID("appleLeavesFruitless"), getBMeta("appleLeavesFruitless"), (new ObjectTags()).add(EnumTag.PLANT, 2)); ThaumcraftApi.registerObjectTag(getBID("appleLeavesFruitless"), getBMeta("appleLeavesFruitless"), (new AspectList()).add(Aspect.PLANT, 2));
//Saplings //Saplings
ThaumcraftApi.registerObjectTag(getBID("holySapling"), getBMeta("holySapling"), (new ObjectTags()).add(EnumTag.WOOD, 4).add(EnumTag.PLANT, 2).add(EnumTag.LIGHT, 2)); ThaumcraftApi.registerObjectTag(getBID("holySapling"), getBMeta("holySapling"), (new AspectList()).add(Aspect.TREE, 2).add(Aspect.PLANT, 2).add(Aspect.LIGHT, 2));
ThaumcraftApi.registerObjectTag(getBID("magicSapling"), getBMeta("magicSapling"), (new ObjectTags()).add(EnumTag.WOOD, 4).add(EnumTag.PLANT, 2).add(EnumTag.MAGIC, 2)); ThaumcraftApi.registerObjectTag(getBID("magicSapling"), getBMeta("magicSapling"), (new AspectList()).add(Aspect.TREE, 2).add(Aspect.PLANT, 2).add(Aspect.MAGIC, 2));
ThaumcraftApi.registerObjectTag(getBID("darkSapling"), getBMeta("darkSapling"), (new ObjectTags()).add(EnumTag.WOOD, 4).add(EnumTag.PLANT, 2).add(EnumTag.DARK, 2)); ThaumcraftApi.registerObjectTag(getBID("darkSapling"), getBMeta("darkSapling"), (new AspectList()).add(Aspect.TREE, 2).add(Aspect.PLANT, 2).add(Aspect.DARKNESS, 2));
ThaumcraftApi.registerObjectTag(getBID("deadSapling"), getBMeta("deadSapling"), (new ObjectTags()).add(EnumTag.WOOD, 4).add(EnumTag.PLANT, 2).add(EnumTag.DEATH, 2)); ThaumcraftApi.registerObjectTag(getBID("deadSapling"), getBMeta("deadSapling"), (new AspectList()).add(Aspect.TREE, 2).add(Aspect.PLANT, 2).add(Aspect.DEATH, 2));
ThaumcraftApi.registerObjectTag(getBID("acaciaSapling"), getBMeta("acaciaSapling"), (new ObjectTags()).add(EnumTag.WOOD, 4).add(EnumTag.PLANT, 2)); ThaumcraftApi.registerObjectTag(getBID("acaciaSapling"), getBMeta("acaciaSapling"), (new AspectList()).add(Aspect.TREE, 2).add(Aspect.PLANT, 2));
ThaumcraftApi.registerObjectTag(getBID("firSapling"), getBMeta("firSapling"), (new ObjectTags()).add(EnumTag.WOOD, 4).add(EnumTag.PLANT, 2)); ThaumcraftApi.registerObjectTag(getBID("firSapling"), getBMeta("firSapling"), (new AspectList()).add(Aspect.TREE, 2).add(Aspect.PLANT, 2));
ThaumcraftApi.registerObjectTag(getBID("mangroveSapling"), getBMeta("mangroveSapling"), (new ObjectTags()).add(EnumTag.WOOD, 4).add(EnumTag.PLANT, 2)); ThaumcraftApi.registerObjectTag(getBID("mangroveSapling"), getBMeta("mangroveSapling"), (new AspectList()).add(Aspect.TREE, 2).add(Aspect.PLANT, 2));
ThaumcraftApi.registerObjectTag(getBID("palmSapling"), getBMeta("palmSapling"), (new ObjectTags()).add(EnumTag.WOOD, 4).add(EnumTag.PLANT, 2)); ThaumcraftApi.registerObjectTag(getBID("palmSapling"), getBMeta("palmSapling"), (new AspectList()).add(Aspect.TREE, 2).add(Aspect.PLANT, 2));
ThaumcraftApi.registerObjectTag(getBID("redwoodSapling"), getBMeta("redwoodSapling"), (new ObjectTags()).add(EnumTag.WOOD, 4).add(EnumTag.PLANT, 2)); ThaumcraftApi.registerObjectTag(getBID("redwoodSapling"), getBMeta("redwoodSapling"), (new AspectList()).add(Aspect.TREE, 2).add(Aspect.PLANT, 2));
ThaumcraftApi.registerObjectTag(getBID("willowSapling"), getBMeta("willowSapling"), (new ObjectTags()).add(EnumTag.WOOD, 4).add(EnumTag.PLANT, 2)); ThaumcraftApi.registerObjectTag(getBID("willowSapling"), getBMeta("willowSapling"), (new AspectList()).add(Aspect.TREE, 2).add(Aspect.PLANT, 2));
ThaumcraftApi.registerObjectTag(getBID("mapleSapling"), getBMeta("mapleSapling"), (new ObjectTags()).add(EnumTag.WOOD, 4).add(EnumTag.PLANT, 2)); ThaumcraftApi.registerObjectTag(getBID("mapleSapling"), getBMeta("mapleSapling"), (new AspectList()).add(Aspect.TREE, 2).add(Aspect.PLANT, 2));
ThaumcraftApi.registerObjectTag(getBID("orangeAutumnSapling"), getBMeta("orangeAutumnSapling"), (new ObjectTags()).add(EnumTag.WOOD, 4).add(EnumTag.PLANT, 2)); ThaumcraftApi.registerObjectTag(getBID("orangeAutumnSapling"), getBMeta("orangeAutumnSapling"), (new AspectList()).add(Aspect.TREE, 2).add(Aspect.PLANT, 2));
ThaumcraftApi.registerObjectTag(getBID("pinkCherrySapling"), getBMeta("pinkCherrySapling"), (new ObjectTags()).add(EnumTag.WOOD, 4).add(EnumTag.PLANT, 2)); ThaumcraftApi.registerObjectTag(getBID("pinkCherrySapling"), getBMeta("pinkCherrySapling"), (new AspectList()).add(Aspect.TREE, 2).add(Aspect.PLANT, 2));
ThaumcraftApi.registerObjectTag(getBID("whiteCherrySapling"), getBMeta("whiteCherrySapling"), (new ObjectTags()).add(EnumTag.WOOD, 4).add(EnumTag.PLANT, 2)); ThaumcraftApi.registerObjectTag(getBID("whiteCherrySapling"), getBMeta("whiteCherrySapling"), (new AspectList()).add(Aspect.TREE, 2).add(Aspect.PLANT, 2));
ThaumcraftApi.registerObjectTag(getBID("appleSapling"), getBMeta("appleSapling"), (new ObjectTags()).add(EnumTag.WOOD, 4).add(EnumTag.PLANT, 2)); ThaumcraftApi.registerObjectTag(getBID("appleSapling"), getBMeta("appleSapling"), (new AspectList()).add(Aspect.TREE, 2).add(Aspect.PLANT, 2));
ThaumcraftApi.registerObjectTag(getBID("originSapling"), getBMeta("originSapling"), (new ObjectTags()).add(EnumTag.WOOD, 4).add(EnumTag.PLANT, 2)); ThaumcraftApi.registerObjectTag(getBID("originSapling"), getBMeta("originSapling"), (new AspectList()).add(Aspect.TREE, 2).add(Aspect.PLANT, 2));
ThaumcraftApi.registerObjectTag(getBID("yellowAutumnSapling"), getBMeta("yellowAutumnSapling"), (new ObjectTags()).add(EnumTag.WOOD, 4).add(EnumTag.PLANT, 2)); ThaumcraftApi.registerObjectTag(getBID("yellowAutumnSapling"), getBMeta("yellowAutumnSapling"), (new AspectList()).add(Aspect.TREE, 2).add(Aspect.PLANT, 2));
ThaumcraftApi.registerObjectTag(getBID("pineSapling"), getBMeta("pineSapling"), (new ObjectTags()).add(EnumTag.WOOD, 4).add(EnumTag.PLANT, 2)); ThaumcraftApi.registerObjectTag(getBID("pineSapling"), getBMeta("pineSapling"), (new AspectList()).add(Aspect.TREE, 2).add(Aspect.PLANT, 2));
ThaumcraftApi.registerObjectTag(getBID("hellBarkSapling"), getBMeta("hellBarkSapling"), (new ObjectTags()).add(EnumTag.WOOD, 4).add(EnumTag.PLANT, 2).add(EnumTag.FIRE, 2)); ThaumcraftApi.registerObjectTag(getBID("hellBarkSapling"), getBMeta("hellBarkSapling"), (new AspectList()).add(Aspect.TREE, 2).add(Aspect.PLANT, 2).add(Aspect.FIRE, 2));
ThaumcraftApi.registerObjectTag(getBID("jacarandaSapling"), getBMeta("jacarandaSapling"), (new ObjectTags()).add(EnumTag.WOOD, 4).add(EnumTag.PLANT, 2)); ThaumcraftApi.registerObjectTag(getBID("jacarandaSapling"), getBMeta("jacarandaSapling"), (new AspectList()).add(Aspect.TREE, 2).add(Aspect.PLANT, 2));
ThaumcraftApi.registerObjectTag(getBID("bambooSapling"), getBMeta("bambooSapling"), (new ObjectTags()).add(EnumTag.WOOD, 4).add(EnumTag.PLANT, 2)); ThaumcraftApi.registerObjectTag(getBID("bambooSapling"), getBMeta("bambooSapling"), (new AspectList()).add(Aspect.TREE, 2).add(Aspect.PLANT, 2));
//Blocks //Blocks
ThaumcraftApi.registerObjectTag(getBID("mud"), getBMeta("mud"), (new ObjectTags()).add(EnumTag.WATER, 3).add(EnumTag.EARTH, 6)); ThaumcraftApi.registerObjectTag(getBID("mud"), getBMeta("mud"), (new AspectList()).add(Aspect.WATER, 3).add(Aspect.EARTH, 6));
ThaumcraftApi.registerObjectTag(getBID("driedDirt"), getBMeta("driedDirt"), (new ObjectTags()).add(EnumTag.DESTRUCTION, 1).add(EnumTag.EARTH, 1)); ThaumcraftApi.registerObjectTag(getBID("driedDirt"), getBMeta("driedDirt"), (new AspectList()).add(Aspect.ENTROPY, 1).add(Aspect.EARTH, 1));
ThaumcraftApi.registerObjectTag(getBID("redRock"), getBMeta("redRock"), (new ObjectTags()).add(EnumTag.ROCK, 2)); ThaumcraftApi.registerObjectTag(getBID("redRock"), getBMeta("redRock"), (new AspectList()).add(Aspect.STONE, 2));
ThaumcraftApi.registerObjectTag(getBID("ash"), getBMeta("ash"), (new ObjectTags()).add(EnumTag.DESTRUCTION, 3).add(EnumTag.EXCHANGE, 3)); //ThaumcraftApi.registerObjectTag(getBID("ash"), getBMeta("ash"), (new AspectList()).add(Aspect.ENTROPY, 3).add(Aspect.EXCHANGE, 3));
ThaumcraftApi.registerObjectTag(getBID("ashStone"), getBMeta("ashStone"), (new ObjectTags()).add(EnumTag.ROCK, 1).add(EnumTag.EXCHANGE, 1)); //ThaumcraftApi.registerObjectTag(getBID("ashStone"), getBMeta("ashStone"), (new AspectList()).add(Aspect.STONE, 1).add(Aspect.EXCHANGE, 1));
ThaumcraftApi.registerObjectTag(getBID("hardIce"), getBMeta("hardIce"), (new ObjectTags()).add(EnumTag.ROCK, 2).add(EnumTag.COLD, 2)); ThaumcraftApi.registerObjectTag(getBID("hardIce"), getBMeta("hardIce"), (new AspectList()).add(Aspect.STONE, 2).add(Aspect.ICE, 2));
ThaumcraftApi.registerObjectTag(getBID("originGrass"), getBMeta("originGrass"), (new ObjectTags()).add(EnumTag.PLANT, 1).add(EnumTag.EARTH, 2)); ThaumcraftApi.registerObjectTag(getBID("originGrass"), getBMeta("originGrass"), (new AspectList()).add(Aspect.PLANT, 1).add(Aspect.EARTH, 2));
ThaumcraftApi.registerObjectTag(getBID("hardSand"), getBMeta("hardSand"), (new ObjectTags()).add(EnumTag.ROCK, 1).add(EnumTag.EARTH, 2)); ThaumcraftApi.registerObjectTag(getBID("hardSand"), getBMeta("hardSand"), (new AspectList()).add(Aspect.STONE, 1).add(Aspect.EARTH, 2));
ThaumcraftApi.registerObjectTag(getBID("hardDirt"), getBMeta("hardDirt"), (new ObjectTags()).add(EnumTag.ROCK, 1).add(EnumTag.EARTH, 2)); ThaumcraftApi.registerObjectTag(getBID("hardDirt"), getBMeta("hardDirt"), (new AspectList()).add(Aspect.STONE, 1).add(Aspect.EARTH, 2));
ThaumcraftApi.registerObjectTag(getBID("holyGrass"), getBMeta("holyGrass"), (new ObjectTags()).add(EnumTag.PLANT, 1).add(EnumTag.EARTH, 2).add(EnumTag.LIGHT, 1)); ThaumcraftApi.registerObjectTag(getBID("holyGrass"), getBMeta("holyGrass"), (new AspectList()).add(Aspect.PLANT, 1).add(Aspect.EARTH, 2).add(Aspect.LIGHT, 1));
ThaumcraftApi.registerObjectTag(getBID("holyDirt"), getBMeta("holyDirt"), (new ObjectTags()).add(EnumTag.LIGHT, 1).add(EnumTag.EARTH, 2)); ThaumcraftApi.registerObjectTag(getBID("holyDirt"), getBMeta("holyDirt"), (new AspectList()).add(Aspect.LIGHT, 1).add(Aspect.EARTH, 2));
ThaumcraftApi.registerObjectTag(getBID("holyStone"), getBMeta("holyStone"), (new ObjectTags()).add(EnumTag.LIGHT, 1).add(EnumTag.ROCK, 2)); ThaumcraftApi.registerObjectTag(getBID("holyStone"), getBMeta("holyStone"), (new AspectList()).add(Aspect.LIGHT, 1).add(Aspect.STONE, 2));
ThaumcraftApi.registerObjectTag(getBID("crystal"), getBMeta("crystal"), (new ObjectTags()).add(EnumTag.VALUABLE, 58).add(EnumTag.LIGHT, 15).add(EnumTag.MAGIC, 20).add(EnumTag.CRYSTAL, 50)); //ThaumcraftApi.registerObjectTag(getBID("crystal"), getBMeta("crystal"), (new AspectList()).add(Aspect.VALUABLE, 58).add(Aspect.LIGHT, 15).add(Aspect.MAGIC, 20).add(Aspect.CRYSTAL, 50));
ThaumcraftApi.registerObjectTag(getBID("cragRock"), getBMeta("cragRock"), (new ObjectTags()).add(EnumTag.ROCK, 2)); ThaumcraftApi.registerObjectTag(getBID("cragRock"), getBMeta("cragRock"), (new AspectList()).add(Aspect.STONE, 2));
ThaumcraftApi.registerObjectTag(getBID("quicksand"), getBMeta("quicksand"), (new ObjectTags()).add(EnumTag.EARTH, 2).add(EnumTag.TRAP, 4)); ThaumcraftApi.registerObjectTag(getBID("quicksand"), getBMeta("quicksand"), (new AspectList()).add(Aspect.EARTH, 2).add(Aspect.TRAP, 4));
ThaumcraftApi.registerObjectTag(getBID("smolderingGrass"), getBMeta("smolderingGrass"), (new ObjectTags()).add(EnumTag.EARTH, 2).add(EnumTag.FIRE, 1)); ThaumcraftApi.registerObjectTag(getBID("smolderingGrass"), getBMeta("smolderingGrass"), (new AspectList()).add(Aspect.EARTH, 2).add(Aspect.FIRE, 1));
ThaumcraftApi.registerObjectTag(getBID("amethystBlock"), getBMeta("amethystBlock"), (new ObjectTags()).add(EnumTag.VALUABLE, 58).add(EnumTag.PURE, 58).add(EnumTag.CRYSTAL, 87)); //ThaumcraftApi.registerObjectTag(getBID("amethystBlock"), getBMeta("amethystBlock"), (new AspectList()).add(Aspect.VALUABLE, 58).add(Aspect.ORDER, 58).add(Aspect.CRYSTAL, 87));
ThaumcraftApi.registerObjectTag(getBID("amethystOre"), getBMeta("amethystOre"), (new ObjectTags()).add(EnumTag.VALUABLE, 6).add(EnumTag.PURE, 6).add(EnumTag.CRYSTAL, 14).add(EnumTag.ROCK, 4)); //ThaumcraftApi.registerObjectTag(getBID("amethystOre"), getBMeta("amethystOre"), (new AspectList()).add(Aspect.VALUABLE, 6).add(Aspect.ORDER, 6).add(Aspect.CRYSTAL, 14).add(Aspect.STONE, 4));
ThaumcraftApi.registerObjectTag(getBID("redRockCobble"), getBMeta("redRockCobble"), (new ObjectTags()).add(EnumTag.DESTRUCTION, 1).add(EnumTag.ROCK, 1)); ThaumcraftApi.registerObjectTag(getBID("redRockCobble"), getBMeta("redRockCobble"), (new AspectList()).add(Aspect.ENTROPY, 1).add(Aspect.STONE, 1));
ThaumcraftApi.registerObjectTag(getBID("giantFlowerRed"), getBMeta("giantFlowerRed"), (new ObjectTags()).add(EnumTag.FLOWER, 4).add(EnumTag.MAGIC, 1)); ThaumcraftApi.registerObjectTag(getBID("giantFlowerRed"), getBMeta("giantFlowerRed"), (new AspectList()).add(Aspect.PLANT, 4).add(Aspect.MAGIC, 1));
ThaumcraftApi.registerObjectTag(getBID("giantFlowerYellow"), getBMeta("giantFlowerYellow"), (new ObjectTags()).add(EnumTag.FLOWER, 4).add(EnumTag.MAGIC, 1)); ThaumcraftApi.registerObjectTag(getBID("giantFlowerYellow"), getBMeta("giantFlowerYellow"), (new AspectList()).add(Aspect.PLANT, 4).add(Aspect.MAGIC, 1));
ThaumcraftApi.registerObjectTag(getBID("smallBoneSegment"), getBMeta("smallBoneSegment"), (new ObjectTags()).add(EnumTag.FLESH, 1).add(EnumTag.DEATH, 3)); ThaumcraftApi.registerObjectTag(getBID("smallBoneSegment"), getBMeta("smallBoneSegment"), (new AspectList()).add(Aspect.FLESH, 1).add(Aspect.DEATH, 3));
ThaumcraftApi.registerObjectTag(getBID("mediumBoneSegment"), getBMeta("mediumBoneSegment"), (new ObjectTags()).add(EnumTag.FLESH, 2).add(EnumTag.DEATH, 6)); ThaumcraftApi.registerObjectTag(getBID("mediumBoneSegment"), getBMeta("mediumBoneSegment"), (new AspectList()).add(Aspect.FLESH, 2).add(Aspect.DEATH, 6));
ThaumcraftApi.registerObjectTag(getBID("largeBoneSegment"), getBMeta("largeBoneSegment"), (new ObjectTags()).add(EnumTag.FLESH, 4).add(EnumTag.DEATH, 12)); ThaumcraftApi.registerObjectTag(getBID("largeBoneSegment"), getBMeta("largeBoneSegment"), (new AspectList()).add(Aspect.FLESH, 4).add(Aspect.DEATH, 12));
ThaumcraftApi.registerObjectTag(getBID("ivy"), getBMeta("ivy"), (new ObjectTags()).add(EnumTag.PLANT, 2).add(EnumTag.FIRE, 1)); ThaumcraftApi.registerObjectTag(getBID("ivy"), getBMeta("ivy"), (new AspectList()).add(Aspect.PLANT, 2).add(Aspect.FIRE, 1));
for (int i = 10; i < 15; i++) for (int i = 10; i < 15; i++)
{ {
ThaumcraftApi.registerObjectTag(Items.miscItems.get().itemID, i, (new ObjectTags()).add(EnumTag.VALUABLE, 4).add(EnumTag.CRYSTAL, 8)); //ThaumcraftApi.registerObjectTag(Items.miscItems.get().itemID, i, (new AspectList()).add(Aspect.VALUABLE, 4).add(Aspect.CRYSTAL, 8));
} }
String[] oreTypes = BlockBOPAmethyst.types; String[] oreTypes = BlockBOPAmethyst.types;
for (int i = 2; i < oreTypes.length; i+=2) for (int i = 2; i < oreTypes.length; i+=2)
{ {
ThaumcraftApi.registerObjectTag(Blocks.amethystOre.get().blockID, i, (new ObjectTags()).add(EnumTag.VALUABLE, 3).add(EnumTag.CRYSTAL, 7).add(EnumTag.ROCK, 4)); //ThaumcraftApi.registerObjectTag(Blocks.amethystOre.get().blockID, i, (new AspectList()).add(Aspect.VALUABLE, 3).add(Aspect.CRYSTAL, 7).add(Aspect.STONE, 4));
} }
//Items //Items
/*Amethyst*/ThaumcraftApi.registerObjectTag(Items.miscItems.get().itemID, 2, (new ObjectTags()).add(EnumTag.VALUABLE, 8).add(EnumTag.PURE, 8).add(EnumTag.CRYSTAL, 16)); /*Amethyst*///ThaumcraftApi.registerObjectTag(Items.miscItems.get().itemID, 2, (new AspectList()).add(Aspect.VALUABLE, 8).add(Aspect.PURE, 8).add(Aspect.CRYSTAL, 16));
/*Ashes*/ThaumcraftApi.registerObjectTag(Items.miscItems.get().itemID, 1, (new ObjectTags()).add(EnumTag.DESTRUCTION, 1).add(EnumTag.EXCHANGE, 1)); /*Ashes*///ThaumcraftApi.registerObjectTag(Items.miscItems.get().itemID, 1, (new AspectList()).add(Aspect.ENTROPY, 1).add(Aspect.EXCHANGE, 1));
/*Mudbrick*/ThaumcraftApi.registerObjectTag(Items.miscItems.get().itemID, 0, (new ObjectTags()).add(EnumTag.EARTH, 2).add(EnumTag.FIRE, 1)); /*Mudbrick*/ThaumcraftApi.registerObjectTag(Items.miscItems.get().itemID, 0, (new AspectList()).add(Aspect.EARTH, 2).add(Aspect.FIRE, 1));
/*Dart*/ThaumcraftApi.registerObjectTag(Items.dart.get().itemID, 0, (new ObjectTags()).add(EnumTag.WEAPON, 1)); /*Dart*/ThaumcraftApi.registerObjectTag(Items.dart.get().itemID, 0, (new AspectList()).add(Aspect.WEAPON, 1));
/*Poison Dart*/ThaumcraftApi.registerObjectTag(Items.dart.get().itemID, 1, (new ObjectTags()).add(EnumTag.PLANT, 2).add(EnumTag.WEAPON, 2)); /*Poison Dart*/ThaumcraftApi.registerObjectTag(Items.dart.get().itemID, 1, (new AspectList()).add(Aspect.PLANT, 2).add(Aspect.WEAPON, 2));
/*Spring Water Bucket*/ThaumcraftApi.registerObjectTag(Fluids.bopBucket.get().itemID, 0, (new ObjectTags()).add(EnumTag.METAL, 13).add(EnumTag.VOID, 1).add(EnumTag.WATER, 4).add(EnumTag.LIFE, 2).add(EnumTag.HEAL, 4)); /*Spring Water Bucket*/ThaumcraftApi.registerObjectTag(Fluids.bopBucket.get().itemID, 0, (new AspectList()).add(Aspect.METAL, 13).add(Aspect.VOID, 1).add(Aspect.WATER, 4).add(Aspect.LIFE, 2).add(Aspect.HEAL, 4));
/*Liquid Poison Bucket*/ThaumcraftApi.registerObjectTag(Fluids.bopBucket.get().itemID, 1, (new ObjectTags()).add(EnumTag.METAL, 13).add(EnumTag.VOID, 1).add(EnumTag.WATER, 2).add(EnumTag.WEAPON, 4).add(EnumTag.POISON, 4)); /*Liquid Poison Bucket*/ThaumcraftApi.registerObjectTag(Fluids.bopBucket.get().itemID, 1, (new AspectList()).add(Aspect.METAL, 13).add(Aspect.VOID, 1).add(Aspect.WATER, 2).add(Aspect.WEAPON, 4).add(Aspect.POISON, 4));
ThaumcraftApi.registerObjectTag(Items.food.get().itemID, 0, (new ObjectTags()).add(EnumTag.PLANT, 1).add(EnumTag.LIFE, 1)); ThaumcraftApi.registerObjectTag(Items.food.get().itemID, 0, (new AspectList()).add(Aspect.PLANT, 1).add(Aspect.LIFE, 1));
//ThaumcraftApi.registerObjectTag(Items.sunflowerSeeds.get().itemID, 0, (new ObjectTags()).add(EnumTag.PLANT, 1).add(EnumTag.EXCHANGE, 1)); //ThaumcraftApi.registerObjectTag(Items.sunflowerSeeds.get().itemID, 0, (new AspectList()).add(Aspect.PLANT, 1).add(Aspect.EXCHANGE, 1));
ThaumcraftApi.registerObjectTag(Items.mudball.get().itemID, 0, (new ObjectTags()).add(EnumTag.WATER, 1).add(EnumTag.EARTH, 2)); ThaumcraftApi.registerObjectTag(Items.mudball.get().itemID, 0, (new AspectList()).add(Aspect.WATER, 1).add(Aspect.EARTH, 2));
//ThaumcraftApi.registerObjectTag(Items.shroomPowder.get().itemID, -1, (new ObjectTags()).add(EnumTag.FUNGUS, 2).add(EnumTag.DESTRUCTION, 1)); //ThaumcraftApi.registerObjectTag(Items.shroomPowder.get().itemID, -1, (new AspectList()).add(Aspect.PLANT, 2).add(Aspect.ENTROPY, 1));
ThaumcraftApi.registerObjectTag(Items.bopDisc.get().itemID, -1, (new ObjectTags()).add(EnumTag.SOUND, 12).add(EnumTag.VALUABLE, 4).add(EnumTag.CROP, 4)); //ThaumcraftApi.registerObjectTag(Items.bopDisc.get().itemID, -1, (new AspectList()).add(Aspect.SENSES, 12).add(Aspect.VALUABLE, 4).add(Aspect.CROP, 4));
ThaumcraftApi.registerObjectTag(Items.bopDiscMud.get().itemID, -1, (new ObjectTags()).add(EnumTag.SOUND, 12).add(EnumTag.VALUABLE, 4).add(EnumTag.EARTH, 2).add(EnumTag.WATER, 2)); //ThaumcraftApi.registerObjectTag(Items.bopDiscMud.get().itemID, -1, (new AspectList()).add(Aspect.SENSES, 12).add(Aspect.VALUABLE, 4).add(Aspect.EARTH, 2).add(Aspect.WATER, 2));
//Placer Items //Placer Items
ThaumcraftApi.registerObjectTag(getBID("barley"), getBMeta("barley"), (new ObjectTags()).add(EnumTag.PLANT, 1).add(EnumTag.LIFE, 1)); ThaumcraftApi.registerObjectTag(getBID("barley"), getBMeta("barley"), (new AspectList()).add(Aspect.PLANT, 1).add(Aspect.LIFE, 1));
ThaumcraftApi.registerObjectTag(getBID("cattail"), getBMeta("cattail"), (new ObjectTags()).add(EnumTag.WATER, 1).add(EnumTag.PLANT, 1)); ThaumcraftApi.registerObjectTag(getBID("cattail"), getBMeta("cattail"), (new AspectList()).add(Aspect.WATER, 1).add(Aspect.PLANT, 1));
ThaumcraftApi.registerObjectTag(getBID("reed"), getBMeta("reed"), (new ObjectTags()).add(EnumTag.WOOD, 1).add(EnumTag.PLANT, 1)); ThaumcraftApi.registerObjectTag(getBID("reed"), getBMeta("reed"), (new AspectList()).add(Aspect.TREE, 1).add(Aspect.PLANT, 1));
ThaumcraftApi.registerObjectTag(getBID("bamboo"), getBMeta("bamboo"), (new ObjectTags()).add(EnumTag.PLANT, 1).add(EnumTag.LIFE, 1)); ThaumcraftApi.registerObjectTag(getBID("bamboo"), getBMeta("bamboo"), (new AspectList()).add(Aspect.PLANT, 1).add(Aspect.LIFE, 1));
ThaumcraftApi.registerObjectTag(getBID("sproutItem"), getBMeta("sproutItem"), (new ObjectTags()).add(EnumTag.PLANT, 2)); ThaumcraftApi.registerObjectTag(getBID("sproutItem"), getBMeta("sproutItem"), (new AspectList()).add(Aspect.PLANT, 2));
ThaumcraftApi.registerObjectTag(getBID("bushItem"), getBMeta("bushItem"), (new ObjectTags()).add(EnumTag.PLANT, 2)); ThaumcraftApi.registerObjectTag(getBID("bushItem"), getBMeta("bushItem"), (new AspectList()).add(Aspect.PLANT, 2));
ThaumcraftApi.registerObjectTag(getBID("poisonIvyItem"), getBMeta("poisonIvyItem"), (new ObjectTags()).add(EnumTag.PLANT, 2).add(EnumTag.WEAPON, 1)); ThaumcraftApi.registerObjectTag(getBID("poisonIvyItem"), getBMeta("poisonIvyItem"), (new AspectList()).add(Aspect.PLANT, 2).add(Aspect.WEAPON, 1));
ThaumcraftApi.registerObjectTag(getBID("mediumGrassItem"), getBMeta("mediumGrassItem"), (new ObjectTags()).add(EnumTag.PLANT, 1)); ThaumcraftApi.registerObjectTag(getBID("mediumGrassItem"), getBMeta("mediumGrassItem"), (new AspectList()).add(Aspect.PLANT, 1));
ThaumcraftApi.registerObjectTag(getBID("shortGrassItem"), getBMeta("shortGrassItem"), (new ObjectTags()).add(EnumTag.PLANT, 1)); ThaumcraftApi.registerObjectTag(getBID("shortGrassItem"), getBMeta("shortGrassItem"), (new AspectList()).add(Aspect.PLANT, 1));
ThaumcraftApi.registerObjectTag(getBID("highGrassItem"), getBMeta("highGrassItem"), (new ObjectTags()).add(EnumTag.PLANT, 2)); ThaumcraftApi.registerObjectTag(getBID("highGrassItem"), getBMeta("highGrassItem"), (new AspectList()).add(Aspect.PLANT, 2));
ThaumcraftApi.registerObjectTag(getBID("bushItem"), getBMeta("bushItem"), (new ObjectTags()).add(EnumTag.PLANT, 2)); ThaumcraftApi.registerObjectTag(getBID("bushItem"), getBMeta("bushItem"), (new AspectList()).add(Aspect.PLANT, 2));
ThaumcraftApi.registerObjectTag(getBID("algae"), getBMeta("algae"), (new ObjectTags()).add(EnumTag.PLANT, 1).add(EnumTag.WATER, 1)); ThaumcraftApi.registerObjectTag(getBID("algae"), getBMeta("algae"), (new AspectList()).add(Aspect.PLANT, 1).add(Aspect.WATER, 1));
//Plants //Plants
ThaumcraftApi.registerObjectTag(getBID("toadstool"), getBMeta("toadstool"), (new ObjectTags()).add(EnumTag.FUNGUS, 4)); ThaumcraftApi.registerObjectTag(getBID("toadstool"), getBMeta("toadstool"), (new AspectList()).add(Aspect.PLANT, 4));
ThaumcraftApi.registerObjectTag(getBID("portobello"), getBMeta("portobello"), (new ObjectTags()).add(EnumTag.FUNGUS, 4)); ThaumcraftApi.registerObjectTag(getBID("portobello"), getBMeta("portobello"), (new AspectList()).add(Aspect.PLANT, 4));
ThaumcraftApi.registerObjectTag(getBID("bluemilk"), getBMeta("bluemilk"), (new ObjectTags()).add(EnumTag.FUNGUS, 4)); ThaumcraftApi.registerObjectTag(getBID("bluemilk"), getBMeta("bluemilk"), (new AspectList()).add(Aspect.PLANT, 4));
ThaumcraftApi.registerObjectTag(getBID("glowshroom"), getBMeta("glowshroom"), (new ObjectTags()).add(EnumTag.FUNGUS, 4).add(EnumTag.LIGHT, 1)); ThaumcraftApi.registerObjectTag(getBID("glowshroom"), getBMeta("glowshroom"), (new AspectList()).add(Aspect.PLANT, 4).add(Aspect.LIGHT, 1));
ThaumcraftApi.registerObjectTag(getBID("tinyCactus"), getBMeta("tinyCactus"), (new ObjectTags()).add(EnumTag.PLANT, 2).add(EnumTag.WEAPON, 1)); ThaumcraftApi.registerObjectTag(getBID("tinyCactus"), getBMeta("tinyCactus"), (new AspectList()).add(Aspect.PLANT, 2).add(Aspect.WEAPON, 1));
ThaumcraftApi.registerObjectTag(getBID("holyTallGrass"), getBMeta("holyTallGrass"), (new ObjectTags()).add(EnumTag.WIND, 1).add(EnumTag.PLANT, 1).add(EnumTag.LIGHT, 1)); ThaumcraftApi.registerObjectTag(getBID("holyTallGrass"), getBMeta("holyTallGrass"), (new AspectList()).add(Aspect.AIR, 1).add(Aspect.PLANT, 1).add(Aspect.LIGHT, 1));
ThaumcraftApi.registerObjectTag(getBID("desertSprouts"), getBMeta("desertSprouts"), (new ObjectTags()).add(EnumTag.PLANT, 1)); ThaumcraftApi.registerObjectTag(getBID("desertSprouts"), getBMeta("desertSprouts"), (new AspectList()).add(Aspect.PLANT, 1));
ThaumcraftApi.registerObjectTag(getBID("duneGrass"), getBMeta("duneGrass"), (new ObjectTags()).add(EnumTag.PLANT, 1).add(EnumTag.WIND, 1)); ThaumcraftApi.registerObjectTag(getBID("duneGrass"), getBMeta("duneGrass"), (new AspectList()).add(Aspect.PLANT, 1).add(Aspect.AIR, 1));
ThaumcraftApi.registerObjectTag(getBID("thorn"), getBMeta("thorn"), (new ObjectTags()).add(EnumTag.PLANT, 2).add(EnumTag.WEAPON, 1)); ThaumcraftApi.registerObjectTag(getBID("thorn"), getBMeta("thorn"), (new AspectList()).add(Aspect.PLANT, 2).add(Aspect.WEAPON, 1));
ThaumcraftApi.registerObjectTag(getBID("desertGrass"), getBMeta("desertGrass"), (new ObjectTags()).add(EnumTag.PLANT, 1)); ThaumcraftApi.registerObjectTag(getBID("desertGrass"), getBMeta("desertGrass"), (new AspectList()).add(Aspect.PLANT, 1));
ThaumcraftApi.registerObjectTag(getBID("deadGrass"), getBMeta("deadGrass"), (new ObjectTags()).add(EnumTag.PLANT, 1)); ThaumcraftApi.registerObjectTag(getBID("deadGrass"), getBMeta("deadGrass"), (new AspectList()).add(Aspect.PLANT, 1));
ThaumcraftApi.registerObjectTag(getBID("treeMoss"), getBMeta("treeMoss"), (new ObjectTags()).add(EnumTag.PLANT, 2)); ThaumcraftApi.registerObjectTag(getBID("treeMoss"), getBMeta("treeMoss"), (new AspectList()).add(Aspect.PLANT, 2));
ThaumcraftApi.registerObjectTag(getBID("moss"), getBMeta("moss"), (new ObjectTags()).add(EnumTag.PLANT, 2)); ThaumcraftApi.registerObjectTag(getBID("moss"), getBMeta("moss"), (new AspectList()).add(Aspect.PLANT, 2));
ThaumcraftApi.registerObjectTag(getBID("willow"), getBMeta("willow"), (new ObjectTags()).add(EnumTag.PLANT, 2)); ThaumcraftApi.registerObjectTag(getBID("willow"), getBMeta("willow"), (new AspectList()).add(Aspect.PLANT, 2));
//Flowers //Flowers
ThaumcraftApi.registerObjectTag(getBID("violet"), getBMeta("violet"), (new ObjectTags()).add(EnumTag.FLOWER, 4)); ThaumcraftApi.registerObjectTag(getBID("violet"), getBMeta("violet"), (new AspectList()).add(Aspect.PLANT, 4));
ThaumcraftApi.registerObjectTag(getBID("hydrangea"), getBMeta("hydrangea"), (new ObjectTags()).add(EnumTag.FLOWER, 4)); ThaumcraftApi.registerObjectTag(getBID("hydrangea"), getBMeta("hydrangea"), (new AspectList()).add(Aspect.PLANT, 4));
ThaumcraftApi.registerObjectTag(getBID("deathbloom"), getBMeta("deathbloom"), (new ObjectTags()).add(EnumTag.FLOWER, 4).add(EnumTag.DEATH, 1)); ThaumcraftApi.registerObjectTag(getBID("deathbloom"), getBMeta("deathbloom"), (new AspectList()).add(Aspect.PLANT, 4).add(Aspect.DEATH, 1));
ThaumcraftApi.registerObjectTag(getBID("glowFlower"), getBMeta("glowFlower"), (new ObjectTags()).add(EnumTag.FLOWER, 4).add(EnumTag.LIGHT, 1)); ThaumcraftApi.registerObjectTag(getBID("glowFlower"), getBMeta("glowFlower"), (new AspectList()).add(Aspect.PLANT, 4).add(Aspect.LIGHT, 1));
ThaumcraftApi.registerObjectTag(getBID("anenome"), getBMeta("anenome"), (new ObjectTags()).add(EnumTag.FLOWER, 4)); ThaumcraftApi.registerObjectTag(getBID("anenome"), getBMeta("anenome"), (new AspectList()).add(Aspect.PLANT, 4));
ThaumcraftApi.registerObjectTag(getBID("swampFlower"), getBMeta("swampFlower"), (new ObjectTags()).add(EnumTag.FLOWER, 4)); ThaumcraftApi.registerObjectTag(getBID("swampFlower"), getBMeta("swampFlower"), (new AspectList()).add(Aspect.PLANT, 4));
ThaumcraftApi.registerObjectTag(getBID("wildFlower"), getBMeta("wildFlower"), (new ObjectTags()).add(EnumTag.FLOWER, 4)); ThaumcraftApi.registerObjectTag(getBID("wildFlower"), getBMeta("wildFlower"), (new AspectList()).add(Aspect.PLANT, 4));
ThaumcraftApi.registerObjectTag(getBID("daisy"), getBMeta("daisy"), (new ObjectTags()).add(EnumTag.FLOWER, 4)); ThaumcraftApi.registerObjectTag(getBID("daisy"), getBMeta("daisy"), (new AspectList()).add(Aspect.PLANT, 4));
ThaumcraftApi.registerObjectTag(getBID("dandelion"), getBMeta("dandelion"), (new ObjectTags()).add(EnumTag.FLOWER, 4)); ThaumcraftApi.registerObjectTag(getBID("dandelion"), getBMeta("dandelion"), (new AspectList()).add(Aspect.PLANT, 4));
ThaumcraftApi.registerObjectTag(getBID("tulip"), getBMeta("tulip"), (new ObjectTags()).add(EnumTag.FLOWER, 4)); ThaumcraftApi.registerObjectTag(getBID("tulip"), getBMeta("tulip"), (new AspectList()).add(Aspect.PLANT, 4));
ThaumcraftApi.registerObjectTag(getBID("aloe"), getBMeta("aloe"), (new ObjectTags()).add(EnumTag.FLOWER, 4).add(EnumTag.PLANT, 4)); ThaumcraftApi.registerObjectTag(getBID("aloe"), getBMeta("aloe"), (new AspectList()).add(Aspect.PLANT, 4).add(Aspect.PLANT, 4));
ThaumcraftApi.registerObjectTag(getBID("clover"), getBMeta("clover"), (new ObjectTags()).add(EnumTag.FLOWER, 1).add(EnumTag.PLANT, 1)); ThaumcraftApi.registerObjectTag(getBID("clover"), getBMeta("clover"), (new AspectList()).add(Aspect.PLANT, 1).add(Aspect.PLANT, 1));
ThaumcraftApi.registerObjectTag(getBID("lilyflower"), getBMeta("lilyflower"), (new ObjectTags()).add(EnumTag.FLOWER, 1).add(EnumTag.PLANT, 1).add(EnumTag.WATER, 1)); ThaumcraftApi.registerObjectTag(getBID("lilyflower"), getBMeta("lilyflower"), (new AspectList()).add(Aspect.PLANT, 1).add(Aspect.PLANT, 1).add(Aspect.WATER, 1));
ThaumcraftApi.registerObjectTag(getBID("rainbowflower"), getBMeta("rainbowflower"), (new ObjectTags()).add(EnumTag.FLOWER, 1).add(EnumTag.PLANT, 1).add(EnumTag.LIGHT, 1).add(EnumTag.MAGIC, 1)); ThaumcraftApi.registerObjectTag(getBID("rainbowflower"), getBMeta("rainbowflower"), (new AspectList()).add(Aspect.PLANT, 1).add(Aspect.PLANT, 1).add(Aspect.LIGHT, 1).add(Aspect.MAGIC, 1));
ThaumcraftApi.registerObjectTag(getBID("sunflower"), getBMeta("sunflower"), (new ObjectTags()).add(EnumTag.FLOWER, 1).add(EnumTag.PLANT, 1).add(EnumTag.LIGHT, 1)); ThaumcraftApi.registerObjectTag(getBID("sunflower"), getBMeta("sunflower"), (new AspectList()).add(Aspect.PLANT, 1).add(Aspect.PLANT, 1).add(Aspect.LIGHT, 1));
} }

106
src/minecraft/thaumcraft/api/EnumTag.java
View file

@ -1,106 +0,0 @@
package thaumcraft.api;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.Map;
public enum EnumTag {
UNKNOWN (63,"Obscurus","Unknown, Obscured",1,false,0x282828),
WIND (0,"Aura","Air, Wind, Breath, Movement",1,false,0xc0c0d7),
FIRE (6,"Ignis","Fire, Heat, Burn, Light",2,true,0xff5a01),
ROCK (11,"Saxum","Earth, Stone, Ground, Foundation",4,false,0x5c4842),
WATER (21,"Aqua","Water, Fluid, Cold",3,false,0x3cd4fc),
PLANT (36,"Herba","Herb, Plant, Grass",4,false,0x01ac00),
BEAST (53,"Bestia","Animal, Beast",3,true,0x9f6409),
FLESH (54,"Corpus","Body, Flesh, Physique",3,false,0xee478d),
METAL (12,"Metallum","Metal, Mine, Ore",4,false,0xd8d8d8),
CRYSTAL (20,"Vitreus","Glass, Crystal, Gem, Transparent",1,false,0x80ffff),
SOUND (24,"Sonus","Sound, Noise, Din",3,false,0x10c9c0),
EXCHANGE (14,"Permutatio","Exchange, Change, Barter",4,false,0x578357),
LIFE (26,"Victus","Life force, Food, Sustenance",3,false,0xde0005),
DEATH (27,"Mortuus","Death, Decay, Undead",6,true,0x404040),
SPIRIT (30,"Animus","Soul, Spirit",1,false,0xe0e0e0),
VOID (2,"Vacuos","Empty, Void, Insubstantial",1,true,0xc0c0d7),
VISION (3,"Visum","Sight, Vision, Appearance",3,false,0xd5d4ec),
KNOWLEDGE (4,"Cognitio","Learning, Knowledge, Inquiry",1,false,0x8080ee),
DESTRUCTION (7,"Fractus","Destruction, Fragmented, Shattered",2,true,0x506050),
POWER (9,"Potentia","Power, Energy, Strength",2,true,0xc0ffff),
MECHANISM (10,"Machina","Mechanism, Machine, Device",2,false,0x8080a0),
ARMOR (17,"Tutamen","Defense, Protection, Security",4,false,0x00c0c0),
WEAPON (18,"Telum","Arrow, Sword, Weapon",2,true,0xc05050),
TOOL (19,"Instrumentum","Instrument, Tool, Implement",4,false,0x4040ee),
POISON (29,"Venenum","Poison, Drug, Impure",3,true,0x89f000),
VALUABLE (31,"Carus","Expensive, Precious, Valuable",4,false,0xe6be44),
PURE (37,"Purus","Pure, Clean, Stainless",3,false,0xa5fffd),
MAGIC (40,"Praecantatio","Magic, Sorcery",5,false,0x9700c0),
TIME (41,"Tempus","Time, Moment, Season",5,false,0x9070e0),
CONTROL (48,"Imperito","Control, Command, Dominate",5,false,0x98994b),
DARK (49,"Tenebris","Dark, Night, Blindness",5,true,0x252525),
CRAFT (50,"Fabrico","Create, Construct, Work",2,false,0x809d80),
EVIL (56,"Malum","Evil, The Nether, Malice",5,true,0x700000),
FLUX (57,"Mutatio","Flux, Chaos",5,true,0xb80bb9),
ELDRITCH (58,"Alienis","Eldritch, The End, Strange, Alien",5,true,0x805080),
//TOREMOVE
TRAP (28,"Vinculum","Bind, Imprison, Trap",4,true,0x9a8080),
INSECT (55,"Bestiola","Spider, Web, Insects",3,false,0x808880),
MOTION (1,"Motus","Motion, Movement, Speed",1,false,0xcdccf4),
FLIGHT (5,"Volito","Flight, Leap",1,false,0xe7e7d7),
LIGHT (8,"Lux","Light, Brightness, Day",2,false,0xfff663),
CLOTH (15,"Pannus","Cloth, Fabric, Garment, Thread",3,false,0xeaeac2),
EARTH (16,"Solum","Earth, Soil, Ground, Foundation",4,false,0x713f2d),
WEATHER (22,"Aer","Weather, Mist, Climate",3,false,0xc0ffff),
COLD (23,"Gelum","Cold, Ice, Frost",3,true,0xe1ffff),
HEAL (25,"Sano","Heal, Repair, Make Sound",3,false, 0xff8184),
WOOD (32,"Lignum","Wood, Forest, Tree",4,false,0x058105),
FLOWER (33,"Flos","Flower, Bloom, Blossom",4,false,0xffff40),
FUNGUS (34,"Fungus","Mushroom, Toadstool, Fungi",4,false,0xf7e5c7),
CROP (35,"Messis","Crops, Harvest",4,false,0xe3ff80),
;
// Attributes
public final int id;
public final String name;
public final String meaning;
/**
* rough categories for the aspect types. Mostly just used to determine the common aspect type in certain biomes.
*/
public final int element; //1-air, 2-fire, 3-water, 4-earth, 5-mystical, 6-dead/aggressive, 999-deprecated
/**
* will wisps spawned from this fluxtype be aggressive?
*/
public final boolean aggro;
public final int color;
private EnumTag(int id, String name, String meaning, int element,boolean aggro, int color ) {
this.id = id;
this.name = name;
this.meaning = meaning;
this.element = element;
this.color = color;
this.aggro = aggro;
}
// Lookup
private static final Map<Integer,EnumTag> lookup = new HashMap<Integer,EnumTag>();
static { for(EnumTag s : EnumSet.allOf(EnumTag.class)) lookup.put(s.getId(), s); }
public int getId() { return id; }
public static EnumTag get(int id) {
if (lookup.get(id)==null||lookup.get(id).element==999)
return EnumTag.FLUX;
else
return lookup.get(id);
}
}

129
src/minecraft/thaumcraft/api/IAspectSource.java Normal file → Executable file
View file

@ -1,63 +1,66 @@
package thaumcraft.api; package thaumcraft.api;
import thaumcraft.api.aspects.Aspect;
/** import thaumcraft.api.aspects.AspectList;
* @author Azanor
*
* This interface is implemented by tile entites (or possibly anything else) like jars, alembics and the /**
* crucible so that they can act as an essentia source for blocks like the infusion altar. * @author Azanor
* *
*/ * This interface is implemented by tile entites (or possibly anything else) like jars, alembics and the
public interface IAspectSource { * crucible so that they can act as an essentia source for blocks like the infusion altar.
*
/** */
* This method is used to add a certain amount of an aspect to the tile entity. public interface IAspectSource {
* @param tag
* @param amount /**
* @return the amount of aspect left over that could not be added. * This method is used to add a certain amount of an aspect to the tile entity.
*/ * @param tag
public int addToSource(EnumTag tag, int amount); * @param amount
* @return the amount of aspect left over that could not be added.
/** */
* Removes a certain amount of a specific aspect from the tile entity public int addToSource(Aspect tag, int amount);
* @param tag
* @param amount /**
* @return true if that amount of aspect was available and was removed * Removes a certain amount of a specific aspect from the tile entity
*/ * @param tag
public boolean takeFromSource(EnumTag tag, int amount); * @param amount
* @return true if that amount of aspect was available and was removed
/** */
* removes a bunch of different aspects and amounts from the tile entity. public boolean takeFromSource(Aspect tag, int amount);
* @param ot the ObjectTags object that contains the aspects and their amounts.
* @return true if all the aspects and their amounts were available and successfully removed /**
*/ * removes a bunch of different aspects and amounts from the tile entity.
public boolean takeFromSource(ObjectTags ot); * @param ot the ObjectTags object that contains the aspects and their amounts.
* @return true if all the aspects and their amounts were available and successfully removed
/** */
* Checks if the tile entity contains the listed amount (or more) of the aspect public boolean takeFromSource(AspectList ot);
* @param tag
* @param amount /**
* @return * Checks if the tile entity contains the listed amount (or more) of the aspect
*/ * @param tag
public boolean doesSourceContainAmount(EnumTag tag,int amount); * @param amount
* @return
/** */
* Checks if the tile entity contains all the listed aspects and their amounts public boolean doesSourceContainAmount(Aspect tag,int amount);
* @param ot the ObjectTags object that contains the aspects and their amounts.
* @return /**
*/ * Checks if the tile entity contains all the listed aspects and their amounts
public boolean doesSourceContain(ObjectTags ot); * @param ot the ObjectTags object that contains the aspects and their amounts.
* @return
/** */
* Returns how much of the aspect this tile entity contains public boolean doesSourceContain(AspectList ot);
* @param tag
* @return the amount of that aspect found /**
*/ * Returns how much of the aspect this tile entity contains
public int sourceContains(EnumTag tag); * @param tag
* @return the amount of that aspect found
/** */
* Returns all the aspects and their amounts that this tile entity contains public int sourceContains(Aspect tag);
* @return
*/ /**
public ObjectTags getSourceTags(); * Returns all the aspects and their amounts that this tile entity contains
} * @return
*/
public AspectList getSourceTags();
}

30
src/minecraft/thaumcraft/api/IVisDiscounter.java Normal file → Executable file
View file

@ -1,15 +1,15 @@
package thaumcraft.api; package thaumcraft.api;
/** /**
* @author Azanor * @author Azanor
* ItemArmor with this interface will grant a discount to the vis cost of actions the wearer performs with casting wands. * ItemArmor with this interface will grant a discount to the vis cost of actions the wearer performs with casting wands.
* The amount returned is the percentage by which the cost is discounted. There is a built-int max discount of 50%, but * The amount returned is the percentage by which the cost is discounted. There is a built-int max discount of 50%, but
* individual items really shouldn't have a discount more than 5% * individual items really shouldn't have a discount more than 5%
*/ */
public interface IVisDiscounter { public interface IVisDiscounter {
int getVisDiscount(); int getVisDiscount();
} }

40
src/minecraft/thaumcraft/api/IVisRepairable.java Normal file → Executable file
View file

@ -1,27 +1,13 @@
package thaumcraft.api; package thaumcraft.api;
import net.minecraft.entity.Entity;
import net.minecraft.item.ItemStack;
/**
* @author Azanor
/** * Items, armor and tools with this interface can receive the Repair enchantment.
* @author Azanor * Repairs 1 point of durability every 10 seconds (2 for repair II)
* Items and tools with this interface can receive the Repair enchantment. */
* Armor, weapons and tools are handled automatically. public interface IVisRepairable {
* Usually 1 vis equals 1 point of durability every 2 seconds (1 second for repair II)
* Repair enchant values over II also grants a reduction in speed, but at a much
* reduced rate (about 2 ticks per rating over II) }
* Some sample code:<p>
* <i>
* public void doRepair(ItemStack is, Entity e) {<br>
* if (AuraManager.decreaseClosestAura(e.worldObj,e.posX, e.posY, e.posZ, 1)) {<br>
* is.damageItem(-1,(EntityLiving) e);<br>
* }<br>
* }<br><br>
*</i>
*/
public interface IVisRepairable {
void doRepair(ItemStack stack, Entity e);
}

113
src/minecraft/thaumcraft/api/ItemApi.java Normal file → Executable file
View file

@ -1,58 +1,55 @@
package thaumcraft.api; package thaumcraft.api;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.FMLLog;
/** /**
* @author Azanor * @author Azanor
* *
* This is used to gain access to the items in my mod. * This is used to gain access to the items in my mod.
* I only give some examples and it will probably still * I only give some examples and it will probably still
* require a bit of work for you to get hold of everything you need. * require a bit of work for you to get hold of everything you need.
* *
*/ */
public class ItemApi { public class ItemApi {
public static ItemStack getItem(String itemString, int meta) { public static ItemStack getItem(String itemString, int meta) {
ItemStack item = null; ItemStack item = null;
try { try {
String itemClass = "thaumcraft.common.Config"; String itemClass = "thaumcraft.common.Config";
Object obj = Class.forName(itemClass).getField(itemString).get(null); Object obj = Class.forName(itemClass).getField(itemString).get(null);
if (obj instanceof Item) { if (obj instanceof Item) {
item = new ItemStack((Item) obj,1,meta); item = new ItemStack((Item) obj,1,meta);
} else if (obj instanceof Block) { } else if (obj instanceof Block) {
item = new ItemStack((Block) obj,1,meta); item = new ItemStack((Block) obj,1,meta);
} else if (obj instanceof ItemStack) { } else if (obj instanceof ItemStack) {
item = (ItemStack) obj; item = (ItemStack) obj;
} }
} catch (Exception ex) { } catch (Exception ex) {
FMLLog.warning("[Thaumcraft] Could not retrieve item or block identified by: " + itemString); FMLLog.warning("[Thaumcraft] Could not retrieve item or block identified by: " + itemString);
} }
return item; return item;
} }
/** /**
* *
* Some examples * Some examples
* *
* Casting Wands: * Casting Wands:
* itemWandCastingApprentice, itemWandCastingAdept, itemWandCastingMage * itemWandCasting
* *
* Elemental Wands: * Resources:
* itemWandFire, itemWandLightning, itemWandFrost, itemWandTrade, itemWandExcavation, itemHellrod * itemEssence, itemWispEssence, itemResource, itemShard, itemNugget,
* * itemNuggetChicken, itemNuggetBeef, itemNuggetPork, itemTripleMeatTreat,
* Resources: * blockWooden, blockMarker
* itemEssence, itemWispEssence, itemResource, itemShard, itemNugget, *
* itemNuggetChicken, itemNuggetBeef, itemNuggetPork, itemTripleMeatTreat, * Research:
* blockWooden, blockMarker * itemResearchNotes, itemInkwell, itemThaumonomicon
* *
* Research: */
* itemResearchNotes, itemInkwell, itemThaumonomicon
* }
*/
}

58
src/minecraft/thaumcraft/api/MaterialTaint.java Executable file
View file

@ -0,0 +1,58 @@
package thaumcraft.api;
import net.minecraft.block.material.MapColor;
import net.minecraft.block.material.Material;
public class MaterialTaint extends Material
{
public MaterialTaint(MapColor par1MapColor)
{
super(par1MapColor);
this.setNoPushMobility();
this.setRequiresTool();
}
@Override
public boolean isSolid()
{
return false;
}
@Override
public boolean isReplaceable()
{
return false;
}
/**
* Will prevent grass from growing on dirt underneath and kill any grass below it if it returns true
*/
@Override
public boolean getCanBlockGrass()
{
return false;
}
/**
* Returns if this material is considered solid or not
*/
@Override
public boolean blocksMovement()
{
return true;
}
@Override
protected Material setRequiresTool() {
// TODO Auto-generated method stub
return super.setRequiresTool();
}
@Override
public int getMaterialMobility() {
// TODO Auto-generated method stub
return super.getMaterialMobility();
}
}

171
src/minecraft/thaumcraft/api/ObjectTags.java
View file

@ -1,171 +0,0 @@
package thaumcraft.api;
import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
import net.minecraft.item.ItemStack;
public class ObjectTags implements Serializable {
public Map<EnumTag,Integer> tags = new HashMap<EnumTag,Integer>();//aspects associated with this object
/**
* this creates a new aspect list with preloaded values based off the aspects of the given item.
* @param id the item/block id of an existing item
* @param meta the damage value of an existing item
*/
public ObjectTags(int id, int meta) {
ObjectTags temp = ThaumcraftApiHelper.getObjectTags(new ItemStack(id,1,meta));
if (temp!=null)
for (EnumTag tag:temp.getAspects()) {
add(tag,temp.getAmount(tag));
}
}
public ObjectTags() {
}
/**
* @return the amount of different aspects in this collection
*/
public int size() {
return tags.size();
}
/**
* @return an array of all the aspects in this collection
*/
public EnumTag[] getAspects() {
EnumTag[] q = new EnumTag[1];
return tags.keySet().toArray(q);
}
/**
* @return an array of all the aspects in this collection sorted by name
*/
public EnumTag[] getAspectsSorted() {
EnumTag[] out = tags.keySet().toArray(new EnumTag[1]);
boolean change=false;
do {
change=false;
for(int a=0;a<out.length-1;a++) {
EnumTag e1 = out[a];
EnumTag e2 = out[a+1];
if (e1!=null && e2!=null && e1.name.compareTo(e2.name)>0) {
out[a] = e2;
out[a+1] = e1;
change = true;
break;
}
}
} while (change==true);
return out;
}
/**
* @return an array of all the aspects in this collection sorted by name
*/
public EnumTag[] getAspectsSortedAmount() {
EnumTag[] out = tags.keySet().toArray(new EnumTag[1]);
boolean change=false;
do {
change=false;
for(int a=0;a<out.length-1;a++) {
int e1 = getAmount(out[a]);
int e2 = getAmount(out[a+1]);
if (e1>0 && e2>0 && e2>e1) {
EnumTag ea = out[a];
EnumTag eb = out[a+1];
out[a] = eb;
out[a+1] = ea;
change = true;
break;
}
}
} while (change==true);
return out;
}
/**
* @param key
* @return the amount associated with the given aspect in this collection
*/
public int getAmount(EnumTag key) {
return tags.get(key)==null?0:tags.get(key);
}
/**
* Reduces the amount of an aspect in this collection by the given amount.
* If reduced below 0 the aspect will be removed completely.
* @param key
* @param amount
* @return
*/
public boolean reduceAmount(EnumTag key, int amount) {
if (getAmount(key)>=amount) {
int am = getAmount(key)-amount;
if (am<=0) tags.remove(key); else
tags.put(key, am);
return true;
}
return false;
}
/**
* Reduces the amount of an aspect in this collection by the given amount.
* If reduced below 0 the aspect will be removed completely.
* If the aspect does not exist then a negative value will be added.
* Only used by aura internals for flux management.
* @param key
* @param amount
* @return
*/
public ObjectTags remove(EnumTag key, int amount) {
if (getAmount(key)>=amount) {
int am = getAmount(key)-amount;
if (am<=0) tags.remove(key); else
this.tags.put(key, am);
} else if (getAmount(key)==0) {
this.tags.put(key, -amount);
}
return this;
}
/**
* Adds this aspect and amount to the collection.
* If the aspect exists then its value will be increased by the given amount.
* @param aspect
* @param amount
* @return
*/
public ObjectTags add(EnumTag aspect, int amount) {
if (this.tags.containsKey(aspect)) {
int oldamount = this.tags.get(aspect);
amount+=oldamount;
}
this.tags.put( aspect, amount );
return this;
}
/**
* Adds this aspect and amount to the collection.
* If the aspect exists then only the highest of the old or new amount will be used.
* @param aspect
* @param amount
* @return
*/
public ObjectTags merge(EnumTag aspect, int amount) {
if (this.tags.containsKey(aspect)) {
int oldamount = this.tags.get(aspect);
if (amount<oldamount) amount=oldamount;
}
this.tags.put( aspect, amount );
return this;
}
}

1154
src/minecraft/thaumcraft/api/ThaumcraftApi.java Normal file → Executable file
View file

File diff suppressed because it is too large Load diff

208
src/minecraft/thaumcraft/api/ThaumcraftApiHelper.java Normal file → Executable file
View file

@ -1,103 +1,105 @@
package thaumcraft.api; package thaumcraft.api;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import cpw.mods.fml.common.FMLLog; import thaumcraft.api.aspects.AspectList;
import cpw.mods.fml.common.FMLLog;
public class ThaumcraftApiHelper {
public static ObjectTags cullTags(ObjectTags temp) { public class ThaumcraftApiHelper {
while (temp!=null && temp.size()>5) {
EnumTag lowest = null; public static AspectList cullTags(AspectList temp) {
int low = Integer.MAX_VALUE; // while (temp!=null && temp.size()>5) {
for (EnumTag tag:temp.getAspects()) { // EnumTag lowest = null;
if (temp.getAmount(tag)<low) { // int low = Integer.MAX_VALUE;
low = temp.getAmount(tag); // for (EnumTag tag:temp.getAspects()) {
lowest = tag; // if (temp.getAmount(tag)<low) {
} // low = temp.getAmount(tag);
} // lowest = tag;
temp.tags.remove(lowest); // }
} // }
return temp; // temp.aspects.remove(lowest);
} // }
return temp;
public static boolean areItemsEqual(ItemStack s1,ItemStack s2) }
{
if (s1.isItemStackDamageable() && s2.isItemStackDamageable()) public static boolean areItemsEqual(ItemStack s1,ItemStack s2)
{ {
return s1.itemID == s2.itemID; if (s1.isItemStackDamageable() && s2.isItemStackDamageable())
} else {
return s1.itemID == s2.itemID && s1.getItemDamage() == s2.getItemDamage(); return s1.itemID == s2.itemID;
} } else
return s1.itemID == s2.itemID && s1.getItemDamage() == s2.getItemDamage();
static Method isResearchComplete; }
static Method getObjectTags;
static Method getBonusTags; static Method isResearchComplete;
static Method generateTags; static Method getObjectTags;
public static boolean isResearchComplete(String username, String researchkey) { static Method getBonusTags;
boolean ot = false; static Method generateTags;
try { public static boolean isResearchComplete(String username, String researchkey) {
if(isResearchComplete == null) { boolean ot = false;
Class fake = Class.forName("thaumcraft.common.research.ResearchManager"); try {
isResearchComplete = fake.getMethod("isResearchComplete", String.class, String.class); if(isResearchComplete == null) {
} Class fake = Class.forName("thaumcraft.common.lib.research.ResearchManager");
ot = (Boolean) isResearchComplete.invoke(null, username, researchkey); isResearchComplete = fake.getMethod("isResearchComplete", String.class, String.class);
} catch(Exception ex) { }
FMLLog.warning("[Thaumcraft API] Could not invoke thaumcraft.common.research.ResearchManager method isResearchComplete"); ot = (Boolean) isResearchComplete.invoke(null, username, researchkey);
} } catch(Exception ex) {
return ot; FMLLog.warning("[Thaumcraft API] Could not invoke thaumcraft.common.lib.research.ResearchManager method isResearchComplete");
} }
return ot;
public static ItemStack getStackInRowAndColumn(Object instance, int row, int column) { }
ItemStack ot = null;
try { public static ItemStack getStackInRowAndColumn(Object instance, int row, int column) {
Class fake = Class.forName("thaumcraft.common.tiles.TileMagicWorkbench"); ItemStack ot = null;
Method getStackInRowAndColumn = fake.getMethod("getStackInRowAndColumn", int.class, int.class); try {
ot = (ItemStack) getStackInRowAndColumn.invoke(instance, row, column); Class fake = Class.forName("thaumcraft.common.tiles.TileMagicWorkbench");
} catch(Exception ex) { Method getStackInRowAndColumn = fake.getMethod("getStackInRowAndColumn", int.class, int.class);
FMLLog.warning("[Thaumcraft API] Could not invoke thaumcraft.common.tiles.TileMagicWorkbench method getStackInRowAndColumn"); ot = (ItemStack) getStackInRowAndColumn.invoke(instance, row, column);
} } catch(Exception ex) {
return ot; FMLLog.warning("[Thaumcraft API] Could not invoke thaumcraft.common.tiles.TileMagicWorkbench method getStackInRowAndColumn");
} }
return ot;
public static ObjectTags getObjectTags(ItemStack is) { }
ObjectTags ot = null;
try { public static AspectList getObjectAspects(ItemStack is) {
if(getObjectTags == null) { AspectList ot = null;
Class fake = Class.forName("thaumcraft.common.lib.ThaumcraftCraftingManager"); try {
getObjectTags = fake.getMethod("getObjectTags", ItemStack.class); if(getObjectTags == null) {
} Class fake = Class.forName("thaumcraft.common.lib.ThaumcraftCraftingManager");
ot = (ObjectTags) getObjectTags.invoke(null, is); getObjectTags = fake.getMethod("getObjectTags", ItemStack.class);
} catch(Exception ex) { }
FMLLog.warning("[Thaumcraft API] Could not invoke thaumcraft.common.lib.ThaumcraftCraftingManager method getObjectTags"); ot = (AspectList) getObjectTags.invoke(null, is);
} } catch(Exception ex) {
return ot; FMLLog.warning("[Thaumcraft API] Could not invoke thaumcraft.common.lib.ThaumcraftCraftingManager method getObjectTags");
} }
return ot;
public static ObjectTags getBonusObjectTags(ItemStack is,ObjectTags ot) { }
try { public static AspectList getBonusObjectTags(ItemStack is,AspectList ot) {
if(getBonusTags == null) {
Class fake = Class.forName("thaumcraft.common.lib.ThaumcraftCraftingManager"); try {
getBonusTags = fake.getMethod("getBonusTags", ItemStack.class, ObjectTags.class); if(getBonusTags == null) {
} Class fake = Class.forName("thaumcraft.common.lib.ThaumcraftCraftingManager");
ot = (ObjectTags) getBonusTags.invoke(null, is, ot); getBonusTags = fake.getMethod("getBonusTags", ItemStack.class, AspectList.class);
} catch(Exception ex) { }
FMLLog.warning("[Thaumcraft API] Could not invoke thaumcraft.common.lib.ThaumcraftCraftingManager method getBonusTags"); ot = (AspectList) getBonusTags.invoke(null, is, ot);
} } catch(Exception ex) {
return ot; FMLLog.warning("[Thaumcraft API] Could not invoke thaumcraft.common.lib.ThaumcraftCraftingManager method getBonusTags");
} }
return ot;
public static ObjectTags generateTags(int id, int meta) { }
try {
if(generateTags == null) { public static AspectList generateTags(int id, int meta) {
Class fake = Class.forName("thaumcraft.common.lib.ThaumcraftCraftingManager"); try {
generateTags = fake.getMethod("generateTags", int.class, int.class); if(generateTags == null) {
} Class fake = Class.forName("thaumcraft.common.lib.ThaumcraftCraftingManager");
return (ObjectTags) generateTags.invoke(null, id, meta); generateTags = fake.getMethod("generateTags", int.class, int.class);
} catch(Exception ex) { }
FMLLog.warning("[Thaumcraft API] Could not invoke thaumcraft.common.lib.ThaumcraftCraftingManager method generateTags"); return (AspectList) generateTags.invoke(null, id, meta);
} } catch(Exception ex) {
return null; FMLLog.warning("[Thaumcraft API] Could not invoke thaumcraft.common.lib.ThaumcraftCraftingManager method generateTags");
} }
} return null;
}
}

63
src/minecraft/thaumcraft/api/TileThaumcraft.java Executable file
View file

@ -0,0 +1,63 @@
package thaumcraft.api;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.INetworkManager;
import net.minecraft.network.packet.Packet;
import net.minecraft.network.packet.Packet132TileEntityData;
import net.minecraft.tileentity.TileEntity;
/**
*
* @author azanor
*
* Custom tile entity class I use for most of my tile entities. Setup in such a way that only
* the nbt data within readCustomNBT / writeCustomNBT will be sent to the client when the tile
* updates. Apart from all the normal TE data that gets sent that is.
*
*/
public class TileThaumcraft extends TileEntity {
//NBT stuff
@Override
public void readFromNBT(NBTTagCompound nbttagcompound)
{
super.readFromNBT(nbttagcompound);
readCustomNBT(nbttagcompound);
}
public void readCustomNBT(NBTTagCompound nbttagcompound)
{
//TODO
}
@Override
public void writeToNBT(NBTTagCompound nbttagcompound)
{
super.writeToNBT(nbttagcompound);
writeCustomNBT(nbttagcompound);
}
public void writeCustomNBT(NBTTagCompound nbttagcompound)
{
//TODO
}
//Client Packet stuff
@Override
public Packet getDescriptionPacket() {
NBTTagCompound nbttagcompound = new NBTTagCompound();
this.writeCustomNBT(nbttagcompound);
return new Packet132TileEntityData(this.xCoord, this.yCoord, this.zCoord, -999, nbttagcompound);
}
@Override
public void onDataPacket(INetworkManager net, Packet132TileEntityData pkt) {
super.onDataPacket(net, pkt);
this.readCustomNBT(pkt.customParam1);
}
}

289
src/minecraft/thaumcraft/api/aspects/Aspect.java Normal file → Executable file
View file

@ -1,85 +1,204 @@
package thaumcraft.api.aspects; package thaumcraft.api.aspects;
import java.util.HashMap; import java.util.ArrayList;
import java.util.Collection;
public class Aspect { import java.util.LinkedHashMap;
String tag; import net.minecraft.util.ResourceLocation;
Aspect[] components; import net.minecraft.util.StatCollector;
public Aspect(String tag, Aspect[] components) { import org.apache.commons.lang3.text.WordUtils;
this.tag = tag;
this.components = components; public class Aspect {
aspects.put(tag, this); String tag;
} Aspect[] components;
int color;
public Aspect(String tag) { private String chatcolor;
this.tag = tag; ResourceLocation image;
aspects.put(tag, this); int blend;
}
/**
public String getTag() { * Use this constructor to register your own aspects.
return tag; * @param tag the key that will be used to reference this aspect, as well as its latin display name
} * @param color color to display the tag in
* @param components the aspects this one is formed from
public void setTag(String tag) { * @param image ResourceLocation pointing to a 32x32 icon of the aspect
this.tag = tag; * @param blend GL11 blendmode (1 or 771). Used for rendering nodes. Default is 1
} */
public Aspect(String tag, int color, Aspect[] components, ResourceLocation image, int blend) {
public Aspect[] getComponents() { if (aspects.containsKey(tag)) throw new IllegalArgumentException(tag+" already registered!");
return components; this.tag = tag;
} this.components = components;
this.color = color;
public void setComponents(Aspect[] components) { this.image = image;
this.components = components; this.blend = blend;
} aspects.put(tag, this);
}
///////////////////////////////
public static HashMap<String,Aspect> aspects = new HashMap<String,Aspect>(); /**
* Shortcut constructor I use for the default aspects - you shouldn't be using this.
//PRIMAL */
public static final Aspect AIR = new Aspect("Air"); public Aspect(String tag, int color, Aspect[] components) {
public static final Aspect EARTH = new Aspect("Earth"); this(tag,color,components,new ResourceLocation("thaumcraft","textures/aspects/"+tag.toLowerCase()+".png"),1);
public static final Aspect FIRE = new Aspect("Fire"); }
public static final Aspect WATER = new Aspect("Water");
public static final Aspect POSITIVE = new Aspect("Positive"); /**
public static final Aspect NEGATIVE = new Aspect("Negative"); * Shortcut constructor I use for the default aspects - you shouldn't be using this.
public static final Aspect ORDER = new Aspect("Order"); */
public static final Aspect CHAOS = new Aspect("Chaos"); public Aspect(String tag, int color, Aspect[] components, int blend) {
this(tag,color,components,new ResourceLocation("thaumcraft","textures/aspects/"+tag.toLowerCase()+".png"),blend);
//SECONDARY TODO }
public static final Aspect VOID = new Aspect("Void", new Aspect[] {NEGATIVE, POSITIVE});
public static final Aspect LIGHT = new Aspect("Light", new Aspect[] {AIR, FIRE}); /**
public static final Aspect DARKNESS = new Aspect("Darkness", new Aspect[] {VOID, LIGHT}); * Shortcut constructor I use for the primal aspects -
public static final Aspect ASTRAL = new Aspect("Astral", new Aspect[] {VOID, DARKNESS}); * you shouldn't use this as making your own primal aspects will break all the things.
public static final Aspect ENERGY = new Aspect("Energy", new Aspect[] {POSITIVE, FIRE}); */
public static final Aspect LIFE = new Aspect("Life", new Aspect[] {POSITIVE, ENERGY}); public Aspect(String tag, int color, String chatcolor, int blend) {
public static final Aspect DEATH = new Aspect("Death", new Aspect[] {NEGATIVE, ENERGY}); this(tag,color,(Aspect[])null, blend);
public static final Aspect MOTION = new Aspect("Motion", new Aspect[] {AIR, ORDER}); this.setChatcolor(chatcolor);
public static final Aspect WEATHER = new Aspect("Weather", new Aspect[] {AIR, CHAOS}); }
public static final Aspect STONE = new Aspect("Stone", new Aspect[] {EARTH, ORDER});
public static final Aspect METAL = new Aspect("Metal", new Aspect[] {STONE, FIRE}); public int getColor() {
public static final Aspect SAND = new Aspect("Sand", new Aspect[] {AIR, STONE}); return color;
public static final Aspect SOUL = new Aspect("Soul", new Aspect[] {DEATH, LIFE}); }
public static final Aspect HEAL = new Aspect("Heal", new Aspect[] {POSITIVE, LIFE});
public static final Aspect HARM = new Aspect("Harm", new Aspect[] {NEGATIVE, LIFE}); public String getName() {
public static final Aspect ANIMATE = new Aspect("Animate",new Aspect[] {MOTION, LIFE}); return WordUtils.capitalizeFully(tag);
public static final Aspect MAN = new Aspect("Man", new Aspect[] {LIFE, SOUL}); }
public static final Aspect BEAST = new Aspect("Beast", new Aspect[] {LIFE, CHAOS});
public static final Aspect BIRD = new Aspect("Bird", new Aspect[] {BEAST, AIR}); public String getLocalizedDescription() {
public static final Aspect FISH = new Aspect("Fish", new Aspect[] {BEAST, WATER}); return StatCollector.translateToLocal("tc.aspect."+tag);
public static final Aspect SEED = new Aspect("Seed", new Aspect[] {LIFE, EARTH}); }
public static final Aspect TREE = new Aspect("Tree", new Aspect[] {SEED, EARTH});
public static final Aspect TOOL = new Aspect("Tool", new Aspect[] {MAN, METAL}); public String getTag() {
public static final Aspect MINE = new Aspect("Mine", new Aspect[] {MAN, STONE}); return tag;
public static final Aspect WOOD = new Aspect("Wood", new Aspect[] {TREE, TOOL}); }
public static final Aspect MACHINE = new Aspect("Machine", new Aspect[] {TOOL, ORDER});
public void setTag(String tag) {
this.tag = tag;
// public static final Aspect TRAVEL = new Aspect("Travel", new Aspect[] {MOTION, EARTH}); }
// public static final Aspect TELEPORT = new Aspect("Teleport", new Aspect[] {TRAVEL, VOID});
// public static final Aspect GLASS = new Aspect("Glass", new Aspect[] {SAND, FIRE}); public Aspect[] getComponents() {
// public static final Aspect CLAY = new Aspect("Clay", new Aspect[] {SAND, LIFE}); return components;
}
}
public void setComponents(Aspect[] components) {
this.components = components;
}
public ResourceLocation getImage() {
return image;
}
public static Aspect getAspect(String tag) {
return aspects.get(tag);
}
public int getBlend() {
return blend;
}
public void setBlend(int blend) {
this.blend = blend;
}
public boolean isPrimal() {
return getComponents()==null || getComponents().length!=2;
}
///////////////////////////////
public static ArrayList<Aspect> getPrimalAspects() {
ArrayList<Aspect> primals = new ArrayList<Aspect>();
Collection<Aspect> pa = aspects.values();
for (Aspect aspect:pa) {
if (aspect.isPrimal()) primals.add(aspect);
}
return primals;
}
public String getChatcolor() {
return chatcolor;
}
public void setChatcolor(String chatcolor) {
this.chatcolor = chatcolor;
}
///////////////////////////////
public static LinkedHashMap<String,Aspect> aspects = new LinkedHashMap<String,Aspect>();
//PRIMAL
public static final Aspect AIR = new Aspect("aer",0xffff7e,"e",1);
public static final Aspect EARTH = new Aspect("terra",0x56c000,"2",1);
public static final Aspect FIRE = new Aspect("ignis",0xff5a01,"c",1);
public static final Aspect WATER = new Aspect("aqua",0x3cd4fc,"3",1);
public static final Aspect ORDER = new Aspect("ordo",0xd5d4ec,"7",1);
public static final Aspect ENTROPY = new Aspect("perditio",0x404040,"8",771);
//SECONDARY TODO
public static final Aspect VOID = new Aspect("vacuos",0x888888, new Aspect[] {ORDER, ENTROPY},771);
public static final Aspect LIGHT = new Aspect("lux",0xfff663, new Aspect[] {AIR, FIRE});
public static final Aspect ENERGY = new Aspect("potentia",0xc0ffff, new Aspect[] {ORDER, FIRE});
public static final Aspect MOTION = new Aspect("motus",0xcdccf4, new Aspect[] {AIR, ORDER});
public static final Aspect STONE = new Aspect("saxum",0x808080, new Aspect[] {EARTH, EARTH});
public static final Aspect LIFE = new Aspect("victus",0xde0005, new Aspect[] {WATER, EARTH});
public static final Aspect WEATHER = new Aspect("tempestas",0xFFFFFF, new Aspect[] {AIR, WATER});
//TERTIARY TODO
public static final Aspect DEATH = new Aspect("mortuus",0x887788, new Aspect[] {LIFE, ENTROPY});
public static final Aspect FLIGHT = new Aspect("volatus",0xe7e7d7, new Aspect[] {AIR, MOTION});
public static final Aspect DARKNESS = new Aspect("tenebrae",0x222222, new Aspect[] {VOID, LIGHT});
public static final Aspect SOUL = new Aspect("spiritus",0xebebfb, new Aspect[] {LIFE, DEATH});
public static final Aspect MAGIC = new Aspect("praecantatio",0x9700c0, new Aspect[] {VOID, ENERGY});
public static final Aspect AURA = new Aspect("auram",0xffc0ff, new Aspect[] {MAGIC, AIR});
public static final Aspect TAINT = new Aspect("vitium",0x800080, new Aspect[] {MAGIC, ENTROPY});
public static final Aspect SEED = new Aspect("granum",0xeea16e, new Aspect[] {LIFE, EARTH});
public static final Aspect SLIME = new Aspect("limus",0x01f800, new Aspect[] {LIFE, WATER});
public static final Aspect PLANT = new Aspect("herba",0x01ac00, new Aspect[] {SEED, EARTH});
public static final Aspect TREE = new Aspect("arbor",0x876531, new Aspect[] {EARTH, PLANT});
public static final Aspect BEAST = new Aspect("bestia",0x9f6409, new Aspect[] {MOTION, LIFE});
public static final Aspect FLESH = new Aspect("corpus",0xee478d, new Aspect[] {DEATH,BEAST});
public static final Aspect UNDEAD = new Aspect("exanimis",0x3a4000, new Aspect[] {MOTION, DEATH});
public static final Aspect MIND = new Aspect("cognitio",0xffc2b3, new Aspect[] {EARTH, SOUL});
public static final Aspect MAN = new Aspect("humanus",0xffd7c0, new Aspect[] {BEAST, MIND});
public static final Aspect SENSES = new Aspect("sensus",0x0fd9ff, new Aspect[] {AIR, SOUL});
public static final Aspect CROP = new Aspect("messis",0xe1b371, new Aspect[] {SEED, MAN});
public static final Aspect HARVEST = new Aspect("meto",0xeead82, new Aspect[] {CROP, MAN});
public static final Aspect METAL = new Aspect("metallum",0xb5b5cd, new Aspect[] {STONE, ORDER});
public static final Aspect MINE = new Aspect("perfodio",0xFFFFFF, new Aspect[] {MAN, STONE});
public static final Aspect TOOL = new Aspect("instrumentum",0xFFFFFF, new Aspect[] {MAN, METAL});
public static final Aspect WEAPON = new Aspect("telum",0xFFFFFF, new Aspect[] {TOOL, ENTROPY});
public static final Aspect ARMOR = new Aspect("tutamen",0x00c0c0, new Aspect[] {TOOL, ORDER});
public static final Aspect CLOTH = new Aspect("pannus",0xeaeac2, new Aspect[] {TOOL, BEAST});
// public static final Aspect LAVA = new Aspect("lava",0xe85729, new Aspect[] {EARTH, FIRE});
// public static final Aspect STEAM = new Aspect("steam",0xFFFFFF, new Aspect[] {WATER, FIRE});
// public static final Aspect MUD = new Aspect("lutum",0x473423, new Aspect[] {WATER, EARTH});
// public static final Aspect SAND = new Aspect("sand",0xFFFFFF, new Aspect[] {AIR, EARTH});
// public static final Aspect ASTRAL = new Aspect("Astral",0xFFFFFF, new Aspect[] {VOID, DARKNESS});
// public static final Aspect HEAL = new Aspect("Heal",0xFFFFFF, new Aspect[] {ORDER, LIFE});
// public static final Aspect HARM = new Aspect("Harm",0xFFFFFF, new Aspect[] {ENTROPY, LIFE});
// public static final Aspect BIRD = new Aspect("Bird",0xFFFFFF, new Aspect[] {BEAST, AIR});
// public static final Aspect FISH = new Aspect("Fish",0xFFFFFF, new Aspect[] {BEAST, WATER});
// public static final Aspect TOOL = new Aspect("Tool",0xFFFFFF, new Aspect[] {MAN, METAL});
// public static final Aspect WOOD = new Aspect("Wood",0xFFFFFF, new Aspect[] {TREE, TOOL});
// public static final Aspect MACHINE = new Aspect("Machine",0xFFFFFF, new Aspect[] {TOOL, ORDER});
// public static final Aspect TRAVEL = new Aspect("Travel",0xFFFFFF, new Aspect[] {MOTION, EARTH});
// public static final Aspect TELEPORT = new Aspect("Teleport",0xFFFFFF, new Aspect[] {TRAVEL, VOID});
// public static final Aspect CLAY = new Aspect("Clay",0xFFFFFF, new Aspect[] {SAND, LIFE});
public static final Aspect HEAL = new Aspect("heal",0xFFFFFF, new Aspect[] {ORDER, LIFE});
public static final Aspect POISON = new Aspect("poison",0xFFFFFF, new Aspect[] {WATER, DEATH});
public static final Aspect TRAP = new Aspect("pannus",0xeaeac2, new Aspect[] {MOTION, ENTROPY});
public static final Aspect ICE = new Aspect("ice",0xde0005, new Aspect[] {WATER, ORDER});
}

240
src/minecraft/thaumcraft/api/aspects/AspectList.java Executable file
View file

@ -0,0 +1,240 @@
package thaumcraft.api.aspects;
import java.io.Serializable;
import java.util.LinkedHashMap;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import thaumcraft.api.ThaumcraftApiHelper;
public class AspectList implements Serializable {
public LinkedHashMap<Aspect,Integer> aspects = new LinkedHashMap<Aspect,Integer>();//aspects associated with this object
/**
* this creates a new aspect list with preloaded values based off the aspects of the given item.
* @param id the item/block id of an existing item
* @param meta the damage value of an existing item
*/
public AspectList(int id, int meta) {
try {
AspectList temp = ThaumcraftApiHelper.getObjectAspects(new ItemStack(id,1,meta));
if (temp!=null)
for (Aspect tag:temp.getAspects()) {
add(tag,temp.getAmount(tag));
}
} catch (Exception e) {}
}
public AspectList() {
}
public AspectList copy() {
AspectList out = new AspectList();
for (Aspect a:this.getAspects())
out.add(a, this.getAmount(a));
return out;
}
/**
* @return the amount of different aspects in this collection
*/
public int size() {
return aspects.size();
}
/**
* @return an array of all the aspects in this collection
*/
public Aspect[] getAspects() {
Aspect[] q = new Aspect[1];
return aspects.keySet().toArray(q);
}
/**
* @return an array of all the aspects in this collection
*/
public Aspect[] getPrimalAspects() {
AspectList t = new AspectList();
for (Aspect as:aspects.keySet()) {
if (as.isPrimal()) {
t.add(as,1);
}
}
Aspect[] q = new Aspect[1];
return t.aspects.keySet().toArray(q);
}
/**
* @return an array of all the aspects in this collection sorted by name
*/
public Aspect[] getAspectsSorted() {
Aspect[] out = aspects.keySet().toArray(new Aspect[1]);
boolean change=false;
do {
change=false;
for(int a=0;a<out.length-1;a++) {
Aspect e1 = out[a];
Aspect e2 = out[a+1];
if (e1!=null && e2!=null && e1.getTag().compareTo(e2.getTag())>0) {
out[a] = e2;
out[a+1] = e1;
change = true;
break;
}
}
} while (change==true);
return out;
}
/**
* @return an array of all the aspects in this collection sorted by amount
*/
public Aspect[] getAspectsSortedAmount() {
Aspect[] out = aspects.keySet().toArray(new Aspect[1]);
boolean change=false;
do {
change=false;
for(int a=0;a<out.length-1;a++) {
int e1 = getAmount(out[a]);
int e2 = getAmount(out[a+1]);
if (e1>0 && e2>0 && e2>e1) {
Aspect ea = out[a];
Aspect eb = out[a+1];
out[a] = eb;
out[a+1] = ea;
change = true;
break;
}
}
} while (change==true);
return out;
}
/**
* @param key
* @return the amount associated with the given aspect in this collection
*/
public int getAmount(Aspect key) {
return aspects.get(key)==null?0:aspects.get(key);
}
/**
* Reduces the amount of an aspect in this collection by the given amount.
* @param key
* @param amount
* @return
*/
public boolean reduce(Aspect key, int amount) {
if (getAmount(key)>=amount) {
int am = getAmount(key)-amount;
aspects.put(key, am);
return true;
}
return false;
}
/**
* Reduces the amount of an aspect in this collection by the given amount.
* If reduced below 0 the aspect will be removed completely.
* If the aspect does not exist then a negative value will be added.
* @param key
* @param amount
* @return
*/
public AspectList remove(Aspect key, int amount) {
if (getAmount(key)>=amount) {
int am = getAmount(key)-amount;
if (am<=0) aspects.remove(key); else
this.aspects.put(key, am);
} else if (getAmount(key)==0) {
this.aspects.put(key, -amount);
}
return this;
}
/**
* Simply removes the aspect from the list
* @param key
* @param amount
* @return
*/
public AspectList remove(Aspect key) {
aspects.remove(key);
return this;
}
/**
* Adds this aspect and amount to the collection.
* If the aspect exists then its value will be increased by the given amount.
* @param aspect
* @param amount
* @return
*/
public AspectList add(Aspect aspect, int amount) {
if (this.aspects.containsKey(aspect)) {
int oldamount = this.aspects.get(aspect);
amount+=oldamount;
}
this.aspects.put( aspect, amount );
return this;
}
/**
* Adds this aspect and amount to the collection.
* If the aspect exists then only the highest of the old or new amount will be used.
* @param aspect
* @param amount
* @return
*/
public AspectList merge(Aspect aspect, int amount) {
if (this.aspects.containsKey(aspect)) {
int oldamount = this.aspects.get(aspect);
if (amount<oldamount) amount=oldamount;
}
this.aspects.put( aspect, amount );
return this;
}
/**
* Reads the list of aspects from nbt
* @param nbttagcompound
* @return
*/
public void readFromNBT(NBTTagCompound nbttagcompound)
{
aspects.clear();
NBTTagList tlist = nbttagcompound.getTagList("Aspects");
for (int j = 0; j < tlist.tagCount(); j++) {
NBTTagCompound rs = (NBTTagCompound) tlist.tagAt(j);
if (rs.hasKey("key")) {
add( Aspect.getAspect(rs.getString("key")),
rs.getInteger("amount"));
}
}
}
/**
* Writes the list of aspects to nbt
* @param nbttagcompound
* @return
*/
public void writeToNBT(NBTTagCompound nbttagcompound)
{
NBTTagList tlist = new NBTTagList();
nbttagcompound.setTag("Aspects", tlist);
for (Aspect aspect : getAspects())
if (aspect != null) {
NBTTagCompound f = new NBTTagCompound();
f.setString("key", aspect.getTag());
f.setInteger("amount", getAmount(aspect));
tlist.appendTag(f);
}
}
}

38
src/minecraft/thaumcraft/api/aura/AuraNode.java
View file

@ -1,38 +0,0 @@
package thaumcraft.api.aura;
import java.io.Serializable;
import thaumcraft.api.ObjectTags;
public class AuraNode implements Serializable {
//key
public int key;
//aura
public short level;
public short baseLevel;
public ObjectTags flux = new ObjectTags();
public EnumNodeType type;
//location
public int dimension;
public double xPos;
public double yPos;
public double zPos;
public boolean locked;
public AuraNode(int key, short lvl, EnumNodeType type, int dim, int x, int y, int z) {
this.key = key;
this.level = lvl;
this.baseLevel = lvl;
this.type = type;
this.dimension = dim;
this.xPos = x+.5d;
this.yPos = y+.5d;
this.zPos = z+.5d;
}
public AuraNode() {
}
}

21
src/minecraft/thaumcraft/api/aura/EnumNodeType.java
View file

@ -1,21 +0,0 @@
package thaumcraft.api.aura;
public enum EnumNodeType {
NORMAL,
PURE,
DARK,
UNSTABLE;
public static final EnumNodeType[] VALID_TYPES = {NORMAL,PURE,DARK,UNSTABLE};
public static EnumNodeType getType(int id)
{
if (id >= 0 && id < VALID_TYPES.length)
{
return VALID_TYPES[id];
}
return NORMAL;
}
}

63
src/minecraft/thaumcraft/api/crafting/IArcaneRecipe.java Normal file → Executable file
View file

@ -1,30 +1,33 @@
package thaumcraft.api.crafting; package thaumcraft.api.crafting;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory; import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
public interface IArcaneRecipe import thaumcraft.api.aspects.AspectList;
{
public interface IArcaneRecipe
{
/**
* Used to check if a recipe matches current crafting inventory
* @param player /**
*/ * Used to check if a recipe matches current crafting inventory
boolean matches(IInventory var1, EntityPlayer player); * @param player
*/
/** boolean matches(IInventory var1, World world, EntityPlayer player);
* Returns an Item that is the result of this recipe
*/ /**
ItemStack getCraftingResult(IInventory var1); * Returns an Item that is the result of this recipe
*/
/** ItemStack getCraftingResult(IInventory var1);
* Returns the size of the recipe area
*/ /**
int getRecipeSize(); * Returns the size of the recipe area
*/
ItemStack getRecipeOutput(); int getRecipeSize();
int getCost();
String getKey(); ItemStack getRecipeOutput();
} AspectList getAspects();
String getResearch();
}

30
src/minecraft/thaumcraft/api/crafting/IInfusionRecipe.java
View file

@ -1,30 +0,0 @@
package thaumcraft.api.crafting;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import thaumcraft.api.ObjectTags;
public interface IInfusionRecipe
{
/**
* Used to check if a recipe matches current crafting inventory
* @param player
*/
boolean matches(IInventory var1, EntityPlayer player);
/**
* Returns an Item that is the result of this recipe
*/
ItemStack getCraftingResult(IInventory var1);
/**
* Returns the size of the recipe area
*/
int getRecipeSize();
ItemStack getRecipeOutput();
int getCost();
ObjectTags getTags();
String getKey();
}

105
src/minecraft/thaumcraft/api/crafting/RecipeCrucible.java Normal file → Executable file
View file

@ -1,51 +1,54 @@
package thaumcraft.api.crafting; package thaumcraft.api.crafting;
import net.minecraft.item.ItemStack; import java.util.ArrayList;
import thaumcraft.api.EnumTag;
import thaumcraft.api.ObjectTags; import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
public class RecipeCrucible { import thaumcraft.api.aspects.Aspect;
import thaumcraft.api.aspects.AspectList;
public ItemStack recipeOutput;
public ObjectTags tags; public class RecipeCrucible {
public String key;
public String researchKey; public ItemStack recipeOutput;
public int cost; public Object catalyst;
public AspectList aspects;
public RecipeCrucible(String researchKey, String key, ItemStack result, ObjectTags tags, int cost) { public String key;
recipeOutput = result;
this.tags = tags; public RecipeCrucible(String researchKey, ItemStack result, Object catalyst, AspectList tags) {
this.key = key; recipeOutput = result;
this.researchKey = researchKey; this.aspects = tags;
this.cost = cost; this.key = researchKey;
} this.catalyst = catalyst;
if (catalyst instanceof String) {
public RecipeCrucible(String key, ItemStack result, ObjectTags tags, int cost) { catalyst = OreDictionary.getOres((String) catalyst);
recipeOutput = result; }
this.tags = tags; }
this.key = key;
this.researchKey = key;
this.cost = cost; public boolean matches(AspectList itags, ItemStack cat) {
} if (catalyst instanceof ItemStack && !cat.isItemEqual((ItemStack) catalyst)) {
return false;
public boolean matches(ObjectTags itags) { } else if (catalyst instanceof ArrayList && ((ArrayList<ItemStack>)catalyst).size()>0) {
if (itags==null) return false; //if (!OreDictionary.containsMatch(true, ((ArrayList<ItemStack>)catalyst).toArray(new ItemStack[]{}), cat)) return false;
for (EnumTag tag:tags.getAspects()) { }
if (itags.getAmount(tag)<tags.getAmount(tag)) return false; if (itags==null) return false;
} for (Aspect tag:aspects.getAspects()) {
return true; if (itags.getAmount(tag)<aspects.getAmount(tag)) return false;
} }
return true;
public ObjectTags removeMatching(ObjectTags itags) { }
ObjectTags temptags = new ObjectTags();
temptags.tags.putAll(itags.tags); public AspectList removeMatching(AspectList itags) {
AspectList temptags = new AspectList();
for (EnumTag tag:tags.getAspects()) { temptags.aspects.putAll(itags.aspects);
if (!temptags.reduceAmount(tag, tags.getAmount(tag))) return null;
} for (Aspect tag:aspects.getAspects()) {
temptags.remove(tag, aspects.getAmount(tag));
itags = temptags; // if (!temptags.remove(tag, aspects.getAmount(tag))) return null;
return itags; }
}
itags = temptags;
} return itags;
}
}

171
src/minecraft/thaumcraft/api/crafting/ShapedArcaneCraftingRecipes.java
View file

@ -1,171 +0,0 @@
package thaumcraft.api.crafting;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTBase;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.oredict.OreDictionary;
import thaumcraft.api.ThaumcraftApiHelper;
public class ShapedArcaneCraftingRecipes implements IArcaneRecipe
{
/** How many horizontal slots this recipe is wide. */
public int recipeWidth;
/** How many vertical slots this recipe uses. */
public int recipeHeight;
public String key;
public int cost;
/** Is a array of ItemStack that composes the recipe. */
public ItemStack[] recipeItems;
/** Is the ItemStack that you get when craft the recipe. */
private ItemStack recipeOutput;
/** Is the itemID of the output item that you get when craft the recipe. */
public final int recipeOutputItemID;
public ShapedArcaneCraftingRecipes(String key, int par1, int par2, ItemStack[] par3ArrayOfItemStack, ItemStack par4ItemStack, int cost)
{
this.recipeOutputItemID = par4ItemStack.itemID;
this.recipeWidth = par1;
this.recipeHeight = par2;
this.recipeItems = par3ArrayOfItemStack;
this.recipeOutput = par4ItemStack;
this.key = key;
this.cost = cost;
}
@Override
public ItemStack getRecipeOutput()
{
return this.recipeOutput;
}
/**
* Used to check if a recipe matches current crafting inventory
*/
@Override
public boolean matches(IInventory par1InventoryCrafting, EntityPlayer player)
{
if (key.length()>0 && !ThaumcraftApiHelper.isResearchComplete(player.username, key)) {
return false;
}
for (int var2 = 0; var2 <= 3 - this.recipeWidth; ++var2)
{
for (int var3 = 0; var3 <= 3 - this.recipeHeight; ++var3)
{
if (this.checkMatch(par1InventoryCrafting, var2, var3, true))
{
return true;
}
if (this.checkMatch(par1InventoryCrafting, var2, var3, false))
{
return true;
}
}
}
return false;
}
/**
* Checks if the region of a crafting inventory is match for the recipe.
*/
private boolean checkMatch(IInventory par1InventoryCrafting, int par2, int par3, boolean par4)
{
for (int var5 = 0; var5 < 3; ++var5)
{
for (int var6 = 0; var6 < 3; ++var6)
{
int var7 = var5 - par2;
int var8 = var6 - par3;
ItemStack var9 = null;
if (var7 >= 0 && var8 >= 0 && var7 < this.recipeWidth && var8 < this.recipeHeight)
{
if (par4)
{
var9 = this.recipeItems[this.recipeWidth - var7 - 1 + var8 * this.recipeWidth];
}
else
{
var9 = this.recipeItems[var7 + var8 * this.recipeWidth];
}
}
ItemStack var10 = ThaumcraftApiHelper.getStackInRowAndColumn(par1InventoryCrafting, var5, var6);
if (var10 != null || var9 != null)
{
if (var10 == null && var9 != null || var10 != null && var9 == null)
{
return false;
}
if (var9.itemID != var10.itemID)
{
return false;
}
if (var9.getItemDamage() != OreDictionary.WILDCARD_VALUE && var9.getItemDamage() != var10.getItemDamage())
{
return false;
}
if (var9.hasTagCompound()) {
NBTTagCompound tc = var9.getTagCompound();
for (Object tag:tc.getTags().toArray()) {
NBTBase base = (NBTBase)tag;
Class nc = NBTBase.newTag(base.getId(), base.getName()).getClass();
if (!(var10.hasTagCompound() &&
nc.cast(var10.getTagCompound().getTag(base.getName())).equals(nc.cast(base)))) {
return false;
}
}
}
}
}
}
return true;
}
/**
* Returns an Item that is the result of this recipe
*/
@Override
public ItemStack getCraftingResult(IInventory par1InventoryCrafting)
{
return new ItemStack(this.recipeOutput.itemID, this.recipeOutput.stackSize, this.recipeOutput.getItemDamage());
}
/**
* Returns the size of the recipe area
*/
@Override
public int getRecipeSize()
{
return this.recipeWidth * this.recipeHeight;
}
@Override
public int getCost() {
return cost;
}
@Override
public String getKey() {
return key;
}
}

257
src/minecraft/thaumcraft/api/crafting/ShapedArcaneRecipe.java Executable file
View file

@ -0,0 +1,257 @@
package thaumcraft.api.crafting;
import java.util.ArrayList;
import java.util.HashMap;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.InventoryCrafting;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import net.minecraftforge.oredict.OreDictionary;
import thaumcraft.api.ThaumcraftApiHelper;
import thaumcraft.api.aspects.AspectList;
public class ShapedArcaneRecipe implements IArcaneRecipe
{
//Added in for future ease of change, but hard coded for now.
private static final int MAX_CRAFT_GRID_WIDTH = 3;
private static final int MAX_CRAFT_GRID_HEIGHT = 3;
public ItemStack output = null;
public Object[] input = null;
public AspectList aspects = null;
public String research;
public int width = 0;
public int height = 0;
private boolean mirrored = true;
public ShapedArcaneRecipe(String research, Block result, AspectList aspects, Object... recipe){ this(research, new ItemStack(result), aspects, recipe); }
public ShapedArcaneRecipe(String research, Item result, AspectList aspects, Object... recipe){ this(research, new ItemStack(result), aspects, recipe); }
public ShapedArcaneRecipe(String research, ItemStack result, AspectList aspects, Object... recipe)
{
output = result.copy();
this.research = research;
this.aspects = aspects;
String shape = "";
int idx = 0;
if (recipe[idx] instanceof Boolean)
{
mirrored = (Boolean)recipe[idx];
if (recipe[idx+1] instanceof Object[])
{
recipe = (Object[])recipe[idx+1];
}
else
{
idx = 1;
}
}
if (recipe[idx] instanceof String[])
{
String[] parts = ((String[])recipe[idx++]);
for (String s : parts)
{
width = s.length();
shape += s;
}
height = parts.length;
}
else
{
while (recipe[idx] instanceof String)
{
String s = (String)recipe[idx++];
shape += s;
width = s.length();
height++;
}
}
if (width * height != shape.length())
{
String ret = "Invalid shaped ore recipe: ";
for (Object tmp : recipe)
{
ret += tmp + ", ";
}
ret += output;
throw new RuntimeException(ret);
}
HashMap<Character, Object> itemMap = new HashMap<Character, Object>();
for (; idx < recipe.length; idx += 2)
{
Character chr = (Character)recipe[idx];
Object in = recipe[idx + 1];
if (in instanceof ItemStack)
{
itemMap.put(chr, ((ItemStack)in).copy());
}
else if (in instanceof Item)
{
itemMap.put(chr, new ItemStack((Item)in));
}
else if (in instanceof Block)
{
itemMap.put(chr, new ItemStack((Block)in, 1, OreDictionary.WILDCARD_VALUE));
}
else if (in instanceof String)
{
itemMap.put(chr, OreDictionary.getOres((String)in));
}
else
{
String ret = "Invalid shaped ore recipe: ";
for (Object tmp : recipe)
{
ret += tmp + ", ";
}
ret += output;
throw new RuntimeException(ret);
}
}
input = new Object[width * height];
int x = 0;
for (char chr : shape.toCharArray())
{
input[x++] = itemMap.get(chr);
}
}
@Override
public ItemStack getCraftingResult(IInventory var1){ return output.copy(); }
@Override
public int getRecipeSize(){ return input.length; }
@Override
public ItemStack getRecipeOutput(){ return output; }
@Override
public boolean matches(IInventory inv, World world, EntityPlayer player)
{
if (research.length()>0 && !ThaumcraftApiHelper.isResearchComplete(player.username, research)) {
return false;
}
for (int x = 0; x <= MAX_CRAFT_GRID_WIDTH - width; x++)
{
for (int y = 0; y <= MAX_CRAFT_GRID_HEIGHT - height; ++y)
{
if (checkMatch(inv, x, y, false))
{
return true;
}
if (mirrored && checkMatch(inv, x, y, true))
{
return true;
}
}
}
return false;
}
private boolean checkMatch(IInventory inv, int startX, int startY, boolean mirror)
{
for (int x = 0; x < MAX_CRAFT_GRID_WIDTH; x++)
{
for (int y = 0; y < MAX_CRAFT_GRID_HEIGHT; y++)
{
int subX = x - startX;
int subY = y - startY;
Object target = null;
if (subX >= 0 && subY >= 0 && subX < width && subY < height)
{
if (mirror)
{
target = input[width - subX - 1 + subY * width];
}
else
{
target = input[subX + subY * width];
}
}
ItemStack slot = ThaumcraftApiHelper.getStackInRowAndColumn(inv, x, y);
if (target instanceof ItemStack)
{
if (!checkItemEquals((ItemStack)target, slot))
{
return false;
}
}
else if (target instanceof ArrayList)
{
boolean matched = false;
for (ItemStack item : (ArrayList<ItemStack>)target)
{
matched = matched || checkItemEquals(item, slot);
}
if (!matched)
{
return false;
}
}
else if (target == null && slot != null)
{
return false;
}
}
}
return true;
}
private boolean checkItemEquals(ItemStack target, ItemStack input)
{
if (input == null && target != null || input != null && target == null)
{
return false;
}
return (target.itemID == input.itemID &&
ItemStack.areItemStackTagsEqual(target, input) &&
(target.getItemDamage() == OreDictionary.WILDCARD_VALUE|| target.getItemDamage() == input.getItemDamage()));
}
public ShapedArcaneRecipe setMirrored(boolean mirror)
{
mirrored = mirror;
return this;
}
/**
* Returns the input for this recipe, any mod accessing this value should never
* manipulate the values in this array as it will effect the recipe itself.
* @return The recipes input vales.
*/
public Object[] getInput()
{
return this.input;
}
@Override
public AspectList getAspects() {
return aspects;
}
@Override
public String getResearch() {
return research;
}
}

175
src/minecraft/thaumcraft/api/crafting/ShapedInfusionCraftingRecipes.java
View file

@ -1,175 +0,0 @@
package thaumcraft.api.crafting;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTBase;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.oredict.OreDictionary;
import thaumcraft.api.ObjectTags;
import thaumcraft.api.ThaumcraftApiHelper;
public class ShapedInfusionCraftingRecipes implements IInfusionRecipe
{
/** How many horizontal slots this recipe is wide. */
public int recipeWidth;
/** How many vertical slots this recipe uses. */
public int recipeHeight;
public String key;
@Override
public String getKey() {
return key;
}
public int cost;
public ObjectTags tags;
/** Is a array of ItemStack that composes the recipe. */
public ItemStack[] recipeItems;
/** Is the ItemStack that you get when craft the recipe. */
private ItemStack recipeOutput;
/** Is the itemID of the output item that you get when craft the recipe. */
public final int recipeOutputItemID;
public ShapedInfusionCraftingRecipes(String key, int par1, int par2, ItemStack[] par3ArrayOfItemStack, ItemStack par4ItemStack, int cost, ObjectTags tags)
{
this.recipeOutputItemID = par4ItemStack.itemID;
this.recipeWidth = par1;
this.recipeHeight = par2;
this.recipeItems = par3ArrayOfItemStack;
this.recipeOutput = par4ItemStack;
this.key = key;
this.cost = cost;
this.tags = tags;
}
@Override
public ItemStack getRecipeOutput()
{
return this.recipeOutput;
}
/**
* Used to check if a recipe matches current crafting inventory
*/
@Override
public boolean matches(IInventory par1InventoryCrafting, EntityPlayer player)
{
if (key.length()>0 && !ThaumcraftApiHelper.isResearchComplete(player.username, key)) {
return false;
}
for (int var2 = 0; var2 <= 3 - this.recipeWidth; ++var2)
{
for (int var3 = 0; var3 <= 3 - this.recipeHeight; ++var3)
{
if (this.checkMatch(par1InventoryCrafting, var2, var3, true))
{
return true;
}
if (this.checkMatch(par1InventoryCrafting, var2, var3, false))
{
return true;
}
}
}
return false;
}
/**
* Checks if the region of a crafting inventory is match for the recipe.
*/
private boolean checkMatch(IInventory par1InventoryCrafting, int par2, int par3, boolean par4)
{
for (int var5 = 0; var5 < 3; ++var5)
{
for (int var6 = 0; var6 < 3; ++var6)
{
int var7 = var5 - par2;
int var8 = var6 - par3;
ItemStack var9 = null;
if (var7 >= 0 && var8 >= 0 && var7 < this.recipeWidth && var8 < this.recipeHeight)
{
if (par4)
{
var9 = this.recipeItems[this.recipeWidth - var7 - 1 + var8 * this.recipeWidth];
}
else
{
var9 = this.recipeItems[var7 + var8 * this.recipeWidth];
}
}
ItemStack var10 = ThaumcraftApiHelper.getStackInRowAndColumn(par1InventoryCrafting, var5, var6);
if (var10 != null || var9 != null)
{
if (var10 == null && var9 != null || var10 != null && var9 == null)
{
return false;
}
if (var9.itemID != var10.itemID)
{
return false;
}
if (var9.getItemDamage() != OreDictionary.WILDCARD_VALUE && var9.getItemDamage() != var10.getItemDamage())
{
return false;
}
if (var9.hasTagCompound()) {
NBTTagCompound tc = var9.getTagCompound();
for (Object tag:tc.getTags().toArray()) {
NBTBase base = (NBTBase)tag;
Class nc = NBTBase.newTag(base.getId(), base.getName()).getClass();
if (!(var10.hasTagCompound() &&
nc.cast(var10.getTagCompound().getTag(base.getName())).equals(nc.cast(base)))) {
return false;
}
}
}
}
}
}
return true;
}
/**
* Returns an Item that is the result of this recipe
*/
@Override
public ItemStack getCraftingResult(IInventory par1InventoryCrafting)
{
return new ItemStack(this.recipeOutput.itemID, this.recipeOutput.stackSize, this.recipeOutput.getItemDamage());
}
/**
* Returns the size of the recipe area
*/
@Override
public int getRecipeSize()
{
return this.recipeWidth * this.recipeHeight;
}
@Override
public int getCost() {
return cost;
}
@Override
public ObjectTags getTags() {
return tags;
}
}

131
src/minecraft/thaumcraft/api/crafting/ShapelessArcaneCraftingRecipes.java
View file

@ -1,131 +0,0 @@
package thaumcraft.api.crafting;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTBase;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.oredict.OreDictionary;
import thaumcraft.api.ThaumcraftApiHelper;
public class ShapelessArcaneCraftingRecipes implements IArcaneRecipe
{
/** Is the ItemStack that you get when craft the recipe. */
private final ItemStack recipeOutput;
/** Is a List of ItemStack that composes the recipe. */
public final List recipeItems;
public String key;
@Override
public String getKey() {
return key;
}
public int cost;
public ShapelessArcaneCraftingRecipes(String key, ItemStack par1ItemStack, List par2List, int cost)
{
this.recipeOutput = par1ItemStack;
this.recipeItems = par2List;
this.key = key;
this.cost = cost;
}
@Override
public ItemStack getRecipeOutput()
{
return this.recipeOutput;
}
/**
* Used to check if a recipe matches current crafting inventory
*/
@Override
public boolean matches(IInventory par1InventoryCrafting, EntityPlayer player)
{
if (key.length()>0 && !ThaumcraftApiHelper.isResearchComplete(player.username, key)) {
return false;
}
ArrayList var2 = new ArrayList(this.recipeItems);
for (int var3 = 0; var3 < 3; ++var3)
{
for (int var4 = 0; var4 < 3; ++var4)
{
ItemStack var5 = ThaumcraftApiHelper.getStackInRowAndColumn(par1InventoryCrafting, var4, var3);
if (var5 != null)
{
boolean var6 = false;
Iterator var7 = var2.iterator();
while (var7.hasNext())
{
ItemStack var8 = (ItemStack)var7.next();
if (var5.itemID == var8.itemID && (var8.getItemDamage() == OreDictionary.WILDCARD_VALUE || var5.getItemDamage() == var8.getItemDamage()))
{
boolean matches=true;
if (var8.hasTagCompound()) {
NBTTagCompound tc = var8.getTagCompound();
for (Object tag:tc.getTags().toArray()) {
NBTBase base = (NBTBase)tag;
Class nc = NBTBase.newTag(base.getId(), base.getName()).getClass();
if (!(var5.hasTagCompound() &&
nc.cast(var5.getTagCompound().getTag(base.getName())).equals(nc.cast(base)))) {
matches=false;
break;
}
}
}
if (matches) {
var6 = true;
var2.remove(var8);
break;
}
}
}
if (!var6)
{
return false;
}
}
}
}
return var2.isEmpty();
}
/**
* Returns an Item that is the result of this recipe
*/
@Override
public ItemStack getCraftingResult(IInventory par1InventoryCrafting)
{
return this.recipeOutput.copy();
}
/**
* Returns the size of the recipe area
*/
@Override
public int getRecipeSize()
{
return this.recipeItems.size();
}
@Override
public int getCost() {
return cost;
}
}

152
src/minecraft/thaumcraft/api/crafting/ShapelessArcaneRecipe.java Executable file
View file

@ -0,0 +1,152 @@
package thaumcraft.api.crafting;
import java.util.ArrayList;
import java.util.Iterator;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import net.minecraftforge.oredict.OreDictionary;
import thaumcraft.api.ThaumcraftApiHelper;
import thaumcraft.api.aspects.AspectList;
public class ShapelessArcaneRecipe implements IArcaneRecipe
{
private ItemStack output = null;
private ArrayList input = new ArrayList();
public AspectList aspects = null;
public String research;
public ShapelessArcaneRecipe(String research, Block result, AspectList aspects, Object... recipe){ this(research,new ItemStack(result),aspects, recipe); }
public ShapelessArcaneRecipe(String research, Item result, AspectList aspects, Object... recipe){ this(research,new ItemStack(result),aspects, recipe); }
public ShapelessArcaneRecipe(String research, ItemStack result, AspectList aspects, Object... recipe)
{
output = result.copy();
this.research = research;
this.aspects = aspects;
for (Object in : recipe)
{
if (in instanceof ItemStack)
{
input.add(((ItemStack)in).copy());
}
else if (in instanceof Item)
{
input.add(new ItemStack((Item)in));
}
else if (in instanceof Block)
{
input.add(new ItemStack((Block)in));
}
else if (in instanceof String)
{
input.add(OreDictionary.getOres((String)in));
}
else
{
String ret = "Invalid shapeless ore recipe: ";
for (Object tmp : recipe)
{
ret += tmp + ", ";
}
ret += output;
throw new RuntimeException(ret);
}
}
}
@Override
public int getRecipeSize(){ return input.size(); }
@Override
public ItemStack getRecipeOutput(){ return output; }
@Override
public ItemStack getCraftingResult(IInventory var1){ return output.copy(); }
@Override
public boolean matches(IInventory var1, World world, EntityPlayer player)
{
if (research.length()>0 && !ThaumcraftApiHelper.isResearchComplete(player.username, research)) {
return false;
}
ArrayList required = new ArrayList(input);
for (int x = 0; x < var1.getSizeInventory(); x++)
{
ItemStack slot = var1.getStackInSlot(x);
if (slot != null)
{
boolean inRecipe = false;
Iterator req = required.iterator();
while (req.hasNext())
{
boolean match = false;
Object next = req.next();
if (next instanceof ItemStack)
{
match = checkItemEquals((ItemStack)next, slot);
}
else if (next instanceof ArrayList)
{
for (ItemStack item : (ArrayList<ItemStack>)next)
{
match = match || checkItemEquals(item, slot);
}
}
if (match)
{
inRecipe = true;
required.remove(next);
break;
}
}
if (!inRecipe)
{
return false;
}
}
}
return required.isEmpty();
}
private boolean checkItemEquals(ItemStack target, ItemStack input)
{
return (target.itemID == input.itemID &&
ItemStack.areItemStackTagsEqual(target, input) &&
(target.getItemDamage() == OreDictionary.WILDCARD_VALUE || target.getItemDamage() == input.getItemDamage()));
}
/**
* Returns the input for this recipe, any mod accessing this value should never
* manipulate the values in this array as it will effect the recipe itself.
* @return The recipes input vales.
*/
public ArrayList getInput()
{
return this.input;
}
@Override
public AspectList getAspects() {
return aspects;
}
@Override
public String getResearch() {
return research;
}
}

140
src/minecraft/thaumcraft/api/crafting/ShapelessInfusionCraftingRecipes.java
View file

@ -1,140 +0,0 @@
package thaumcraft.api.crafting;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTBase;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.oredict.OreDictionary;
import thaumcraft.api.ObjectTags;
import thaumcraft.api.ThaumcraftApiHelper;
public class ShapelessInfusionCraftingRecipes implements IInfusionRecipe
{
/** Is the ItemStack that you get when craft the recipe. */
private final ItemStack recipeOutput;
/** Is a List of ItemStack that composes the recipe. */
public final List recipeItems;
public String key;
@Override
public String getKey() {
return key;
}
public int cost;
public ObjectTags tags;
public ShapelessInfusionCraftingRecipes(String key, ItemStack par1ItemStack, List par2List, int cost, ObjectTags tags)
{
this.recipeOutput = par1ItemStack;
this.recipeItems = par2List;
this.key = key;
this.cost = cost;
this.tags = tags;
}
@Override
public ItemStack getRecipeOutput()
{
return this.recipeOutput;
}
/**
* Used to check if a recipe matches current crafting inventory
*/
@Override
public boolean matches(IInventory par1InventoryCrafting, EntityPlayer player)
{
if (key.length()>0 && !ThaumcraftApiHelper.isResearchComplete(player.username, key)) {
return false;
}
ArrayList var2 = new ArrayList(this.recipeItems);
for (int var3 = 0; var3 < 3; ++var3)
{
for (int var4 = 0; var4 < 3; ++var4)
{
ItemStack var5 = ThaumcraftApiHelper.getStackInRowAndColumn(par1InventoryCrafting, var4, var3);
if (var5 != null)
{
boolean var6 = false;
Iterator var7 = var2.iterator();
while (var7.hasNext())
{
ItemStack var8 = (ItemStack)var7.next();
if (var5.itemID == var8.itemID && (var8.getItemDamage() == OreDictionary.WILDCARD_VALUE || var5.getItemDamage() == var8.getItemDamage()))
{
boolean matches=true;
if (var8.hasTagCompound()) {
NBTTagCompound tc = var8.getTagCompound();
for (Object tag:tc.getTags().toArray()) {
NBTBase base = (NBTBase)tag;
Class nc = NBTBase.newTag(base.getId(), base.getName()).getClass();
if (!(var5.hasTagCompound() &&
nc.cast(var5.getTagCompound().getTag(base.getName())).equals(nc.cast(base)))) {
matches=false;
break;
}
}
}
if (matches) {
var6 = true;
var2.remove(var8);
break;
}
}
}
if (!var6)
{
return false;
}
}
}
}
return var2.isEmpty();
}
/**
* Returns an Item that is the result of this recipe
*/
@Override
public ItemStack getCraftingResult(IInventory par1InventoryCrafting)
{
return this.recipeOutput.copy();
}
/**
* Returns the size of the recipe area
*/
@Override
public int getRecipeSize()
{
return this.recipeItems.size();
}
@Override
public int getCost() {
return cost;
}
@Override
public ObjectTags getTags() {
return tags;
}
}

138
src/minecraft/thaumcraft/api/crafting/ShapelessInfusionCraftingWithNBTRecipes.java
View file

@ -1,138 +0,0 @@
package thaumcraft.api.crafting;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTBase;
import net.minecraftforge.oredict.OreDictionary;
import thaumcraft.api.ObjectTags;
import thaumcraft.api.ThaumcraftApiHelper;
public class ShapelessInfusionCraftingWithNBTRecipes implements IInfusionRecipe
{
/** Is the ItemStack that you get when craft the recipe. */
private final ItemStack recipeOutput;
/** Is a List of ItemStack that composes the recipe. */
public final List recipeItems;
/** Is a List of nbt key/value pairs. */
public final List<NBTBase> nbtList;
public String key;
@Override
public String getKey() {
return key;
}
public int cost;
public ObjectTags tags;
public ShapelessInfusionCraftingWithNBTRecipes(String key,
ItemStack par1ItemStack,
List par2List, int cost, ObjectTags tags,
List<NBTBase> nbtList)
{
this.recipeOutput = par1ItemStack;
this.recipeItems = par2List;
this.key = key;
this.cost = cost;
this.tags = tags;
this.nbtList = nbtList;
}
@Override
public ItemStack getRecipeOutput()
{
return this.recipeOutput;
}
/**
* Used to check if a recipe matches current crafting inventory
*/
@Override
public boolean matches(IInventory par1InventoryCrafting, EntityPlayer player)
{
if (key.length()>0 && !ThaumcraftApiHelper.isResearchComplete(player.username, key)) {
return false;
}
ArrayList var2 = new ArrayList(this.recipeItems);
for (int var3 = 0; var3 < 3; ++var3)
{
for (int var4 = 0; var4 < 3; ++var4)
{
ItemStack var5 = ThaumcraftApiHelper.getStackInRowAndColumn(par1InventoryCrafting, var4, var3);
if (var5 != null)
{
boolean var6 = false;
Iterator var7 = var2.iterator();
b1:
while (var7.hasNext())
{
ItemStack var8 = (ItemStack)var7.next();
if (var5.itemID == var8.itemID && (var8.getItemDamage() == OreDictionary.WILDCARD_VALUE || var5.getItemDamage() == var8.getItemDamage()))
{
for (NBTBase nbt:nbtList) {
try {
Class nc = NBTBase.newTag(nbt.getId(), nbt.getName()).getClass();
if (var5.hasTagCompound() &&
nc.cast(var5.getTagCompound().getTag(nbt.getName())).equals(nc.cast(nbt))) {
var6 = true;
var2.remove(var8);
break b1;
}
} catch (Exception e) {/*probably classcast*/}
}
}
}
if (!var6)
{
return false;
}
}
}
}
return var2.isEmpty();
}
/**
* Returns an Item that is the result of this recipe
*/
@Override
public ItemStack getCraftingResult(IInventory par1InventoryCrafting)
{
return this.recipeOutput.copy();
}
/**
* Returns the size of the recipe area
*/
@Override
public int getRecipeSize()
{
return this.recipeItems.size();
}
@Override
public int getCost() {
return cost;
}
@Override
public ObjectTags getTags() {
return tags;
}
}

218
src/minecraft/thaumcraft/api/nodes/TileNodeBase.java Executable file
View file

@ -0,0 +1,218 @@
package thaumcraft.api.nodes;
import java.util.ArrayList;
import java.util.HashMap;
import net.minecraft.nbt.NBTTagCompound;
import thaumcraft.api.TileThaumcraft;
import thaumcraft.api.aspects.Aspect;
import thaumcraft.api.aspects.AspectList;
/**
*
* @author azanor
*
* Used as a base for all node tile entities. All the work actually gets done in a non-api TE
* that extends this class.
*
*/
public class TileNodeBase extends TileThaumcraft {
public static enum NodeType
{
NORMAL, UNSTABLE, DARK, TAINTED, HUNGRY, PURE
}
public static enum NodeModifier
{
BRIGHT, PALE, FADING
}
short nodeVisBase = 0;
AspectList aspects = new AspectList();
public static HashMap<String,ArrayList<Integer>> locations = new HashMap<String,ArrayList<Integer>>();
private NodeType nodeType=NodeType.NORMAL;
private NodeModifier nodeModifier=null;
protected String id;
public String getId() {
if (id==null) {
id = generateIdentifier();
}
return id;
}
public String generateIdentifier() {
id = worldObj.provider.dimensionId + ":" + xCoord + ":" + yCoord+ ":" + zCoord;
if (worldObj!=null && locations!=null) {
ArrayList<Integer> t = new ArrayList<Integer>();
t.add(worldObj.provider.dimensionId);
t.add(xCoord);
t.add(yCoord);
t.add(zCoord);
locations.put(id, t);
}
return id;
}
@Override
public void onChunkUnload() {
if (locations!=null) locations.remove(id);
super.onChunkUnload();
}
@Override
public void validate() {
super.validate();
if (id==null) generateIdentifier();
}
/**
* Returns all the aspects and their amounts that this node contains
* @return
*/
public AspectList getAspects() {
return aspects;
}
/**
* Sets the aspects contained within this node
* @return
*/
public void setAspects(AspectList aspects) {
this.aspects = aspects;
short highest=0;
for (Aspect aspect:aspects.getAspects()) {
if (aspects.getAmount(aspect)>highest)
highest=(short) aspects.getAmount(aspect);
}
nodeVisBase = highest;
}
/**
* This method is used to add a certain amount of an aspect to the node.
* @param tag
* @param amount
* @return the amount of aspect left over that could not be added.
*/
public int addToSource(Aspect aspect, int amount) {
int left = (amount+aspects.getAmount(aspect))-nodeVisBase;
left = left>0?left:0;
aspects.add(aspect, amount-left);
return left;
}
/**
* Removes a certain amount of a specific aspect from the node
* @param tag
* @param amount
* @return true if that amount of aspect was available and was removed
*/
public boolean takeFromSource(Aspect aspect, int amount) {
return aspects.reduce(aspect, amount);
}
/**
* Removes a single random aspect from the source
* @return the aspect that was retrieved (it is assumed that only 1 of that aspect has been removed).
* Should return null if there are not enough aspects.
*/
public Aspect takeRandomPrimalFromSource() {
Aspect[] primals = aspects.getPrimalAspects();
Aspect asp = primals[worldObj.rand.nextInt(primals.length)];
if (asp !=null && aspects.reduce(asp,1)) {
return asp;
} else {
return null;
}
}
public Aspect chooseRandomFilteredFromSource(AspectList filter) {
ArrayList<Aspect> validaspects = new ArrayList<Aspect>();
for (Aspect prim:aspects.getAspects()) {
if (filter.getAmount(prim)>0 && aspects.getAmount(prim)>0) validaspects.add(prim);
}
if (validaspects.size()==0) return null;
Aspect asp = validaspects.get(worldObj.rand.nextInt(validaspects.size()));
if (asp !=null && aspects.getAmount(asp)>0) {
return asp;
} else {
return null;
}
}
@Override
public void readCustomNBT(NBTTagCompound nbttagcompound)
{
this.id = nbttagcompound.getString("nodeId");
this.nodeVisBase = nbttagcompound.getShort("nodeVisBase");
if (worldObj!=null && locations!=null) {
ArrayList<Integer> t = new ArrayList<Integer>();
t.add(worldObj.provider.dimensionId);
t.add(xCoord);
t.add(yCoord);
t.add(zCoord);
locations.put(id, t);
}
this.setNodeType(NodeType.values()[nbttagcompound.getByte("type")]);
byte mod = nbttagcompound.getByte("modifier");
if (mod>=0)
this.setNodeModifier(NodeModifier.values()[mod]);
else
this.setNodeModifier(null);
aspects.readFromNBT(nbttagcompound);
}
@Override
public void writeCustomNBT(NBTTagCompound nbttagcompound)
{
if (id==null) id = generateIdentifier();
nbttagcompound.setString("nodeId", id);
nbttagcompound.setShort("nodeVisBase", nodeVisBase);
nbttagcompound.setByte("type", (byte) this.getNodeType().ordinal());
nbttagcompound.setByte("modifier", getNodeModifier()==null?-1:(byte) this.getNodeModifier().ordinal());
aspects.writeToNBT(nbttagcompound);
}
public NodeType getNodeType() {
return nodeType;
}
public void setNodeType(NodeType nodeType) {
this.nodeType = nodeType;
}
public void setNodeModifier(NodeModifier nodeModifier) {
this.nodeModifier = nodeModifier;
}
public NodeModifier getNodeModifier() {
return nodeModifier;
}
public int getNodeVisBase() {
return nodeVisBase;
}
public void setNodeVisBase(short nodeVisBase) {
this.nodeVisBase = nodeVisBase;
}
public void nodeChange() {
worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
}
}

18
src/minecraft/thaumcraft/api/research/IScanEventHandler.java Normal file → Executable file
View file

@ -1,9 +1,9 @@
package thaumcraft.api.research; package thaumcraft.api.research;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.world.World; import net.minecraft.world.World;
public interface IScanEventHandler { public interface IScanEventHandler {
ScanResult scanPhenomena(ItemStack stack, World world, EntityPlayer player); ScanResult scanPhenomena(ItemStack stack, World world, EntityPlayer player);
} }

85
src/minecraft/thaumcraft/api/research/ResearchCategories.java Executable file
View file

@ -0,0 +1,85 @@
package thaumcraft.api.research;
import java.util.Collection;
import java.util.LinkedHashMap;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.StatCollector;
public class ResearchCategories {
//Research
public static LinkedHashMap <String, ResearchCategoryList> researchCategories = new LinkedHashMap <String,ResearchCategoryList>();
/**
* @param key
* @return the research item linked to this key
*/
public static ResearchCategoryList getResearchList(String key) {
return researchCategories.get(key);
}
/**
* @param key
* @return the name of the research category linked to this key.
* Must be stored as localization information in the LanguageRegistry.
*/
public static String getCategoryName(String key) {
return StatCollector.translateToLocal("tc.research_category."+key);
}
/**
* @param key the research key
* @return the ResearchItem object.
*/
public static ResearchItem getResearch(String key) {
Collection rc = researchCategories.values();
for (Object cat:rc) {
Collection rl = ((ResearchCategoryList)cat).research.values();
for (Object ri:rl) {
if ((((ResearchItem)ri).key).equals(key)) return (ResearchItem)ri;
}
}
return null;
}
/**
* @param key the key used for this category
* @param icon the icon to be used for the research category tab
* @param background the resource location of the background image to use for this category
* @return the name of the research linked to this key
*/
public static void registerCategory(String key, ResourceLocation icon, ResourceLocation background) {
if (getResearchList(key)==null) {
ResearchCategoryList rl = new ResearchCategoryList(icon, background);
researchCategories.put(key, rl);
}
}
public static void addResearch(ResearchItem ri) {
ResearchCategoryList rl = getResearchList(ri.category);
if (rl!=null && !rl.research.containsKey(ri.key)) {
rl.research.put(ri.key, ri);
if (ri.displayColumn < rl.minDisplayColumn)
{
rl.minDisplayColumn = ri.displayColumn;
}
if (ri.displayRow < rl.minDisplayRow)
{
rl.minDisplayRow = ri.displayRow;
}
if (ri.displayColumn > rl.maxDisplayColumn)
{
rl.maxDisplayColumn = ri.displayColumn;
}
if (ri.displayRow > rl.maxDisplayRow)
{
rl.maxDisplayRow = ri.displayRow;
}
}
}
}

37
src/minecraft/thaumcraft/api/research/ResearchCategoryList.java Executable file
View file

@ -0,0 +1,37 @@
package thaumcraft.api.research;
import java.util.HashMap;
import java.util.Map;
import net.minecraft.util.ResourceLocation;
public class ResearchCategoryList {
/** Is the smallest column used on the GUI. */
public int minDisplayColumn;
/** Is the smallest row used on the GUI. */
public int minDisplayRow;
/** Is the biggest column used on the GUI. */
public int maxDisplayColumn;
/** Is the biggest row used on the GUI. */
public int maxDisplayRow;
/** display variables **/
public ResourceLocation icon;
public ResourceLocation background;
public ResearchCategoryList(ResourceLocation icon, ResourceLocation background) {
this.icon = icon;
this.background = background;
}
//Research
public Map<String, ResearchItem> research = new HashMap<String,ResearchItem>();
}

574
src/minecraft/thaumcraft/api/research/ResearchItem.java Normal file → Executable file
View file

@ -1,274 +1,300 @@
package thaumcraft.api.research; package thaumcraft.api.research;
import net.minecraft.block.Block; import net.minecraft.item.ItemStack;
import net.minecraft.item.Item; import net.minecraft.util.ResourceLocation;
import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector;
import thaumcraft.api.aspects.Aspect;
import org.w3c.dom.Element; import thaumcraft.api.aspects.AspectList;
import org.w3c.dom.NodeList; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import thaumcraft.api.ObjectTags;
import thaumcraft.api.ThaumcraftApi; public class ResearchItem
import cpw.mods.fml.relauncher.Side; {
import cpw.mods.fml.relauncher.SideOnly; /**
* A short string used as a key for this research. Must be unique
public class ResearchItem */
{ public final String key;
/**
* A short string used as a key for this research. Must be unique /**
*/ * A short string used as a reference to the research category to which this must be added.
public final String key; */
public final String category;
/**
* The name of the research shown in the thaumonomicon /**
*/ * The aspect tags and their values required to complete this research
public String name; */
public final AspectList tags;
/**
* The blurb text shown below the research name in the thaumonomicon /**
*/ * This links to any research that needs to be completed before this research can be discovered or learnt.
public String popupText; */
public String[] parents = null;
/**
* A longer description of the research. This is the text shown in the handheld research scroll and the research table. /**
*/ * Like parent above, but a line will not be displayed in the thaumonomicon linking them. Just used to prevent clutter.
public String longText; */
public String[] parentsHidden = null;
/** /**
* The aspect tags and their values required to complete this research * any research linked to this that will be unlocked automatically when this research is complete
*/ */
public final ObjectTags tags; public String[] siblings = null;
/** /**
* This links to any research that needs to be completed before this research can be discovered or learnt. * the horizontal position of the research icon
*/ */
public ResearchItem[] parents = null; public final int displayColumn;
/** /**
* Like parent above, but a line will not be displayed in the thaumonomicon linking them. Just used to prevent clutter. * the vertical position of the research icon
*/ */
public ResearchItem[] parentsHidden = null; public final int displayRow;
/**
* any research linked to this that will be unlocked automatically when this research is complete /**
*/ * the icon to be used for this research
public ResearchItem[] siblings = null; */
public final ItemStack icon_item;
/**
* the horizontal position of the research icon /**
*/ * the icon to be used for this research
public final int displayColumn; */
public final ResourceLocation icon_resource;
/**
* the vertical position of the research icon /**
*/ * How large the research grid is. Valid values are 1 to 5.
public final int displayRow; */
private int complexity;
/**
* the itemstack of an item or block that will be used as the icon for this research /**
*/ * Special research has a spiky border. Used for important research milestones.
public final ItemStack itemStack; */
private boolean isSpecial;
/**
* the index within the research.png file used for this research if it does not use an item icon /**
*/ * This indicates if the research should use a circular icon border. Usually used for "passive" research
public final int iconIndex; * that doesn't have recipes and grants passive effects, or that unlock automatically.
*/
/** private boolean isRound;
* Special research has a spiky border. Used for important research milestones.
*/ /**
private boolean isSpecial; * Stub research cannot be discovered by normal means, but can be unlocked via the sibling system.
/** */
* This indicates if the research should use a circular icon border. Usually used for research that doesn't private boolean isStub;
* have recipes or that unlocks automatically via the sibling system
*/ /**
private boolean isStub; * This indicated that the research is completely hidden and cannot be discovered by any
/** * player-controlled means. The recipes will never show up in the thaumonomicon.
* Indicates research that cannot be gained by normal means (either via normal or lost research), * Usually used to unlock "hidden" recipes via sibling unlocking, like
* but still uses a normal icon. Works much like isStub but is handy for mods that wish to add research * the various cap and rod combos for wands.
* through their own means and keep a normal icon. */
*/ private boolean isVirtual;
private boolean isAlternate;
/** /**
* Hidden research does not display in the thaumonomicon until discovered * Hidden research does not display in the thaumonomicon until discovered
*/ */
private boolean isHidden; private boolean isHidden;
/**
* Lost research can only be discovered via knowledge fragments /**
*/ * Lost research can only be discovered via knowledge fragments
private boolean isLost; */
/** private boolean isLost;
* These research items will automatically unlock for all players on game start
*/ /**
private boolean isAutoUnlock; * These research items will automatically unlock for all players on game start
*/
private boolean isAutoUnlock;
public ResearchItem(String par1, ObjectTags tags, int par3, int par4, int icon) private ResearchPage[] pages = null;
{
this(par1, tags, par3, par4, (ItemStack)null, icon); public ResearchItem(String par1, String par2)
} {
this.key = par1;
public ResearchItem(String par1, ObjectTags tags, int par3, int par4, ItemStack par5Item) this.category = par2;
{ this.tags = new AspectList();
this(par1, tags, par3, par4, par5Item, -1); this.icon_resource = null;
} this.icon_item = null;
this.displayColumn = 0;
public ResearchItem(String par1, ObjectTags tags, int par3, int par4, Item par5Item) this.displayRow = 0;
{ this.setVirtual();
this(par1, tags, par3, par4, new ItemStack(par5Item), -1);
} }
public ResearchItem(String par1, ObjectTags tags, int par3, int par4, Block par5Block) public ResearchItem(String par1, String par2, AspectList tags, int par3, int par4, int par5, ResourceLocation icon)
{ {
this(par1, tags, par3, par4, new ItemStack(par5Block), -1); this.key = par1;
} this.category = par2;
this.tags = tags;
public ResearchItem(String par1, ObjectTags tags, int par3, int par4, ItemStack par5ItemStack, int icon) this.icon_resource = icon;
{ this.icon_item = null;
this.key = par1; this.displayColumn = par3;
this.tags = tags; this.displayRow = par4;
this.name = ""; this.complexity = par5;
this.longText = ""; if (complexity < 1) this.complexity = 1;
this.popupText = ""; if (complexity > 5) this.complexity = 5;
}
Element el = ThaumcraftApi.researchDoc.getElementById(key);
if (el!=null) { public ResearchItem(String par1, String par2, AspectList tags, int par3, int par4, int par5, ItemStack icon)
NodeList children = el.getChildNodes(); {
for (int a=0;a<children.getLength();a++) { this.key = par1;
if (children.item(a).getNodeName().equals("name")) { this.category = par2;
this.name = children.item(a).getTextContent(); this.tags = tags;
} else this.icon_item = icon;
if (children.item(a).getNodeName().equals("longText")) { this.icon_resource = null;
this.longText = children.item(a).getTextContent(); this.displayColumn = par3;
} else this.displayRow = par4;
if (children.item(a).getNodeName().equals("popupText") ) { this.complexity = par5;
this.popupText = children.item(a).getTextContent(); if (complexity <0) this.complexity = 0;
} if (complexity > 5) this.complexity = 5;
} }
}
public ResearchItem setSpecial()
this.itemStack = par5ItemStack; {
this.iconIndex = icon; this.isSpecial = true;
this.displayColumn = par3; return this;
this.displayRow = par4; }
public ResearchItem setStub()
if (par3 < ResearchList.minDisplayColumn) {
{ this.isStub = true;
ResearchList.minDisplayColumn = par3; return this;
} }
if (par4 < ResearchList.minDisplayRow)
{ public ResearchItem setHidden()
ResearchList.minDisplayRow = par4; {
} this.isHidden = true;
return this;
if (par3 > ResearchList.maxDisplayColumn) }
{
ResearchList.maxDisplayColumn = par3; public ResearchItem setLost()
} {
this.isLost = true;
if (par4 > ResearchList.maxDisplayRow) return this;
{ }
ResearchList.maxDisplayRow = par4;
} public ResearchItem setVirtual()
{
this.isVirtual = true;
} return this;
}
public ResearchItem setSpecial()
{ public ResearchItem setParents(String... par)
this.isSpecial = true; {
return this; this.parents = par;
} return this;
}
public ResearchItem setStub()
{
this.isStub = true;
return this; public ResearchItem setParentsHidden(String... par)
} {
this.parentsHidden = par;
public ResearchItem setAlternate() return this;
{ }
this.isAlternate = true;
return this; public ResearchItem setSiblings(String... sib)
} {
this.siblings = sib;
public ResearchItem setHidden() return this;
{ }
this.isHidden = true;
return this; public ResearchItem setPages(ResearchPage... par)
} {
this.pages = par;
public ResearchItem setLost() return this;
{ }
this.isLost = true;
return this; public ResearchPage[] getPages() {
} return pages;
}
public ResearchItem setParents(ResearchItem... par)
{ public ResearchItem registerResearchItem()
this.parents = par; {
return this; ResearchCategories.addResearch(this);
} return this;
}
public ResearchItem setParentsHidden(ResearchItem... par)
{ @SideOnly(Side.CLIENT)
this.parentsHidden = par; public String getName()
return this; {
} return StatCollector.translateToLocal("tc.research_name."+key);
}
public ResearchItem setSiblings(ResearchItem... sib)
{ @SideOnly(Side.CLIENT)
this.siblings = sib; public String getText()
return this; {
} return StatCollector.translateToLocal("tc.research_text."+key);
}
public ResearchItem registerResearchItem()
{ @SideOnly(Side.CLIENT)
ResearchList.research.put(key, this); public boolean isSpecial()
return this; {
} return this.isSpecial;
}
@SideOnly(Side.CLIENT)
public String getName() public boolean isStub()
{ {
return this.name; return this.isStub;
} }
@SideOnly(Side.CLIENT) public boolean isHidden()
public boolean getSpecial() {
{ return this.isHidden;
return this.isSpecial; }
}
public boolean isLost()
public boolean getStub() {
{ return this.isLost;
return this.isStub; }
}
public boolean isVirtual()
public boolean getAlternate() {
{ return this.isVirtual;
return this.isAlternate; }
}
public boolean isAutoUnlock() {
public boolean getHidden() return isAutoUnlock;
{ }
return this.isHidden;
} public ResearchItem setAutoUnlock()
{
public boolean getLost() this.isAutoUnlock = true;
{ return this;
return this.isLost; }
}
public boolean isRound() {
public boolean getAutoUnlock() { return isRound;
return isAutoUnlock; }
}
public ResearchItem setRound() {
public ResearchItem setAutoUnlock() this.isRound = true;
{ return this;
this.isAutoUnlock = true; }
return this;
}
}
public int getComplexity() {
return complexity;
}
public ResearchItem setComplexity(int complexity) {
this.complexity = complexity;
return this;
}
/**
* @return the aspect aspects ordinal with the highest value. Used to determine scroll color and similar things
*/
public Aspect getResearchPrimaryTag() {
Aspect aspect=null;
int highest=0;
if (tags!=null)
for (Aspect tag:tags.getAspects()) {
if (tags.getAmount(tag)>highest) {
aspect=tag;
highest=tags.getAmount(tag);
};
}
return aspect;
}
}

91
src/minecraft/thaumcraft/api/research/ResearchList.java
View file

@ -1,91 +0,0 @@
package thaumcraft.api.research;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import thaumcraft.api.EnumTag;
public class ResearchList {
/** Is the smallest column used on the GUI. */
public static int minDisplayColumn;
/** Is the smallest row used on the GUI. */
public static int minDisplayRow;
/** Is the biggest column used on the GUI. */
public static int maxDisplayColumn;
/** Is the biggest row used on the GUI. */
public static int maxDisplayRow;
//Research
public static Map<String, ResearchItem> research = new HashMap<String,ResearchItem>();
public static Map<String, List> craftingRecipesForResearch = new HashMap<String, List>();
//
/**
* @param key
* @return the research item linked to this key
*/
public static ResearchItem getResearch(String key) {
return research.get(key);
}
/**
* @param key
* @return the name of the research linked to this key
*/
public static String getResearchName(String key) {
ResearchItem rr = research.get(key);
if (rr==null) return "";
return rr.name;
}
/**
* @param key
* @return a list of the enumtags used in this research. returns the numeric values and not the actual enum
*/
public static byte[] getResearchTags(String key) {
ResearchItem rr = research.get(key);
if (rr==null) return null;
byte[] output = new byte[rr.tags.size()];
EnumTag[] et = rr.tags.getAspects();
for (int a=0;a<rr.tags.size();a++) {
output[a] = (byte) et[a].id;
}
return output;
}
/**
* @param key
* @return the aspect enumtag ordinal with the highest value. Used to determine scroll color and similar things
*/
public static int getResearchPrimaryTag(String key) {
int t=0;
int amt=0;
ResearchItem rr = research.get(key);
if (rr==null) return 0;
for (EnumTag tag:rr.tags.getAspects()) {
if (rr.tags.getAmount(tag)>amt) {
t=tag.id;
amt=rr.tags.getAmount(tag);
};
}
return t;
}
public static int getResearchAmount(String key, EnumTag tag) {
ResearchItem rr = research.get(key);
if (rr==null) return 0;
return rr.tags.getAmount(tag);
}
}

108
src/minecraft/thaumcraft/api/research/ResearchPage.java Executable file
View file

@ -0,0 +1,108 @@
package thaumcraft.api.research;
import java.util.List;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.StatCollector;
import thaumcraft.api.aspects.AspectList;
import thaumcraft.api.crafting.IArcaneRecipe;
import thaumcraft.api.crafting.RecipeCrucible;
public class ResearchPage {
public static enum PageType
{
TEXT,
IMAGE,
CRUCIBLE_CRAFTING,
ARCANE_CRAFTING,
ASPECTS,
NORMAL_CRAFTING,
COMPOUND_CRAFTING
}
public PageType type = PageType.TEXT;
public String text=null;
public ResourceLocation image=null;
public AspectList aspects=null;
public Object recipe=null;
public ItemStack recipeOutput=null;
/**
* @param text this can (but does not have to) be a reference to a localization variable, not the actual text.
*/
public ResearchPage(String text) {
this.type = PageType.TEXT;
this.text = text;
}
/**
* @param recipe a vanilla crafting recipe.
*/
public ResearchPage(IRecipe recipe) {
this.type = PageType.NORMAL_CRAFTING;
this.recipe = recipe;
this.recipeOutput = recipe.getRecipeOutput();
}
/**
* @param recipe a compound crafting recipe.
*/
public ResearchPage(List recipe) {
this.type = PageType.COMPOUND_CRAFTING;
this.recipe = recipe;
}
/**
* @param recipe an arcane worktable crafting recipe.
*/
public ResearchPage(IArcaneRecipe recipe) {
this.type = PageType.ARCANE_CRAFTING;
this.recipe = recipe;
this.recipeOutput = recipe.getRecipeOutput();
}
/**
* @param recipe an alchemy crafting recipe.
*/
public ResearchPage(RecipeCrucible recipe) {
this.type = PageType.CRUCIBLE_CRAFTING;
this.recipe = recipe;
this.recipeOutput = recipe.recipeOutput;
}
/**
* @param image
* @param caption this can (but does not have to) be a reference to a localization variable, not the actual text.
*/
public ResearchPage(ResourceLocation image, String caption) {
this.type = PageType.IMAGE;
this.image = image;
this.text = caption;
}
/**
* This function should really not be called directly - used internally
*/
public ResearchPage(AspectList as) {
this.type = PageType.ASPECTS;
this.aspects = as;
}
/**
* returns a localized text of the text field (if one exists). Returns the text field itself otherwise.
* @return
*/
public String getTranslatedText() {
String ret="";
if (text != null) {
ret = StatCollector.translateToLocal(text);
if (ret.isEmpty()) ret = text;
}
return ret;
}
}

14
src/minecraft/thaumcraft/api/research/ResearchPlayer.java
View file

@ -1,14 +0,0 @@
package thaumcraft.api.research;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class ResearchPlayer {
public Map<String,List<String>> researchCompleted = new HashMap<String,List<String>>();
public Map<String,List<Short[]>> objectsScanned = new HashMap<String,List<Short[]>>();
public Map<String,List<String>> entitiesScanned = new HashMap<String,List<String>>();
public Map<String,List<String>> phenomenaScanned = new HashMap<String,List<String>>();
}

78
src/minecraft/thaumcraft/api/research/ScanResult.java Normal file → Executable file
View file

@ -1,39 +1,39 @@
package thaumcraft.api.research; package thaumcraft.api.research;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
public class ScanResult { public class ScanResult {
public byte type = 0; //1=blocks,2=entities,3=phenomena public byte type = 0; //1=blocks,2=entities,3=phenomena
public int blockId; public int blockId;
public int blockMeta; public int blockMeta;
public Entity entity; public Entity entity;
public String phenomena; public String phenomena;
public ScanResult(byte type, int blockId, int blockMeta, Entity entity, public ScanResult(byte type, int blockId, int blockMeta, Entity entity,
String phenomena) { String phenomena) {
super(); super();
this.type = type; this.type = type;
this.blockId = blockId; this.blockId = blockId;
this.blockMeta = blockMeta; this.blockMeta = blockMeta;
this.entity = entity; this.entity = entity;
this.phenomena = phenomena; this.phenomena = phenomena;
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
if (obj instanceof ScanResult) { if (obj instanceof ScanResult) {
ScanResult sr = (ScanResult) obj; ScanResult sr = (ScanResult) obj;
if (type != sr.type) if (type != sr.type)
return false; return false;
if (type == 1 if (type == 1
&& (blockId != sr.blockId || blockMeta != sr.blockMeta)) && (blockId != sr.blockId || blockMeta != sr.blockMeta))
return false; return false;
if (type == 2 && entity.entityId != sr.entity.entityId) if (type == 2 && entity.entityId != sr.entity.entityId)
return false; return false;
if (type == 3 && !phenomena.equals(sr.phenomena)) if (type == 3 && !phenomena.equals(sr.phenomena))
return false; return false;
} }
return true; return true;
} }
} }

52
src/minecraft/thaumcraft/api/wands/IWandFocus.java Executable file
View file

@ -0,0 +1,52 @@
package thaumcraft.api.wands;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Icon;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
import thaumcraft.api.aspects.AspectList;
public interface IWandFocus {
public enum WandFocusAnimation {
WAVE, CHARGE;
}
public int getFocusColor();
public Icon getOrnament();
public WandFocusAnimation getAnimation();
/**
* Gets the amount of vis used per aspect per click or tick. This cost is actually listed as
* a hundredth of a single point of vis, so a cost of 100 will equal one vis per tick/click.
* It is returned as an AspectList to allow for multiple vis types in different ratios.
*/
public AspectList getVisCost();
public boolean isVisCostPerTick();
public ItemStack onFocusRightClick(ItemStack itemstack, World world, EntityPlayer player, MovingObjectPosition movingobjectposition);
public void onUsingFocusTick(ItemStack itemstack, EntityPlayer player, int count);
public void onPlayerStoppedUsingFocus(ItemStack itemstack, World world, EntityPlayer player, int count);
/**
* Helper method to determine in what order foci should be iterated through when
* the user presses the 'change focus' keybinding.
* @return a string of characters that foci will be sorted against.
* For example AA00 will be placed before FG12
* <br>As a guide build the sort string from two alphanumeric characters followed by
* two numeric characters based on... whatever.
*/
public String getSortingHelper(ItemStack itemstack);
boolean onFocusBlockStartBreak(ItemStack itemstack, int x, int y, int z, EntityPlayer player);
}

16
src/minecraft/thaumcraft/api/wands/IWandRodOnUpdate.java Executable file
View file

@ -0,0 +1,16 @@
package thaumcraft.api.wands;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
/**
*
* @author azanor
*
* Implemented by a class that you wish to be called whenever a wand with this rod performs its
* update tick.
*
*/
public interface IWandRodOnUpdate {
void onUpdate(ItemStack itemstack, EntityPlayer player);
}

12
src/minecraft/thaumcraft/api/wands/IWandTriggerManager.java Executable file
View file

@ -0,0 +1,12 @@
package thaumcraft.api.wands;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
public interface IWandTriggerManager {
public boolean performTrigger(World world, ItemStack wand, EntityPlayer player,
int x, int y, int z, int side, int event);
}

25
src/minecraft/thaumcraft/api/wands/IWandable.java Executable file
View file

@ -0,0 +1,25 @@
package thaumcraft.api.wands;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
/**
*
* @author azanor
*
* Add this to a tile entity that you wish wands to interact with in some way.
*
*/
public interface IWandable {
public int onWandRightClick(World world, ItemStack wandstack, EntityPlayer player, int x, int y, int z, int side, int md);
public ItemStack onWandRightClick(World world, ItemStack wandstack, EntityPlayer player);
public void onUsingWandTick(ItemStack wandstack, EntityPlayer player, int count);
public void onWandStoppedUsing(ItemStack wandstack, World world, EntityPlayer player, int count);
}

129
src/minecraft/thaumcraft/api/wands/ItemFocusBasic.java Executable file
View file

@ -0,0 +1,129 @@
package thaumcraft.api.wands;
import java.text.DecimalFormat;
import java.util.List;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumRarity;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Icon;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
import thaumcraft.api.aspects.Aspect;
import thaumcraft.api.aspects.AspectList;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class ItemFocusBasic extends Item implements IWandFocus {
public ItemFocusBasic (int i)
{
super(i);
maxStackSize = 1;
canRepair=false;
}
public Icon icon;
@SideOnly(Side.CLIENT)
@Override
public Icon getIconFromDamage(int par1) {
return icon;
}
@Override
public void addInformation(ItemStack stack,EntityPlayer player, List list, boolean par4) {
AspectList al = this.getVisCost();
if (al!=null && al.size()>0) {
list.add(StatCollector.translateToLocal(isVisCostPerTick()?"item.Focus.cost2":"item.Focus.cost1"));
for (Aspect aspect:al.getAspectsSorted()) {
DecimalFormat myFormatter = new DecimalFormat("#####.##");
String amount = myFormatter.format(al.getAmount(aspect)/100f);
list.add(" \u00A7"+aspect.getChatcolor()+aspect.getName()+"\u00A7r x "+ amount);
}
}
}
@Override
public int getItemEnchantability() {
return 5;
}
@Override
public EnumRarity getRarity(ItemStack itemstack)
{
return EnumRarity.rare;
}
@Override
public int getFocusColor() {
// TODO Auto-generated method stub
return 0;
}
@Override
public AspectList getVisCost() {
// TODO Auto-generated method stub
return null;
}
@Override
public ItemStack onFocusRightClick(ItemStack itemstack, World world,
EntityPlayer player, MovingObjectPosition movingobjectposition) {
// TODO Auto-generated method stub
return null;
}
@Override
public void onUsingFocusTick(ItemStack itemstack, EntityPlayer player,
int count) {
// TODO Auto-generated method stub
}
@Override
public void onPlayerStoppedUsingFocus(ItemStack itemstack, World world,
EntityPlayer player, int count) {
// TODO Auto-generated method stub
}
/**
* Just insert two alphanumeric characters before this string in your focus item class
*/
@Override
public String getSortingHelper(ItemStack itemstack) {
return "00";
}
@Override
public boolean isVisCostPerTick() {
return false;
}
@Override
public Icon getOrnament() {
// TODO Auto-generated method stub
return null;
}
@Override
public boolean onFocusBlockStartBreak(ItemStack itemstack, int x, int y,
int z, EntityPlayer player) {
// TODO Auto-generated method stub
return false;
}
@Override
public WandFocusAnimation getAnimation() {
return WandFocusAnimation.WAVE;
}
}

122
src/minecraft/thaumcraft/api/wands/WandCap.java Executable file
View file

@ -0,0 +1,122 @@
package thaumcraft.api.wands;
import java.util.LinkedHashMap;
import java.util.List;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import thaumcraft.api.aspects.Aspect;
/**
* This class is used to keep the material information for the various caps.
* It is also used to generate the wand recipes ingame.
* @author Azanor
*
*/
public class WandCap {
private String tag;
/**
* Cost to craft this wand. Combined with the rod cost.
*/
private int craftCost;
/**
* the amount by which all aspect costs are multiplied
*/
float baseCostModifier;
/**
* specifies a list of primal aspects that use the special discount figure instead of the normal discount.
*/
List<Aspect> specialCostModifierAspects;
/**
* the amount by which the specified aspect costs are multiplied
*/
float specialCostModifier;
/**
* The texture that will be used for the ingame wand cap
*/
ResourceLocation texture;
/**
* the actual item that makes up this cap and will be used to generate the wand recipes
*/
ItemStack item;
public static LinkedHashMap<String,WandCap> caps = new LinkedHashMap<String,WandCap>();
public WandCap (String tag, float discount, ItemStack item, int craftCost) {
this.setTag(tag);
this.baseCostModifier = discount;
this.specialCostModifierAspects = null;
texture = new ResourceLocation("thaumcraft","textures/models/wand_cap_"+getTag()+".png");
this.item=item;
this.setCraftCost(craftCost);
caps.put(tag, this);
}
public WandCap (String tag, float discount, List<Aspect> specialAspects, float discountSpecial, ItemStack item, int craftCost) {
this.setTag(tag);
this.baseCostModifier = discount;
this.specialCostModifierAspects = specialAspects;
this.specialCostModifier = discountSpecial;
texture = new ResourceLocation("thaumcraft","textures/models/wand_cap_"+getTag()+".png");
this.item=item;
this.setCraftCost(craftCost);
caps.put(tag, this);
}
public float getBaseCostModifier() {
return baseCostModifier;
}
public List<Aspect> getSpecialCostModifierAspects() {
return specialCostModifierAspects;
}
public float getSpecialCostModifier() {
return specialCostModifier;
}
public ResourceLocation getTexture() {
return texture;
}
public void setTexture(ResourceLocation texture) {
this.texture = texture;
}
public String getTag() {
return tag;
}
public void setTag(String tag) {
this.tag = tag;
}
public ItemStack getItem() {
return item;
}
public void setItem(ItemStack item) {
this.item = item;
}
public int getCraftCost() {
return craftCost;
}
public void setCraftCost(int craftCost) {
this.craftCost = craftCost;
}
// Some examples:
// WandCap WAND_CAP_IRON = new WandCap("iron", 1.1f, Arrays.asList(Aspect.ORDER),1, new ItemStack(ConfigItems.itemWandCap,1,0),1);
// WandCap WAND_CAP_GOLD = new WandCap("gold", 1f, new ItemStack(ConfigItems.itemWandCap,1,1),3);
}

151
src/minecraft/thaumcraft/api/wands/WandRod.java Executable file
View file

@ -0,0 +1,151 @@
package thaumcraft.api.wands;
import java.util.LinkedHashMap;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
/**
*
* @author Azanor
*
* This class is used to keep the material information for the various rods.
* It is also used to generate the wand recipes ingame.
*
*/
public class WandRod {
private String tag;
/**
* Cost to craft this wand. Combined with the rod cost.
*/
private int craftCost;
/**
* The amount of vis that can be stored - this number is actually multiplied
* by 100 for use by the wands internals
*/
int capacity;
/**
* The texture that will be used for the ingame wand rod
*/
ResourceLocation texture;
/**
* the actual item that makes up this rod and will be used to generate the wand recipes
*/
ItemStack item;
/**
* A class that will be called whenever the wand onUpdate tick is run
*/
IWandRodOnUpdate onUpdate;
/**
* Does the rod glow in the dark?
*/
boolean glow;
public static LinkedHashMap<String,WandRod> rods = new LinkedHashMap<String,WandRod>();
public WandRod (String tag, int capacity, ItemStack item, int craftCost, ResourceLocation texture) {
this.setTag(tag);
this.capacity = capacity;
this.texture = texture;
this.item=item;
this.setCraftCost(craftCost);
rods.put(tag, this);
}
public WandRod (String tag, int capacity, ItemStack item, int craftCost, IWandRodOnUpdate onUpdate, ResourceLocation texture) {
this.setTag(tag);
this.capacity = capacity;
this.texture = texture;
this.item=item;
this.setCraftCost(craftCost);
rods.put(tag, this);
this.onUpdate = onUpdate;
}
public WandRod (String tag, int capacity, ItemStack item, int craftCost) {
this.setTag(tag);
this.capacity = capacity;
this.texture = new ResourceLocation("thaumcraft","textures/models/wand_rod_"+getTag()+".png");
this.item=item;
this.setCraftCost(craftCost);
rods.put(tag, this);
}
public WandRod (String tag, int capacity, ItemStack item, int craftCost, IWandRodOnUpdate onUpdate) {
this.setTag(tag);
this.capacity = capacity;
this.texture = new ResourceLocation("thaumcraft","textures/models/wand_rod_"+getTag()+".png");
this.item=item;
this.setCraftCost(craftCost);
rods.put(tag, this);
this.onUpdate = onUpdate;
}
public String getTag() {
return tag;
}
public void setTag(String tag) {
this.tag = tag;
}
public int getCapacity() {
return capacity;
}
public void setCapacity(int capacity) {
this.capacity = capacity;
}
public ResourceLocation getTexture() {
return texture;
}
public void setTexture(ResourceLocation texture) {
this.texture = texture;
}
public ItemStack getItem() {
return item;
}
public void setItem(ItemStack item) {
this.item = item;
}
public int getCraftCost() {
return craftCost;
}
public void setCraftCost(int craftCost) {
this.craftCost = craftCost;
}
public IWandRodOnUpdate getOnUpdate() {
return onUpdate;
}
public void setOnUpdate(IWandRodOnUpdate onUpdate) {
this.onUpdate = onUpdate;
}
public boolean isGlowing() {
return glow;
}
public void setGlowing(boolean hasGlow) {
this.glow = hasGlow;
}
// Some examples:
// WandRod WAND_ROD_WOOD = new WandRod("wood",25,new ItemStack(Item.stick),1);
// WandRod WAND_ROD_BLAZE = new WandRod("blaze",100,new ItemStack(Item.blazeRod),7,new WandRodBlazeOnUpdate());
}

71
src/minecraft/thaumcraft/api/wands/WandTriggerRegistry.java Executable file
View file

@ -0,0 +1,71 @@
package thaumcraft.api.wands;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
/**
* This class serves a similar function to IWandable in that it allows wands to interact
* with object in the world. In this case it is most useful for adding interaction with non-mod
* blocks where you can't control what happens in their code.
* Example where it is used is in crafting the thaumonomicon from a bookshelf and the
* crucible from a cauldron
*
* @author azanor
*
*/
public class WandTriggerRegistry {
/**
* Registers an action to perform when a casting wand right clicks on a specific block.
* A manager class needs to be created that implements IWandTriggerManager.
* @param manager
* @param event a logical number that you can use to differentiate different events or actions
* @param blockid
* @param meta send -1 as a wildcard value for all possible meta values
*/
public static void registerWandBlockTrigger(IWandTriggerManager manager, int event, int blockid, int meta) {
triggers.put(Arrays.asList(blockid,meta),
Arrays.asList(manager,event));
}
private static HashMap<List<Integer>,List> triggers = new HashMap<List<Integer>,List>();
public static boolean hasTrigger(int blockid, int meta) {
if (triggers.containsKey(Arrays.asList(blockid,meta)) ||
triggers.containsKey(Arrays.asList(blockid,-1))) return true;
return false;
}
/**
* This is called by the onItemUseFirst function in wands.
* Parameters and return value functions like you would expect for that function.
* @param world
* @param wand
* @param player
* @param x
* @param y
* @param z
* @param side
* @param blockid
* @param meta
* @return
*/
public static boolean performTrigger(World world, ItemStack wand, EntityPlayer player,
int x, int y, int z, int side, int blockid, int meta) {
if (!triggers.containsKey(Arrays.asList(blockid,meta))) return false;
List l = triggers.get(Arrays.asList(blockid,meta));
if (l==null) l = triggers.get(Arrays.asList(blockid,-1));
IWandTriggerManager manager = (IWandTriggerManager) l.get(0);
int event = (Integer) l.get(1);
return manager.performTrigger(world, wand, player, x, y, z, side, event);
}
}