diff --git a/src/main/java/fox/spiteful/forbidden/ForbiddenRecipes.java b/src/main/java/fox/spiteful/forbidden/ForbiddenRecipes.java
index cdae3d6..261c3c9 100644
--- a/src/main/java/fox/spiteful/forbidden/ForbiddenRecipes.java
+++ b/src/main/java/fox/spiteful/forbidden/ForbiddenRecipes.java
@@ -27,7 +27,7 @@ public class ForbiddenRecipes {
ForbiddenResearch.recipes.put("SkullAxe", ThaumcraftApi.addInfusionCraftingRecipe("SKULLAXE", new ItemStack(ForbiddenItems.skullAxe), 1, (new AspectList()).add(DarkAspects.WRATH, 8).add(Aspect.WEAPON, 8).add(DarkAspects.NETHER, 8), ItemApi.getItem("itemAxeThaumium", 0), new ItemStack[] { new ItemStack(ForbiddenItems.deadlyShards, 1, 0), new ItemStack(ForbiddenItems.deadlyShards, 1, 0), new ItemStack(Items.diamond), new ItemStack(Items.skull, 1, 1) }));
if(!Config.noLust)
- ForbiddenResearch.recipes.put("SubCollar", ThaumcraftApi.addInfusionCraftingRecipe("SUBCOLLAR", new ItemStack(ForbiddenItems.subCollar), 7, (new AspectList()).add(DarkAspects.LUST, 8).add(Aspect.TRAP, 8).add(DarkAspects.NETHER, 4).add(Aspect.FLESH, 4), new ItemStack(ConfigItems.itemAmuletVis, 1, 1), new ItemStack[] { new ItemStack(ForbiddenItems.deadlyShards, 1, 4), new ItemStack(ForbiddenItems.deadlyShards, 1, 4), new ItemStack(ForbiddenItems.deadlyShards, 1, 4), new ItemStack(Items.lead, 1), new ItemStack(ConfigItems.itemBaubleBlanks, 1, 2) }));
+ ForbiddenResearch.recipes.put("SubCollar", ThaumcraftApi.addInfusionCraftingRecipe("SUBCOLLAR", new ItemStack(ForbiddenItems.subCollar), 1, (new AspectList()).add(DarkAspects.LUST, 8).add(Aspect.TRAP, 8).add(DarkAspects.NETHER, 4).add(Aspect.FLESH, 4), new ItemStack(ConfigItems.itemAmuletVis, 1, 1), new ItemStack[] { new ItemStack(ForbiddenItems.deadlyShards, 1, 4), new ItemStack(ForbiddenItems.deadlyShards, 1, 4), new ItemStack(ForbiddenItems.deadlyShards, 1, 4), new ItemStack(Items.lead, 1), new ItemStack(ConfigItems.itemBaubleBlanks, 1, 2) }));
ForbiddenResearch.recipes.put("ArcaneCake", ThaumcraftApi.addInfusionCraftingRecipe("ARCANECAKE", new ItemStack(ForbiddenItems.arcaneCakeItem), 3, (new AspectList()).add(DarkAspects.GLUTTONY, 12).add(Aspect.HUNGER, 24).add(Aspect.CRAFT, 24), new ItemStack(Items.cake), new ItemStack[] { ItemApi.getItem("itemResource", 14), new ItemStack(Items.egg), new ItemStack(Items.milk_bucket), new ItemStack(Items.egg), new ItemStack(Items.sugar), new ItemStack(Items.sugar) }));
ForbiddenResearch.recipes.put("MorphPick", ThaumcraftApi.addInfusionCraftingRecipe("MORPHTOOLS", new ItemStack(ForbiddenItems.morphPickaxe), 6, (new AspectList()).add(Aspect.EXCHANGE, 32).add(DarkAspects.ENVY, 16).add(Aspect.TOOL, 16), ItemApi.getItem("itemPickThaumium", 0), new ItemStack[] { new ItemStack(ForbiddenItems.deadlyShards, 1, 1), new ItemStack(ForbiddenItems.deadlyShards, 1, 1), new ItemStack(Items.diamond), ItemApi.getItem("itemResource", 3), ItemApi.getBlock("blockMagicalLog", 1) }));
ForbiddenResearch.recipes.put("MorphSword", ThaumcraftApi.addInfusionCraftingRecipe("MORPHTOOLS", new ItemStack(ForbiddenItems.morphSword), 6, (new AspectList()).add(Aspect.EXCHANGE, 32).add(DarkAspects.ENVY, 16).add(Aspect.WEAPON, 16), ItemApi.getItem("itemSwordThaumium", 0), new ItemStack[] { new ItemStack(ForbiddenItems.deadlyShards, 1, 1), new ItemStack(ForbiddenItems.deadlyShards, 1, 1), new ItemStack(Items.diamond), ItemApi.getItem("itemResource", 3), ItemApi.getBlock("blockMagicalLog", 1) }));
diff --git a/src/main/java/fox/spiteful/forbidden/compat/Compat.java b/src/main/java/fox/spiteful/forbidden/compat/Compat.java
index 74469c3..602cd34 100644
--- a/src/main/java/fox/spiteful/forbidden/compat/Compat.java
+++ b/src/main/java/fox/spiteful/forbidden/compat/Compat.java
@@ -42,7 +42,6 @@ public class Compat {
public static boolean tt = false;
public static boolean kami = false;
public static boolean natura = false;
- public static boolean pb = false;
public static boolean bm = false;
public static boolean am2 = false;
public static boolean botan = false;
@@ -51,22 +50,13 @@ public class Compat {
public static void initiate() {
if(!Config.crossMod)
return;
- if (Config.tt && Loader.isModLoaded("ThaumicTinkerer"))
- tt = true;
- if (tt && Loader.isModLoaded("ThaumicTinkererKami"))
- kami = true;
- if (Loader.isModLoaded("Natura"))
- natura = true;
- if (Loader.isModLoaded("PlayerBeacons"))
- pb = true;
- if (Config.bloodMagic && Loader.isModLoaded("AWWayofTime"))
- bm = true;
- if (Config.am2 && Loader.isModLoaded("arsmagica2"))
- am2 = true;
- if (Config.botan && Loader.isModLoaded("Botania"))
- botan = true;
- if (Config.tc && Loader.isModLoaded("TConstruct"))
- tc = true;
+ tt = Config.tt && Loader.isModLoaded("ThaumicTinkerer");
+ kami = tt && Loader.isModLoaded("ThaumicTinkererKami");
+ natura = Loader.isModLoaded("Natura");
+ bm = Config.bloodMagic && Loader.isModLoaded("AWWayofTime");
+ am2 = Config.am2 && Loader.isModLoaded("arsmagica2");
+ botan = Config.botan && Loader.isModLoaded("Botania");
+ tc = Config.tc && Loader.isModLoaded("TConstruct");
}
public static void compatify() {
diff --git a/src/main/java/fox/spiteful/forbidden/compat/ForbiddenBotany.java b/src/main/java/fox/spiteful/forbidden/compat/ForbiddenBotany.java
index c218bbf..8e4567d 100644
--- a/src/main/java/fox/spiteful/forbidden/compat/ForbiddenBotany.java
+++ b/src/main/java/fox/spiteful/forbidden/compat/ForbiddenBotany.java
@@ -8,6 +8,7 @@ import fox.spiteful.forbidden.items.ForbiddenItems;
import fox.spiteful.forbidden.tiles.SubTileEuclidaisy;
import fox.spiteful.forbidden.tiles.SubTileTainthistle;
import fox.spiteful.forbidden.tiles.SubTileWhisperweed;
+import net.minecraft.block.Block;
import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@@ -23,7 +24,6 @@ import thaumcraft.api.research.ResearchPage;
import thaumcraft.common.config.ConfigItems;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.lexicon.LexiconCategory;
-import vazkii.botania.api.recipe.RecipePetals;
import java.util.List;
@@ -32,13 +32,18 @@ public class ForbiddenBotany {
try {
Item rune = GameRegistry.findItem("Botania", "rune");
Item resource = GameRegistry.findItem("Botania", "manaResource");
- Item livingLog = GameRegistry.findItem("Botania", "livingwood");
+ Block livingLog = GameRegistry.findBlock("Botania", "livingwood");
Item flower = GameRegistry.findItem("Botania", "flower");
+ Item petal = GameRegistry.findItem("Botania", "petal");
Item manaPetal = GameRegistry.findItem("Botania", "manaPetal");
+ Block dreamwood = GameRegistry.findBlock("Botania", "dreamwood");
CraftingManager.getInstance().addRecipe(new ItemStack(resource, 1, 0), new Object[] { "###", "###", "###", Character.valueOf('#'), new ItemStack(ForbiddenItems.resource, 1, 2) });
CraftingManager.getInstance().addRecipe(new ItemStack(ForbiddenItems.resource, 9, 2), new Object[] { "#", Character.valueOf('#'), new ItemStack(resource, 1, 0) });
+ CraftingManager.getInstance().addRecipe(new ItemStack(resource, 1, 7), new Object[] { "###", "###", "###", Character.valueOf('#'), new ItemStack(ForbiddenItems.resource, 1, 4) });
+ CraftingManager.getInstance().addRecipe(new ItemStack(ForbiddenItems.resource, 9, 4), new Object[] { "#", Character.valueOf('#'), new ItemStack(resource, 1, 7) });
+
if(Config.crossWand) {
InfusionRecipe livingwood_rod = ThaumcraftApi.addInfusionCraftingRecipe("ROD_livingwood", new ItemStack(ForbiddenItems.wandCore, 1, 8), 3, (new AspectList()).add(Aspect.MAGIC, 16).add(Aspect.TREE, 32).add(Aspect.LIFE, 16).add(Aspect.SENSES, 8).add(Aspect.PLANT, 8), new ItemStack(livingLog), new ItemStack[]{new ItemStack(resource, 1, 2), new ItemStack(rune, 1, 8), new ItemStack(rune, 1, 0), new ItemStack(rune, 1, 1), new ItemStack(rune, 1, 2), new ItemStack(rune, 1, 3), new ItemStack(rune, 1, 4), new ItemStack(rune, 1, 5), new ItemStack(rune, 1, 6), new ItemStack(rune, 1, 7)});
@@ -47,8 +52,19 @@ public class ForbiddenBotany {
BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ForbiddenItems.wandCore, 1, 7), new ItemStack(ForbiddenItems.wandCore, 1, 8), 10000);
IArcaneRecipe manasteel_cap = ThaumcraftApi.addArcaneCraftingRecipe("CAP_manasteel", new ItemStack(ForbiddenItems.wandCap, 1, 4), (new AspectList()).add(Aspect.ENTROPY, 6).add(Aspect.FIRE, 6).add(Aspect.WATER, 6).add(Aspect.AIR, 6).add(Aspect.EARTH, 6).add(Aspect.ORDER, 6), new Object[]{"NNN", "N N", Character.valueOf('N'), new ItemStack(ForbiddenItems.resource, 1, 2)});
- (new DarkResearchItem("CAP_manasteel", "FORBIDDEN", "[B]", (new AspectList()).add(Aspect.ELDRITCH, 3).add(Aspect.MAGIC, 2).add(Aspect.ENTROPY, 4), -1, -5, 2, new ItemStack(ForbiddenItems.wandCap, 1, 3))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.CAP_manasteel.1"), new ResearchPage(manasteel_cap)}).setParents(new String[]{"ROD_livingwood"}).setSecondary().setConcealed().registerResearchItem();
+ (new DarkResearchItem("CAP_manasteel", "FORBIDDEN", "[B]", (new AspectList()).add(Aspect.AURA, 6).add(Aspect.MAGIC, 4).add(Aspect.METAL, 4), -1, -5, 2, new ItemStack(ForbiddenItems.wandCap, 1, 3))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.CAP_manasteel.1"), new ResearchPage(manasteel_cap)}).setParents(new String[]{"ROD_livingwood"}).setSecondary().setConcealed().registerResearchItem();
BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ForbiddenItems.wandCap, 1, 3), new ItemStack(ForbiddenItems.wandCap, 1, 4), 1000);
+
+ InfusionRecipe dreamwood_rod = ThaumcraftApi.addInfusionCraftingRecipe("ROD_dreamwood", new ItemStack(ForbiddenItems.wandCore, 1, 12), 3, (new AspectList()).add(Aspect.MAGIC, 16).add(Aspect.TREE, 32).add(Aspect.LIFE, 16).add(Aspect.SENSES, 8).add(Aspect.PLANT, 8), new ItemStack(dreamwood), new ItemStack[]{new ItemStack(resource, 1, 2), new ItemStack(rune, 1, 8), new ItemStack(rune, 1, 0), new ItemStack(rune, 1, 1), new ItemStack(rune, 1, 2), new ItemStack(rune, 1, 3), new ItemStack(rune, 1, 4), new ItemStack(rune, 1, 5), new ItemStack(rune, 1, 6), new ItemStack(rune, 1, 7)});
+ IArcaneRecipe dreamwood_staff = ThaumcraftApi.addArcaneCraftingRecipe("ROD_dreamwood_staff", new ItemStack(ForbiddenItems.wandCore, 1, 13), (new AspectList()).add(Aspect.ENTROPY, 26).add(Aspect.FIRE, 26).add(Aspect.WATER, 26).add(Aspect.AIR, 26).add(Aspect.EARTH, 26).add(Aspect.ORDER, 26), new Object[]{"__D", "_B_", "B__", Character.valueOf('B'), new ItemStack(ForbiddenItems.wandCore, 1, 11), Character.valueOf('D'), new ItemStack(resource, 1, 9)});
+ BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ForbiddenItems.wandCore, 1, 11), new ItemStack(ForbiddenItems.wandCore, 1, 12), 10000);
+ (new DarkResearchItem("ROD_dreamwood_staff", "FORBIDDEN", "[B]", (new AspectList()).add(Aspect.TREE, 16).add(Aspect.MAGIC, 8).add(Aspect.ELDRITCH, 6), -1, -7, 4, new ItemStack(ForbiddenItems.wandCore, 1, 13))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.ROD_dreamwood_staff.1"), new ResearchPage(dreamwood_staff), new ResearchPage(dreamwood_rod)}).setParents(new String[]{"ROD_livingwood", "ROD_silverwood_staff"}).setSiblings(new String[]{"ROD_dreamwood"}).setConcealed().registerResearchItem();
+ (new DarkResearchItem("ROD_dreamwood", "FORBIDDEN")).setVirtual().registerResearchItem();
+
+ IArcaneRecipe elementium_cap_inert = ThaumcraftApi.addArcaneCraftingRecipe("CAP_elementium", new ItemStack(ForbiddenItems.wandCap, 1, 6), (new AspectList()).add(Aspect.ENTROPY, 27).add(Aspect.FIRE, 27).add(Aspect.WATER, 27).add(Aspect.AIR, 27).add(Aspect.EARTH, 27).add(Aspect.ORDER, 27), new Object[]{"NNN", "N N", Character.valueOf('N'), new ItemStack(ForbiddenItems.resource, 1, 4)});
+ InfusionRecipe elementium_cap = ThaumcraftApi.addInfusionCraftingRecipe("CAP_elementium", new ItemStack(ForbiddenItems.wandCap, 1, 5), 1, (new AspectList()).add(Aspect.EARTH, 18).add(Aspect.FIRE, 18).add(Aspect.WATER, 18).add(Aspect.AIR, 18), new ItemStack(ForbiddenItems.wandCap, 1, 6), new ItemStack[]{new ItemStack(resource, 1, 5), new ItemStack(rune, 1, 0), new ItemStack(rune, 1, 1), new ItemStack(rune, 1, 2), new ItemStack(rune, 1, 3)});
+ (new DarkResearchItem("CAP_elementium", "FORBIDDEN", "[B]", (new AspectList()).add(Aspect.FIRE, 8).add(Aspect.MAGIC, 12).add(Aspect.WATER, 8).add(Aspect.AIR, 8).add(Aspect.EARTH, 8), -1, -9, 4, new ItemStack(ForbiddenItems.wandCap, 1, 5))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.CAP_elementium.1"), new ResearchPage(elementium_cap_inert), new ResearchPage(elementium_cap)}).setParents(new String[]{"ROD_dreamwood_staff"}).setConcealed().registerResearchItem();
+
}
BotaniaAPI.registerSubTile("euclidaisy", SubTileEuclidaisy.class);
@@ -93,6 +109,10 @@ public class ForbiddenBotany {
SubTileTainthistle.lexicon.addPage(BotaniaAPI.internalHandler.textPage("forbidden.lexicon.tainthistle.0"));
+ ItemStack tainthistle = getFlower("tainthistle");
+ InfusionRecipe thistlecraft = ThaumcraftApi.addInfusionCraftingRecipe("TAINTHISTLE", tainthistle, 4, (new AspectList()).add(Aspect.TAINT, 8).add(Aspect.HUNGER, 4).add(Aspect.AIR, 4).add(Aspect.WATER, 4), new ItemStack(ConfigItems.itemResource, 1, 12), new ItemStack[] { new ItemStack(petal, 1, 10), new ItemStack(manaPetal, 1, 10), new ItemStack(manaPetal, 1, 10), new ItemStack(rune, 1, 10), new ItemStack(rune, 1, 8)});
+ (new DarkResearchItem("TAINTHISTLE", "FORBIDDEN", "[B]", (new AspectList()).add(Aspect.PLANT, 8).add(Aspect.TAINT, 10).add(Aspect.MAGIC, 4), -8, 4, 8, tainthistle)).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.TAINTHISTLE.1"), new ResearchPage(thistlecraft) }).setParents(new String[] { "INFAUXSION" }).setConcealed().registerResearchItem();
+
ThaumcraftApi.registerObjectTag(GameRegistry.findItemStack("Botania", "specialFlower", 1), (new AspectList()).add(Aspect.PLANT, 4).add(Aspect.MAGIC, 1));
} catch (Throwable e) {
diff --git a/src/main/java/fox/spiteful/forbidden/items/ForbiddenItems.java b/src/main/java/fox/spiteful/forbidden/items/ForbiddenItems.java
index 5731962..f865273 100644
--- a/src/main/java/fox/spiteful/forbidden/items/ForbiddenItems.java
+++ b/src/main/java/fox/spiteful/forbidden/items/ForbiddenItems.java
@@ -25,7 +25,6 @@ import fox.spiteful.forbidden.items.wands.ItemWandCaps;
import fox.spiteful.forbidden.items.wands.ItemWandCores;
import fox.spiteful.forbidden.items.wands.ManaStaffUpdate;
import fox.spiteful.forbidden.items.wands.ManaWandUpdate;
-import fox.spiteful.forbidden.items.wands.SoulWandUpdate;
import fox.spiteful.forbidden.items.wands.TaintedWandUpdate;
import fox.spiteful.forbidden.items.wands.YandereWandUpdate;
@@ -60,18 +59,19 @@ public class ForbiddenItems {
public static WandRod WAND_ROD_TAINTED;
public static WandRod WAND_ROD_INFERNAL;
public static WandRod WAND_ROD_NEUTRONIUM;
- //public static WandRod WAND_ROD_SOUL;
public static WandRod WAND_ROD_BLOOD;
public static WandRod WAND_ROD_WITCHWOOD;
public static WandRod WAND_ROD_LIVINGWOOD;
+ public static WandRod WAND_ROD_DREAMWOOD;
public static StaffRod STAFF_ROD_BLOOD;
public static StaffRod STAFF_ROD_NEUTRONIUM;
public static StaffRod STAFF_ROD_WITCHWOOD;
+ public static StaffRod STAFF_ROD_DREAMWOOD;
public static WandCap WAND_CAP_ORICHALCUM;
public static WandCap WAND_CAP_ALCHEMICAL;
public static WandCap WAND_CAP_VINTEUM;
- //public static WandCap WAND_CAP_SOUL;
public static WandCap WAND_CAP_MANASTEEL;
+ public static WandCap WAND_CAP_ELEMENTIUM;
public static void addItems() {
deadlyShards = new ItemDeadlyShard().setUnlocalizedName("NetherShard");
@@ -130,21 +130,22 @@ public class ForbiddenItems {
WAND_ROD_INFERNAL = new WandRod("infernal", 150, new ItemStack(wandCore, 1, 1), 12, new InfernalWandUpdate(), new ResourceLocation("forbidden", "textures/models/wand_rod_infernal.png"));
WAND_ROD_NEUTRONIUM = new WandRod("neutronium", 9001, new ItemStack(Blocks.bedrock, 1), 1000, new CreativeWandUpdate(), new ResourceLocation("forbidden", "textures/models/wand_rod_neutronium.png"));
WAND_ROD_NEUTRONIUM.setGlowing(true);
- //WAND_ROD_SOUL = new WandRod("soul", 100, new ItemStack(wandCore, 1, 2), 12, new SoulWandUpdate(), new ResourceLocation("forbidden", "textures/models/wand_rod_soul.png"));
- //WAND_ROD_SOUL.setGlowing(true);
WAND_ROD_BLOOD = new WandRod("blood", 100, new ItemStack(wandCore, 1, 3), 12, new BloodWandUpdate(), new ResourceLocation("forbidden", "textures/models/wand_rod_blood.png"));
WAND_ROD_WITCHWOOD = new WandRod("witchwood", 100, new ItemStack(wandCore, 1, 4), 12, new ManaWandUpdate(), new ResourceLocation("forbidden", "textures/models/wand_rod_witchwood.png"));
- //WAND_ROD_TOTEM = new WandRod("totem", 50, new ItemStack(wandCore, 1, 5), 4, new ResourceLocation("forbidden", "textures/models/wand_rod_totem.png"));
WAND_ROD_LIVINGWOOD = new WandRod("livingwood", 100, new ItemStack(wandCore, 1, 7), 12, new YandereWandUpdate(), new ResourceLocation("forbidden", "textures/models/wand_rod_livingwood.png"));
+ WAND_ROD_DREAMWOOD = new WandRod("dreamwood", 100, new ItemStack(wandCore, 1, 11), 12, new YandereWandUpdate(), new ResourceLocation("forbidden", "textures/models/wand_rod_dreamwood.png"));
STAFF_ROD_BLOOD = new StaffRod("blood", 50, new ItemStack(wandCore, 1, 9), 24, new BloodStaffUpdate(), new ResourceLocation("forbidden", "textures/models/wand_rod_blood.png"));
STAFF_ROD_NEUTRONIUM = new StaffRod("neutronium", 9002, new ItemStack(Blocks.bedrock, 1), 1000, new CreativeWandUpdate(), new ResourceLocation("forbidden", "textures/models/wand_rod_neutronium.png"));
STAFF_ROD_NEUTRONIUM.setGlowing(true);
STAFF_ROD_WITCHWOOD = new StaffRod("witchwood", 50, new ItemStack(wandCore, 1, 10), 24, new ManaStaffUpdate(), new ResourceLocation("forbidden", "textures/models/wand_rod_witchwood.png"));
+ STAFF_ROD_DREAMWOOD = new StaffRod("dreamwood", 250, new ItemStack(wandCore, 1, 13), 32, new YandereWandUpdate(), new ResourceLocation("forbidden", "textures/models/wand_rod_dreamwood.png"));
+ STAFF_ROD_DREAMWOOD.setRunes(true);
WAND_CAP_ORICHALCUM = new DarkWandCap("orichalcum", 0.0F, new ItemStack(Blocks.command_block, 1), 1000, new ResourceLocation("forbidden", "textures/models/wand_cap_orichalcum.png"));
WAND_CAP_ALCHEMICAL = new DarkWandCap("alchemical", 0.9F, Arrays.asList(new Aspect[] { Aspect.WATER }), 0.8F, new ItemStack(wandCap, 1, 0), 7, new ResourceLocation("forbidden", "textures/models/wand_cap_alchemical.png"));
WAND_CAP_VINTEUM = new DarkWandCap("vinteum", 0.9F, new ItemStack(wandCap, 1, 1), 6, new ResourceLocation("forbidden", "textures/models/wand_cap_vinteum.png"));
- //WAND_CAP_SOUL = new DarkWandCap("soul", 0.9F, Arrays.asList(new Aspect[] { Aspect.ENTROPY }), 0.8F, new ItemStack(wandCap, 1, 2), 7, new ResourceLocation("forbidden", "textures/models/wand_cap_soul.png"));
WAND_CAP_MANASTEEL = new DarkWandCap("manasteel", 0.9F, new ItemStack(wandCap, 1, 3), 6, new ResourceLocation("forbidden", "textures/models/wand_cap_manasteel.png"));
+ WAND_CAP_ELEMENTIUM = new DarkWandCap("elementium", 0.8F, new ItemStack(wandCap, 1, 5), 9, new ResourceLocation("forbidden", "textures/models/wand_cap_elementium.png"));
+
resource = new ItemResource().setUnlocalizedName("FMResource");
GameRegistry.registerItem(resource, "FMResource");
diff --git a/src/main/java/fox/spiteful/forbidden/items/ItemResource.java b/src/main/java/fox/spiteful/forbidden/items/ItemResource.java
index 2cdab54..a2f8e78 100644
--- a/src/main/java/fox/spiteful/forbidden/items/ItemResource.java
+++ b/src/main/java/fox/spiteful/forbidden/items/ItemResource.java
@@ -30,12 +30,13 @@ public class ItemResource extends Item {
@SideOnly(Side.CLIENT)
@Override
public void registerIcons(IIconRegister ir) {
- icons = new IIcon[4];
+ icons = new IIcon[5];
icons[0] = ir.registerIcon("forbidden:emerald_nugget");
icons[1] = ir.registerIcon("forbidden:dye_powder_black");
icons[2] = ir.registerIcon("forbidden:nuggetmanasteel");
icons[3] = ir.registerIcon("forbidden:tainted_blood_shard");
+ icons[4] = ir.registerIcon("forbidden:nuggetelementium");
}
@SideOnly(Side.CLIENT)
@@ -54,7 +55,7 @@ public class ItemResource extends Item {
@SideOnly(Side.CLIENT)
@Override
public void getSubItems(Item par1, CreativeTabs xCreativeTabs, List list) {
- for (int j = 0; j < 4; ++j) {
+ for (int j = 0; j < 5; ++j) {
list.add(new ItemStack(par1, 1, j));
}
}
diff --git a/src/main/java/fox/spiteful/forbidden/items/ItemSubCollar.java b/src/main/java/fox/spiteful/forbidden/items/ItemSubCollar.java
index e807619..711ea77 100644
--- a/src/main/java/fox/spiteful/forbidden/items/ItemSubCollar.java
+++ b/src/main/java/fox/spiteful/forbidden/items/ItemSubCollar.java
@@ -12,6 +12,7 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.EnumRarity;
import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.potion.PotionEffect;
import net.minecraft.util.ChatComponentText;
import net.minecraft.util.EnumChatFormatting;
@@ -81,6 +82,8 @@ public class ItemSubCollar extends ItemAmuletVis {
list.add("\u00a7" + aspect.getChatcolor() + aspect.getName() + EnumChatFormatting.RESET + " x " + amount);
}
}
+ if(stack.stackTagCompound.hasKey("owner"))
+ list.add("Owner: " + stack.stackTagCompound.getString("owner"));
}
}
@@ -100,6 +103,11 @@ public class ItemSubCollar extends ItemAmuletVis {
EntityPlayer sub = (EntityPlayer)entity;
IInventory baubles = PlayerHandler.getPlayerBaubles(sub);
if(baubles.getStackInSlot(0) == null) {
+ if(!itemstack.hasTagCompound()){
+ NBTTagCompound tag = new NBTTagCompound();
+ itemstack.setTagCompound(tag);
+ }
+ itemstack.stackTagCompound.setString("owner", player.getDisplayName());
baubles.setInventorySlotContents(0, itemstack.copy());
itemstack.stackSize = 0;
sub.addChatMessage(new ChatComponentText(player.getDisplayName() + " places a collar around your neck."));
diff --git a/src/main/java/fox/spiteful/forbidden/items/wands/ItemWandCaps.java b/src/main/java/fox/spiteful/forbidden/items/wands/ItemWandCaps.java
index e5ba171..d47dca0 100644
--- a/src/main/java/fox/spiteful/forbidden/items/wands/ItemWandCaps.java
+++ b/src/main/java/fox/spiteful/forbidden/items/wands/ItemWandCaps.java
@@ -14,7 +14,15 @@ import cpw.mods.fml.relauncher.SideOnly;
public class ItemWandCaps extends Item {
- public final String[] types = {"alchemical", "vinteum", "soul", "manasteel", "manasteel_inert"};
+ public final String[] types = {
+ "alchemical",
+ "vinteum",
+ "soul",
+ "manasteel",
+ "manasteel_inert",
+ "elementium",
+ "elementium_inert"
+ };
public IIcon[] icon;
public ItemWandCaps() {
diff --git a/src/main/java/fox/spiteful/forbidden/items/wands/ItemWandCores.java b/src/main/java/fox/spiteful/forbidden/items/wands/ItemWandCores.java
index 0b264b2..b2cbbc2 100644
--- a/src/main/java/fox/spiteful/forbidden/items/wands/ItemWandCores.java
+++ b/src/main/java/fox/spiteful/forbidden/items/wands/ItemWandCores.java
@@ -21,7 +21,21 @@ import cpw.mods.fml.relauncher.SideOnly;
public class ItemWandCores extends Item {
- public final String[] types = { "tainted", "infernal", "soul", "blood", "witchwood", "totem", "blood_inert", "livingwood", "livingwood_inert", "blood_staff", "witchwood_staff" };
+ public final String[] types = {
+ "tainted",
+ "infernal",
+ "soul",
+ "blood",
+ "witchwood",
+ "totem",
+ "blood_inert",
+ "livingwood",
+ "livingwood_inert",
+ "blood_staff",
+ "witchwood_staff",
+ "dreamwood",
+ "dreamwood_inert",
+ "dreamwood_staff" };
public IIcon[] icon;
public ItemWandCores() {
@@ -68,12 +82,6 @@ public class ItemWandCores extends Item {
((ItemWandCasting) wand.getItem()).setCap(wand, (WandCap) WandCap.caps.get("orichalcum"));
((ItemWandCasting) wand.getItem()).setRod(wand, (WandRod) WandRod.rods.get("neutronium_staff"));
list.add(wand);
- /*if (Compat.pb) {
- wand = ItemApi.getItem("itemWandCasting", 84);
- ((ItemWandCasting) wand.getItem()).setCap(wand, (WandCap) WandCap.caps.get("soul"));
- ((ItemWandCasting) wand.getItem()).setRod(wand, (WandRod) WandRod.rods.get("soul"));
- list.add(wand);
- }*/
if (Compat.bm && Config.crossWand) {
wand = ItemApi.getItem("itemWandCasting", 84);
((ItemWandCasting) wand.getItem()).setCap(wand, (WandCap) WandCap.caps.get("alchemical"));
@@ -99,6 +107,14 @@ public class ItemWandCores extends Item {
((ItemWandCasting) wand.getItem()).setCap(wand, (WandCap) WandCap.caps.get("manasteel"));
((ItemWandCasting) wand.getItem()).setRod(wand, (WandRod) WandRod.rods.get("livingwood"));
list.add(wand);
+ wand = ItemApi.getItem("itemWandCasting", 84);
+ ((ItemWandCasting) wand.getItem()).setCap(wand, (WandCap) WandCap.caps.get("elementium"));
+ ((ItemWandCasting) wand.getItem()).setRod(wand, (WandRod) WandRod.rods.get("dreamwood"));
+ list.add(wand);
+ wand = ItemApi.getItem("itemWandCasting", 84);
+ ((ItemWandCasting) wand.getItem()).setCap(wand, (WandCap) WandCap.caps.get("elementium"));
+ ((ItemWandCasting) wand.getItem()).setRod(wand, (WandRod) WandRod.rods.get("dreamwood_staff"));
+ list.add(wand);
}
}
diff --git a/src/main/java/fox/spiteful/forbidden/items/wands/SoulWandUpdate.java b/src/main/java/fox/spiteful/forbidden/items/wands/SoulWandUpdate.java
deleted file mode 100644
index 21e5008..0000000
--- a/src/main/java/fox/spiteful/forbidden/items/wands/SoulWandUpdate.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package fox.spiteful.forbidden.items.wands;
-
-import fox.spiteful.forbidden.compat.Compat;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import thaumcraft.api.aspects.Aspect;
-import thaumcraft.api.wands.IWandRodOnUpdate;
-
-public class SoulWandUpdate implements IWandRodOnUpdate {
-
- Aspect primals[] = Aspect.getPrimalAspects().toArray(new Aspect[0]);
-
- public void onUpdate(ItemStack itemstack, EntityPlayer player)
- {
- if(Compat.pb && player.ticksExisted % 150 == 0)
- {
- try
- {
- //TODO: Readd Player Beacons Support
- /* TileEntityPlayerBeacon bacon = BeaconDataHelper.getBeaconForDim(player, player.worldObj.provider.dimensionId);
- if(bacon != null && bacon.hasSkull())
- {
-
- TileEntitySkull skull = (TileEntitySkull) bacon.worldObj.getBlockTileEntity(bacon.xCoord, bacon.yCoord + 1, bacon.zCoord);
- if(skull == null)
- return;
- else if (!skull.getExtraType().equals(bacon.getOwner()))
- return;
-
- int cost;
- if(((ItemWandCasting)itemstack.getItem()).getCap(itemstack).getTag().equals("soul"))
- cost = 20;
- else
- cost = 50;
-
- int charge = 0;
- for(int j = 0;j < primals.length;j++)
- {
- if(((ItemWandCasting)itemstack.getItem()).getVis(itemstack, primals[j]) < ((ItemWandCasting)itemstack.getItem()).getMaxVis(itemstack))
- {
- ((ItemWandCasting)itemstack.getItem()).addVis(itemstack, primals[j], 1, true);
- bacon.setCorruption(bacon.getCorruption() + 50, true);
- bacon.doCorruption(false);
- charge++;
- }
- }
- if(player.worldObj.rand.nextInt(100) < charge)
- bacon.doCorruption(true);
-
- }*/
- }
- catch(Exception e)
- {
- return;
- }
- catch(NoClassDefFoundError e)
- {
- return;
- }
- }
- }
-}
diff --git a/src/main/java/fox/spiteful/forbidden/items/wands/YandereWandUpdate.java b/src/main/java/fox/spiteful/forbidden/items/wands/YandereWandUpdate.java
index 40a01bf..d6d51f3 100644
--- a/src/main/java/fox/spiteful/forbidden/items/wands/YandereWandUpdate.java
+++ b/src/main/java/fox/spiteful/forbidden/items/wands/YandereWandUpdate.java
@@ -21,7 +21,8 @@ public class YandereWandUpdate implements IWandRodOnUpdate {
try
{
int cost;
- if(((ItemWandCasting)itemstack.getItem()).getCap(itemstack).getTag().equals("manasteel"))
+ if(((ItemWandCasting)itemstack.getItem()).getCap(itemstack).getTag().equals("manasteel")
+ ||((ItemWandCasting)itemstack.getItem()).getCap(itemstack).getTag().equals("elementium"))
cost = 900;
else
cost = 1100;
diff --git a/src/main/java/fox/spiteful/forbidden/tiles/SubTileTainthistle.java b/src/main/java/fox/spiteful/forbidden/tiles/SubTileTainthistle.java
index 161679f..7a0b0c7 100644
--- a/src/main/java/fox/spiteful/forbidden/tiles/SubTileTainthistle.java
+++ b/src/main/java/fox/spiteful/forbidden/tiles/SubTileTainthistle.java
@@ -32,28 +32,28 @@ public class SubTileTainthistle extends SubTileGenerating {
public void onUpdate() {
super.onUpdate();
boolean didSomething = false;
- if(burnTime == 0) {
- if(supertile.getWorldObj().getWorldTime() % 80L == 0)
- if(mana < getMaxMana() && !supertile.getWorldObj().isRemote) {
- for(int ex = supertile.xCoord - range;ex <= supertile.xCoord + range;ex++){
- for(int wy = supertile.yCoord - range;wy <= supertile.yCoord + range;wy++){
- for(int zee = supertile.zCoord - range;zee <= supertile.zCoord + range;zee++){
- if(isFlux(ex, wy, zee)) {
- int depth = supertile.getWorldObj().getBlockMetadata(ex, wy, zee);
- supertile.getWorldObj().setBlockToAir(ex, wy, zee);
- didSomething = true;
- burnTime += depth * (1 +supertile.getWorldObj().rand.nextInt(4));
- }
+ if(supertile.getWorldObj().getWorldTime() % 80L == 0) {
+ if (mana < getMaxMana() && !supertile.getWorldObj().isRemote) {
+ for (int ex = supertile.xCoord - range; ex <= supertile.xCoord + range; ex++) {
+ for (int wy = supertile.yCoord - range; wy <= supertile.yCoord + range; wy++) {
+ for (int zee = supertile.zCoord - range; zee <= supertile.zCoord + range; zee++) {
+ if (isFlux(ex, wy, zee)) {
+ int depth = supertile.getWorldObj().getBlockMetadata(ex, wy, zee);
+ supertile.getWorldObj().setBlockToAir(ex, wy, zee);
+ didSomething = true;
+ burnTime += depth * (4 + supertile.getWorldObj().rand.nextInt(4));
}
}
}
-
- if(didSomething){
- playSound();
- sync();
- }
}
- } else {
+
+ if (didSomething) {
+ playSound();
+ sync();
+ }
+ }
+ }
+ if(burnTime > 0){
if(supertile.getWorldObj().rand.nextInt(8) == 0)
doBurnParticles();
burnTime--;
@@ -112,12 +112,12 @@ public class SubTileTainthistle extends SubTileGenerating {
@Override
public int getDelayBetweenPassiveGeneration() {
- return 3;
+ return 2;
}
@Override
public int getValueForPassiveGeneration() {
- return 1 + supertile.getWorldObj().rand.nextInt(4);
+ return 2;
}
@Override
diff --git a/src/main/resources/assets/forbidden/lang/en_US.lang b/src/main/resources/assets/forbidden/lang/en_US.lang
index 4eae4f0..609b86c 100644
--- a/src/main/resources/assets/forbidden/lang/en_US.lang
+++ b/src/main/resources/assets/forbidden/lang/en_US.lang
@@ -30,6 +30,7 @@ item.FMResource.0.name=Emerald Fragment
item.FMResource.1.name=Shadow Ink
item.FMResource.2.name=Manasteel Nugget
item.FMResource.3.name=Tainted Blood Shard
+item.FMResource.4.name=Elementium Nugget
item.MobCrystalEmpty.name=Blank Imprinting Crystal
item.MobCrystal.name=Imprinted Crystal
item.DiabolistFork.name=Diabolist Fork
@@ -48,16 +49,15 @@ item.SubCollar.name=Collar of Pain
item.Wand.tainted.rod=Tainted
item.Wand.infernal.rod=Infernal
item.Wand.neutronium.rod=Cosmic Neutronium
-item.Wand.soul.rod=Eldritch
item.Wand.blood.rod=Blood
item.Wand.witchwood.rod=Witchwood
-item.Wand.totem.rod=Totem
item.Wand.livingwood.rod=Livingwood
+item.Wand.dreamwood.rod=Dreamwood
item.Wand.orichalcum.cap=Orichalcum Studded
item.Wand.alchemical.cap=Alchemically Crowned
item.Wand.vinteum.cap=Vinteum Bossed
-item.Wand.soul.cap=Ender Shielded
item.Wand.manasteel.cap=Manasteel Entwined
+item.Wand.elementium.cap=Elementium Kissed
item.WandCores.tainted.name=Tainted Rod
item.WandCores.infernal.name=Infernal Rod
item.WandCores.soul.name=Eldritch Rod
@@ -69,11 +69,16 @@ item.WandCores.livingwood.name=Livingwood Rod
item.WandCores.livingwood_inert.name=Dormant Livingwood Rod
item.WandCores.blood_staff.name=Blood Staff Core
item.WandCores.witchwood_staff.name=Witchwood Staff Core
+item.WandCores.dreamwood.name=Dreamwood Rod
+item.WandCores.dreamwood_inert.name=Silent Dreamwood Rod
+item.WandCores.dreamwood_staff.name=Dreamwood Staff Core
item.WandCaps.alchemical.name=Alchemical Cap
item.WandCaps.vinteum.name=Vinteum Cap
item.WandCaps.soul.name=Ender Cap
item.WandCaps.manasteel.name=Manasteel Cap
item.WandCaps.manasteel_inert.name=Inert Manasteel Cap
+item.WandCaps.elementium.name=Elementium Cap
+item.WandCaps.elementium_inert.name=Inert Elementium Cap
#
# Blocks
tile.ArcaneCake.name=Thaumic Cake
@@ -166,6 +171,10 @@ forbidden.research_name.ROD_livingwood=Livingwood Wand Core
forbidden.research_text.ROD_livingwood=Botanical vis storage
forbidden.research_page.ROD_livingwood.1=Livingwood has the fantastic ability to manipulate mana. When combined with the right reagents, it can even convert mana into vis.
The Livingwood Wand will quickly draw mana from storage items in your inventory in order to charge itself.
The infusion process burns the livingwood out, unfortunately. Once infused, the wand rod must be charged in a mana pool in order to be re-awakened.
#
+forbidden.research_name.ROD_dreamwood_staff=Dreamwood Staff
+forbidden.research_text.ROD_dreamwood_staff=Sweet dreams are made of these
+forbidden.research_page.ROD_dreamwood_staff.1=Livingwood is a useful material, but it can't seem to withstand the amount of arcane power needed to make a staff. The elves' dreamwood seems to be up to task, however.
Staves made of dreamwood hold significantly more vis than the equivalent wand and are able to apply more potent power when using foci.
As with livingwood, dreamwood rods must be infused in a mana pool to fully awaken.
+#
forbidden.research_name.CAP_alchemical=Alchemical Caps
forbidden.research_text.CAP_alchemical=When Thaumium isn't bloody enough
forbidden.research_page.CAP_alchemical.1=You've developed a wand cap that merges Thaumaturgy and Alchemical Wizardry. Alchemical Caps are very effective at channeling Aqua, only using 80% of the normal vis cost. For everything else, they offer only a 90% rate.
If combined with a Bloody Wand Core, Alchemical Caps discount the amount of LP consumed by the wand, costing only 900 LP per vis. The caps also cause all attacks from a blood wand to inflict Weakness.
@@ -180,7 +189,11 @@ forbidden.research_page.CAP_soul.1=You've created a wand cap that can safely cha
#
forbidden.research_name.CAP_manasteel=Manasteel Caps
forbidden.research_text.CAP_manasteel=The secret of mana
-forbidden.research_page.CAP_manasteel.1=Manasteel has very useful properties when it comes to mana manipulation. When crafted into a wand cap, it offers a 90% vis rate. If combined with a Livingwood Wand, it also makes the mana conversion process more efficient.
In order to be used in the creation of a wand, the Inert Manasteel Caps must be infused in a Mana Pool.
+forbidden.research_page.CAP_manasteel.1=Manasteel has very useful properties when it comes to mana manipulation. When crafted into a wand cap, it offers a 90% vis rate. If combined with a wand that can consume mana, it also makes the mana conversion process more efficient.
In order to be used in the creation of a wand, the Inert Manasteel Caps must be infused in a Mana Pool.
+#
+forbidden.research_name.CAP_elementium=Elementium Caps
+forbidden.research_text.CAP_elementium=Eco Friendly Wand Caps
+forbidden.research_page.CAP_elementium.1=Alfheim seems to be a world steeped in magical power, and Elementium is no exception. When crafted into a wand cap and treated with the right materials, Elementium Caps have an exceptional ability to channel vis. When combined with a wand or staff that uses mana, they'll also reduce the mana conversion rate.
Elementium's pretty pink color is just icing on the cake.
#
forbidden.research_name.TRANSEMERALD=Emerald Transmutation
forbidden.research_text.TRANSEMERALD=Transformation of valuables into emerald
@@ -274,6 +287,10 @@ forbidden.research_name.WHISPERWEED=Whisperweed
forbidden.research_text.WHISPERWEED=Dubbed, not Subbed
forbidden.research_page.WHISPERWEED.1=A busy thaumaturge has better things to do than run around in the field researching things. To save yourself many hours pulling stacks of cobble apart, you've created a flower that's in touch with the supernatural flow of the universe. The Whisperweed is a magical plant which uses mana to whisper scraps of arcane knowledge into the ears of anyone nearby.
Prolonged exposure to its unearthly murmurs may have a negative effect on your psyche, however...
#
+forbidden.research_name.TAINTHISTLE=Tainthistle
+forbidden.research_text.TAINTHISTLE=It won't clean up your empty pocky containers
+forbidden.research_page.TAINTHISTLE.1=When you have unlimited arcane power at your fingertips, small chores like mopping flux goo off your laboratory floor just seem beneath you.
Fortunately, you now have a helper to clean up for you. The Tainthistle will suck up any flux goo or gas nearby and use it to generate mana.
+#
forbidden.research_name.SUBCOLLAR=Collar of Pain
forbidden.research_text.SUBCOLLAR=Pain and Magic
forbidden.research_page.SUBCOLLAR.1=Sometimes, people just want to get hurt. Especially if there's a benefit...
The Collar of Pain has all the capabilities of an Amulet of Vis Storage with the added bonus that it will generate vis whenever you take damage. The more you get hurt, the more vis it generates.
diff --git a/src/main/resources/assets/forbidden/textures/items/nuggetelementium.png b/src/main/resources/assets/forbidden/textures/items/nuggetelementium.png
new file mode 100644
index 0000000..42aa7b9
Binary files /dev/null and b/src/main/resources/assets/forbidden/textures/items/nuggetelementium.png differ
diff --git a/src/main/resources/assets/forbidden/textures/items/wand_cap_elementium.png b/src/main/resources/assets/forbidden/textures/items/wand_cap_elementium.png
new file mode 100644
index 0000000..98c1aa3
Binary files /dev/null and b/src/main/resources/assets/forbidden/textures/items/wand_cap_elementium.png differ
diff --git a/src/main/resources/assets/forbidden/textures/items/wand_cap_elementium.png.mcmeta b/src/main/resources/assets/forbidden/textures/items/wand_cap_elementium.png.mcmeta
new file mode 100644
index 0000000..ce40017
--- /dev/null
+++ b/src/main/resources/assets/forbidden/textures/items/wand_cap_elementium.png.mcmeta
@@ -0,0 +1,11 @@
+{
+ "animation": {
+ "frametime": 3,
+ "frames": [
+ 0,
+ 1,
+ 2,
+ 1
+ ]
+ }
+}
diff --git a/src/main/resources/assets/forbidden/textures/items/wand_cap_elementium_inert.png b/src/main/resources/assets/forbidden/textures/items/wand_cap_elementium_inert.png
new file mode 100644
index 0000000..9e2570b
Binary files /dev/null and b/src/main/resources/assets/forbidden/textures/items/wand_cap_elementium_inert.png differ
diff --git a/src/main/resources/assets/forbidden/textures/items/wand_rod_dreamwood.png b/src/main/resources/assets/forbidden/textures/items/wand_rod_dreamwood.png
new file mode 100644
index 0000000..61b5906
Binary files /dev/null and b/src/main/resources/assets/forbidden/textures/items/wand_rod_dreamwood.png differ
diff --git a/src/main/resources/assets/forbidden/textures/items/wand_rod_dreamwood_inert.png b/src/main/resources/assets/forbidden/textures/items/wand_rod_dreamwood_inert.png
new file mode 100644
index 0000000..287a81c
Binary files /dev/null and b/src/main/resources/assets/forbidden/textures/items/wand_rod_dreamwood_inert.png differ
diff --git a/src/main/resources/assets/forbidden/textures/items/wand_rod_dreamwood_staff.png b/src/main/resources/assets/forbidden/textures/items/wand_rod_dreamwood_staff.png
new file mode 100644
index 0000000..de700ba
Binary files /dev/null and b/src/main/resources/assets/forbidden/textures/items/wand_rod_dreamwood_staff.png differ
diff --git a/src/main/resources/assets/forbidden/textures/models/wand_rod_dreamwood.png b/src/main/resources/assets/forbidden/textures/models/wand_rod_dreamwood.png
new file mode 100644
index 0000000..6c3a4b1
Binary files /dev/null and b/src/main/resources/assets/forbidden/textures/models/wand_rod_dreamwood.png differ