mirror of
https://github.com/GTNewHorizons/ForbiddenMagic.git
synced 2026-11-17 19:05:27 +00:00
[ci skip] spotlessApply with the new settings
This commit is contained in:
1 parent
a4862ed8c9
commit
1e0800ce3f
138 files changed
+2537
-3040
No files matched your search
@@ -3,15 +3,19 @@ package fox.spiteful.forbidden;
|
||||
import java.io.File;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.common.config.Configuration;
|
||||
|
||||
import org.apache.logging.log4j.Level;
|
||||
|
||||
import thaumcraft.api.ItemApi;
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
|
||||
public class Config {
|
||||
|
||||
public static HashMap<String, Aspect> spawnerMobs = new HashMap<String, Aspect>();
|
||||
public static ArrayList<String> trash = new ArrayList<String>();
|
||||
|
||||
@@ -78,126 +82,108 @@ public class Config {
|
||||
wrathEnchID = conf.get("enchantments", "Wrath", enchCount++).getInt();
|
||||
greedyEnchID = conf.get("enchantments", "Capitalist", enchCount++).getInt();
|
||||
consumingEnchID = conf.get("enchantments", "Consuming", enchCount++).getInt();
|
||||
educationalEnchID =
|
||||
conf.get("enchantments", "Educational", enchCount++).getInt();
|
||||
corruptingEnchID =
|
||||
conf.get("enchantments", "Corrupting", enchCount++).getInt();
|
||||
educationalEnchID = conf.get("enchantments", "Educational", enchCount++).getInt();
|
||||
corruptingEnchID = conf.get("enchantments", "Corrupting", enchCount++).getInt();
|
||||
voidEnchID = conf.get("enchantments", "Voidtouched", enchCount++).getInt();
|
||||
impactEnchID = conf.get("enchantments", "Impact", enchCount++).getInt();
|
||||
|
||||
int upgradeCount = 42;
|
||||
hellfireUpgradeID =
|
||||
conf.get("focus upgrades", "Hellfire", upgradeCount).getInt(upgradeCount++);
|
||||
pandemoniumUpgradeID =
|
||||
conf.get("focus upgrades", "Pandemonium", upgradeCount).getInt(upgradeCount++);
|
||||
hellfireUpgradeID = conf.get("focus upgrades", "Hellfire", upgradeCount).getInt(upgradeCount++);
|
||||
pandemoniumUpgradeID = conf.get("focus upgrades", "Pandemonium", upgradeCount).getInt(upgradeCount++);
|
||||
|
||||
noLust = conf.get("general", "No Lust", noLust, "Enable to remove Luxuria aspect and related items.")
|
||||
.getBoolean(false);
|
||||
silverfishEmeralds = conf.get(
|
||||
"general",
|
||||
"Silverfish Drop Emerald Nuggets",
|
||||
silverfishEmeralds,
|
||||
"Disable to prevent Silverfish from dropping emerald nuggets.")
|
||||
.getBoolean(true);
|
||||
"general",
|
||||
"Silverfish Drop Emerald Nuggets",
|
||||
silverfishEmeralds,
|
||||
"Disable to prevent Silverfish from dropping emerald nuggets.").getBoolean(true);
|
||||
greedyEnch = conf.get(
|
||||
"general",
|
||||
"Capitalist Enchantment",
|
||||
greedyEnch,
|
||||
"Disable to remove the recipe and effects of the Capitalist enchantment.")
|
||||
.getBoolean(true);
|
||||
"general",
|
||||
"Capitalist Enchantment",
|
||||
greedyEnch,
|
||||
"Disable to remove the recipe and effects of the Capitalist enchantment.").getBoolean(true);
|
||||
emeraldTrans = conf.get(
|
||||
"general",
|
||||
"Emerald Transmutation",
|
||||
emeraldTrans,
|
||||
"Disable to remove the Emerald Transmutation research and recipe.")
|
||||
.getBoolean(true);
|
||||
"general",
|
||||
"Emerald Transmutation",
|
||||
emeraldTrans,
|
||||
"Disable to remove the Emerald Transmutation research and recipe.").getBoolean(true);
|
||||
tagResearch = conf.get(
|
||||
"general",
|
||||
"Tag Research Items",
|
||||
tagResearch,
|
||||
"Disable to get rid of the [FM] tags in the Thaumonomicon.")
|
||||
.getBoolean(true);
|
||||
"general",
|
||||
"Tag Research Items",
|
||||
tagResearch,
|
||||
"Disable to get rid of the [FM] tags in the Thaumonomicon.").getBoolean(true);
|
||||
wrathCage = conf.get(
|
||||
"general",
|
||||
"Wrath Cage Enabled",
|
||||
wrathCage,
|
||||
"Disable if you don't want players using the Wrath Cage.")
|
||||
.getBoolean(true);
|
||||
"general",
|
||||
"Wrath Cage Enabled",
|
||||
wrathCage,
|
||||
"Disable if you don't want players using the Wrath Cage.").getBoolean(true);
|
||||
wrathCost = conf.get(
|
||||
"general",
|
||||
"Wrath Cage Fuel Cost",
|
||||
wrathCost,
|
||||
"Cost of essentia per round of spawns in the Wrath Cage. Raise to increase essentia costs. Defaults to 5. Set to 0 to remove the need to fuel the Wrath Cage. Setting the cost above 64 is not recommended.")
|
||||
"general",
|
||||
"Wrath Cage Fuel Cost",
|
||||
wrathCost,
|
||||
"Cost of essentia per round of spawns in the Wrath Cage. Raise to increase essentia costs. Defaults to 5. Set to 0 to remove the need to fuel the Wrath Cage. Setting the cost above 64 is not recommended.")
|
||||
.getInt(5);
|
||||
wrathEff = conf.get(
|
||||
"general",
|
||||
"Wrath Cage Fuel Efficiency",
|
||||
wrathEff,
|
||||
"Number of spawns a Wrath Cage can get per fuel cost. Defaults to 4. Lower to make the cage less efficient and raise to make it more efficient.")
|
||||
"general",
|
||||
"Wrath Cage Fuel Efficiency",
|
||||
wrathEff,
|
||||
"Number of spawns a Wrath Cage can get per fuel cost. Defaults to 4. Lower to make the cage less efficient and raise to make it more efficient.")
|
||||
.getInt(4);
|
||||
if (wrathEff < 0) wrathEff = 4;
|
||||
wrathCrazy = conf.get(
|
||||
"general",
|
||||
"Wrath Cage Cries Havoc",
|
||||
wrathCrazy,
|
||||
"Enable to let the Wrath Cage imprint on ANY non-boss mob. May break your game or make your game Awesome.")
|
||||
"general",
|
||||
"Wrath Cage Cries Havoc",
|
||||
wrathCrazy,
|
||||
"Enable to let the Wrath Cage imprint on ANY non-boss mob. May break your game or make your game Awesome.")
|
||||
.getBoolean(false);
|
||||
enchanting = conf.get(
|
||||
"general", "Enchantments Enabled", enchanting, "Disable if you don't like enchantments.")
|
||||
enchanting = conf
|
||||
.get("general", "Enchantments Enabled", enchanting, "Disable if you don't like enchantments.")
|
||||
.getBoolean(true);
|
||||
spork = conf.get("silly", "Spork of Doom", spork, "What is this? I don't even...")
|
||||
.getBoolean(false);
|
||||
spork = conf.get("silly", "Spork of Doom", spork, "What is this? I don't even...").getBoolean(false);
|
||||
gluttony = (byte) conf.get(
|
||||
"general",
|
||||
"Gluttony",
|
||||
gluttony,
|
||||
"Whether gluttony research is enabled. 0 = Enabled, 1 = Disabled, 2 = Hardcore")
|
||||
.getInt(0);
|
||||
"general",
|
||||
"Gluttony",
|
||||
gluttony,
|
||||
"Whether gluttony research is enabled. 0 = Enabled, 1 = Disabled, 2 = Hardcore").getInt(0);
|
||||
if (gluttony < 0 || gluttony > 2) gluttony = 0;
|
||||
hereticID = conf.get("general", "Heretic Villager ID", hereticID).getInt(hereticID);
|
||||
|
||||
String trashlist = conf.get(
|
||||
"general",
|
||||
"Garbage Blocks",
|
||||
"dirt;sand;gravel;cobblestone;netherrack",
|
||||
"List of OreDict names for garbage blocks, separated by semicolons, for the Consuming enchant to eat")
|
||||
"general",
|
||||
"Garbage Blocks",
|
||||
"dirt;sand;gravel;cobblestone;netherrack",
|
||||
"List of OreDict names for garbage blocks, separated by semicolons, for the Consuming enchant to eat")
|
||||
.getString();
|
||||
String[] trashpile = trashlist.split(";");
|
||||
for (String garbage : trashpile) {
|
||||
trash.add(garbage);
|
||||
}
|
||||
|
||||
bloodSealPotionID =
|
||||
conf.get("potions", "Blood Seal", bloodSealPotionID).getInt(bloodSealPotionID);
|
||||
dragonwrackPotionID =
|
||||
conf.get("potions", "Dragonwrack", dragonwrackPotionID).getInt(dragonwrackPotionID);
|
||||
bloodSealPotionID = conf.get("potions", "Blood Seal", bloodSealPotionID).getInt(bloodSealPotionID);
|
||||
dragonwrackPotionID = conf.get("potions", "Dragonwrack", dragonwrackPotionID).getInt(dragonwrackPotionID);
|
||||
|
||||
crossMod = conf.get("compatibility", "Cross-Mod Interaction", crossMod, "Disable to keep mods segregated.")
|
||||
.getBoolean(true);
|
||||
crossWand = conf.get(
|
||||
"compatibility", "Conversion Wands", crossWand, "Disable to remove all conversion wands.")
|
||||
crossWand = conf
|
||||
.get("compatibility", "Conversion Wands", crossWand, "Disable to remove all conversion wands.")
|
||||
.getBoolean(true);
|
||||
botan = conf.get("compatibility", "Botania Interaction", botan).getBoolean(true);
|
||||
bloodMagic = conf.get("compatibility", "Blood Magic Interaction", bloodMagic)
|
||||
.getBoolean(true);
|
||||
bloodMagic = conf.get("compatibility", "Blood Magic Interaction", bloodMagic).getBoolean(true);
|
||||
am2 = conf.get(
|
||||
"compatibility",
|
||||
"Ars Magica 2 Interaction",
|
||||
am2,
|
||||
"AM2 interaction is unsupported. Enable at your own risk.")
|
||||
.getBoolean(true);
|
||||
"compatibility",
|
||||
"Ars Magica 2 Interaction",
|
||||
am2,
|
||||
"AM2 interaction is unsupported. Enable at your own risk.").getBoolean(true);
|
||||
tt = conf.get("compatibility", "Thaumic Tinkerer Interaction", tt).getBoolean(true);
|
||||
tc = conf.get("compatibility", "Tinkers Construct Interaction", tc).getBoolean(true);
|
||||
special = conf.get("compatibility", "Special Mobs Interaction", special)
|
||||
.getBoolean(true);
|
||||
twilight = conf.get("compatibility", "Twilight Forest Interaction", twilight)
|
||||
.getBoolean(true);
|
||||
special = conf.get("compatibility", "Special Mobs Interaction", special).getBoolean(true);
|
||||
twilight = conf.get("compatibility", "Twilight Forest Interaction", twilight).getBoolean(true);
|
||||
emc = conf.get(
|
||||
"compatibility",
|
||||
"Equivalent Exchange 3 EMC",
|
||||
emc,
|
||||
"Disable if you don't want Forbidden Magic to add EMC values to items.")
|
||||
.getBoolean(true);
|
||||
"compatibility",
|
||||
"Equivalent Exchange 3 EMC",
|
||||
emc,
|
||||
"Disable if you don't want Forbidden Magic to add EMC values to items.").getBoolean(true);
|
||||
// eewand = conf.get("compatibility", "Equivalent Exchange 3 Wand", eewand, "Disable to specifically disable
|
||||
// the EMC to Vis wand.").getBoolean(true);
|
||||
|
||||
@@ -216,8 +202,7 @@ public class Config {
|
||||
thaumcraftShard = ItemApi.getItem("itemShard", 0);
|
||||
thaumcraftTaintBlock = ItemApi.getBlock("blockTaint", 0);
|
||||
thaumcraftOre = ItemApi.getBlock("blockCustomOre", 0);
|
||||
taintMaterial =
|
||||
Block.getBlockFromItem(thaumcraftTaintBlock.getItem()).getMaterial();
|
||||
taintMaterial = Block.getBlockFromItem(thaumcraftTaintBlock.getItem()).getMaterial();
|
||||
} catch (Exception e) {
|
||||
LogHandler.log(Level.ERROR, e, "There was problem when retrieving information from Thaumcraft.");
|
||||
e.printStackTrace();
|
||||
|
||||
@@ -1,19 +1,22 @@
|
||||
package fox.spiteful.forbidden;
|
||||
|
||||
import fox.spiteful.forbidden.blocks.ForbiddenBlocks;
|
||||
import fox.spiteful.forbidden.items.ForbiddenItems;
|
||||
import java.util.Iterator;
|
||||
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
|
||||
import thaumcraft.api.ThaumcraftApi;
|
||||
import thaumcraft.api.ThaumcraftApiHelper;
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.api.aspects.AspectList;
|
||||
import fox.spiteful.forbidden.blocks.ForbiddenBlocks;
|
||||
import fox.spiteful.forbidden.items.ForbiddenItems;
|
||||
|
||||
public class DarkAspects {
|
||||
|
||||
public static Aspect NETHER;
|
||||
public static Aspect WRATH;
|
||||
public static Aspect ENVY;
|
||||
@@ -27,7 +30,7 @@ public class DarkAspects {
|
||||
LUST = new Aspect(
|
||||
"luxuria",
|
||||
0xffc1ce,
|
||||
new Aspect[] {Aspect.FLESH, Aspect.HUNGER},
|
||||
new Aspect[] { Aspect.FLESH, Aspect.HUNGER },
|
||||
new ResourceLocation("forbidden", "textures/aspects/luxuria.png"),
|
||||
1);
|
||||
}
|
||||
@@ -35,37 +38,37 @@ public class DarkAspects {
|
||||
NETHER = new Aspect(
|
||||
"infernus",
|
||||
0xff0000,
|
||||
new Aspect[] {Aspect.FIRE, Aspect.MAGIC},
|
||||
new Aspect[] { Aspect.FIRE, Aspect.MAGIC },
|
||||
new ResourceLocation("forbidden", "textures/aspects/infernus.png"),
|
||||
771);
|
||||
PRIDE = new Aspect(
|
||||
"superbia",
|
||||
0x9639ff,
|
||||
new Aspect[] {Aspect.FLIGHT, Aspect.VOID},
|
||||
new Aspect[] { Aspect.FLIGHT, Aspect.VOID },
|
||||
new ResourceLocation("forbidden", "textures/aspects/superbia.png"),
|
||||
1);
|
||||
GLUTTONY = new Aspect(
|
||||
"gula",
|
||||
0xd59c46,
|
||||
new Aspect[] {Aspect.HUNGER, Aspect.VOID},
|
||||
new Aspect[] { Aspect.HUNGER, Aspect.VOID },
|
||||
new ResourceLocation("forbidden", "textures/aspects/gula.png"),
|
||||
1);
|
||||
ENVY = new Aspect(
|
||||
"invidia",
|
||||
0x00ba00,
|
||||
new Aspect[] {Aspect.SENSES, Aspect.HUNGER},
|
||||
new Aspect[] { Aspect.SENSES, Aspect.HUNGER },
|
||||
new ResourceLocation("forbidden", "textures/aspects/invidia.png"),
|
||||
1);
|
||||
SLOTH = new Aspect(
|
||||
"desidia",
|
||||
0x6e6e6e,
|
||||
new Aspect[] {Aspect.TRAP, Aspect.SOUL},
|
||||
new Aspect[] { Aspect.TRAP, Aspect.SOUL },
|
||||
new ResourceLocation("forbidden", "textures/aspects/desidia.png"),
|
||||
771);
|
||||
WRATH = new Aspect(
|
||||
"ira",
|
||||
0x870404,
|
||||
new Aspect[] {Aspect.WEAPON, Aspect.FIRE},
|
||||
new Aspect[] { Aspect.WEAPON, Aspect.FIRE },
|
||||
new ResourceLocation("forbidden", "textures/aspects/ira.png"),
|
||||
771);
|
||||
}
|
||||
@@ -90,8 +93,7 @@ public class DarkAspects {
|
||||
// list.add(NETHER, 2);
|
||||
// ThaumcraftApi.registerObjectTag(Block.oreNetherQuartz.blockID, -1,
|
||||
// list);
|
||||
ThaumcraftApi.registerObjectTag(
|
||||
"oreQuartz", (new AspectList()).add(Aspect.CRYSTAL, 3).add(NETHER, 2));
|
||||
ThaumcraftApi.registerObjectTag("oreQuartz", (new AspectList()).add(Aspect.CRYSTAL, 3).add(NETHER, 2));
|
||||
|
||||
list = getAspectList(new ItemStack(Items.nether_star));
|
||||
list.add(NETHER, 8).add(PRIDE, 8);
|
||||
@@ -138,15 +140,15 @@ public class DarkAspects {
|
||||
list = getAspectList(new ItemStack(Items.golden_chestplate));
|
||||
if (list != null) {
|
||||
list.add(PRIDE, 1);
|
||||
ThaumcraftApi.registerObjectTag(
|
||||
new ItemStack(Items.golden_chestplate, 1, OreDictionary.WILDCARD_VALUE), list);
|
||||
ThaumcraftApi
|
||||
.registerObjectTag(new ItemStack(Items.golden_chestplate, 1, OreDictionary.WILDCARD_VALUE), list);
|
||||
}
|
||||
|
||||
list = getAspectList(new ItemStack(Items.golden_leggings));
|
||||
if (list != null) {
|
||||
list.add(PRIDE, 1);
|
||||
ThaumcraftApi.registerObjectTag(
|
||||
new ItemStack(Items.golden_leggings, 1, OreDictionary.WILDCARD_VALUE), list);
|
||||
ThaumcraftApi
|
||||
.registerObjectTag(new ItemStack(Items.golden_leggings, 1, OreDictionary.WILDCARD_VALUE), list);
|
||||
}
|
||||
|
||||
list = getAspectList(new ItemStack(Items.golden_boots));
|
||||
@@ -196,11 +198,7 @@ public class DarkAspects {
|
||||
// -1, (new AspectList()).merge(Aspect.MECHANISM, 2).merge(Aspect.ORDER,
|
||||
// 2).merge(ENVY, 2));
|
||||
|
||||
list = (new AspectList())
|
||||
.add(Aspect.FLESH, 6)
|
||||
.add(Aspect.LIFE, 6)
|
||||
.add(Aspect.ENERGY, 6)
|
||||
.add(Aspect.BEAST, 4)
|
||||
list = (new AspectList()).add(Aspect.FLESH, 6).add(Aspect.LIFE, 6).add(Aspect.ENERGY, 6).add(Aspect.BEAST, 4)
|
||||
.add(GLUTTONY, 6);
|
||||
ThaumcraftApi.registerObjectTag("itemBacon", list);
|
||||
|
||||
@@ -279,13 +277,12 @@ public class DarkAspects {
|
||||
ThaumcraftApi.registerObjectTag(
|
||||
new ItemStack(ForbiddenItems.deadlyShards, 1, 3),
|
||||
(new AspectList()).add(NETHER, 1).add(PRIDE, 2).add(Aspect.CRYSTAL, 1));
|
||||
if (!Config.noLust)
|
||||
ThaumcraftApi.registerObjectTag(
|
||||
new ItemStack(ForbiddenItems.deadlyShards, 1, 4),
|
||||
(new AspectList()).add(NETHER, 1).add(LUST, 2).add(Aspect.CRYSTAL, 1));
|
||||
else
|
||||
ThaumcraftApi.registerObjectTag(
|
||||
new ItemStack(ForbiddenItems.deadlyShards, 1, 4), (new AspectList()).add(Aspect.VOID, 1));
|
||||
if (!Config.noLust) ThaumcraftApi.registerObjectTag(
|
||||
new ItemStack(ForbiddenItems.deadlyShards, 1, 4),
|
||||
(new AspectList()).add(NETHER, 1).add(LUST, 2).add(Aspect.CRYSTAL, 1));
|
||||
else ThaumcraftApi.registerObjectTag(
|
||||
new ItemStack(ForbiddenItems.deadlyShards, 1, 4),
|
||||
(new AspectList()).add(Aspect.VOID, 1));
|
||||
ThaumcraftApi.registerObjectTag(
|
||||
new ItemStack(ForbiddenItems.gluttonyShard, 1, OreDictionary.WILDCARD_VALUE),
|
||||
(new AspectList()).add(NETHER, 1).add(GLUTTONY, 2).add(Aspect.CRYSTAL, 1));
|
||||
@@ -296,25 +293,19 @@ public class DarkAspects {
|
||||
new ItemStack(ForbiddenItems.deadlyShards, 1, 6),
|
||||
(new AspectList()).add(NETHER, 1).add(Aspect.GREED, 2).add(Aspect.CRYSTAL, 1));
|
||||
ThaumcraftApi.registerObjectTag(
|
||||
new ItemStack(ForbiddenItems.resource, 1, 0), (new AspectList()).add(Aspect.CRYSTAL, 1));
|
||||
new ItemStack(ForbiddenItems.resource, 1, 0),
|
||||
(new AspectList()).add(Aspect.CRYSTAL, 1));
|
||||
ThaumcraftApi.registerObjectTag(
|
||||
new ItemStack(ForbiddenItems.resource, 1, 1), (new AspectList()).add(Aspect.DARKNESS, 1));
|
||||
new ItemStack(ForbiddenItems.resource, 1, 1),
|
||||
(new AspectList()).add(Aspect.DARKNESS, 1));
|
||||
ThaumcraftApi.registerObjectTag(
|
||||
new ItemStack(ForbiddenBlocks.blackFlower, 1, OreDictionary.WILDCARD_VALUE),
|
||||
(new AspectList())
|
||||
.add(Aspect.PLANT, 1)
|
||||
.add(Aspect.LIFE, 1)
|
||||
.add(Aspect.SENSES, 1)
|
||||
(new AspectList()).add(Aspect.PLANT, 1).add(Aspect.LIFE, 1).add(Aspect.SENSES, 1)
|
||||
.add(Aspect.DARKNESS, 1));
|
||||
if (!Config.noLust)
|
||||
ThaumcraftApi.registerObjectTag(
|
||||
new ItemStack(ForbiddenItems.ridingCrop, 1, OreDictionary.WILDCARD_VALUE),
|
||||
(new AspectList())
|
||||
.add(Aspect.TREE, 2)
|
||||
.add(Aspect.CLOTH, 2)
|
||||
.add(Aspect.BEAST, 1)
|
||||
.add(LUST, 1)
|
||||
.add(Aspect.WEAPON, 1));
|
||||
if (!Config.noLust) ThaumcraftApi.registerObjectTag(
|
||||
new ItemStack(ForbiddenItems.ridingCrop, 1, OreDictionary.WILDCARD_VALUE),
|
||||
(new AspectList()).add(Aspect.TREE, 2).add(Aspect.CLOTH, 2).add(Aspect.BEAST, 1).add(LUST, 1)
|
||||
.add(Aspect.WEAPON, 1));
|
||||
ThaumcraftApi.registerObjectTag(
|
||||
new ItemStack(ForbiddenItems.taintFruit, 1, OreDictionary.WILDCARD_VALUE),
|
||||
(new AspectList()).add(Aspect.TAINT, 2).add(Aspect.POISON, 1));
|
||||
@@ -331,6 +322,7 @@ public class DarkAspects {
|
||||
new ItemStack(ForbiddenBlocks.taintPlanks, 1, OreDictionary.WILDCARD_VALUE),
|
||||
(new AspectList()).add(Aspect.TREE, 1));
|
||||
ThaumcraftApi.registerObjectTag(
|
||||
new ItemStack(ForbiddenBlocks.taintStone, 1, 1), (new AspectList()).add(Aspect.EARTH, 1));
|
||||
new ItemStack(ForbiddenBlocks.taintStone, 1, 1),
|
||||
(new AspectList()).add(Aspect.EARTH, 1));
|
||||
}
|
||||
}
|
||||
@@ -1,14 +1,16 @@
|
||||
package fox.spiteful.forbidden;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.util.StatCollector;
|
||||
|
||||
import thaumcraft.api.aspects.AspectList;
|
||||
import thaumcraft.api.research.ResearchItem;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class DarkResearchItem extends ResearchItem {
|
||||
|
||||
String inter = null;
|
||||
|
||||
public DarkResearchItem(String par1, String x) {
|
||||
@@ -23,14 +25,14 @@ public class DarkResearchItem extends ResearchItem {
|
||||
super(par1, x, tags, y, z, par5, icon);
|
||||
}
|
||||
|
||||
public DarkResearchItem(
|
||||
String par1, String x, String mod, AspectList tags, int y, int z, int par5, ResourceLocation icon) {
|
||||
public DarkResearchItem(String par1, String x, String mod, AspectList tags, int y, int z, int par5,
|
||||
ResourceLocation icon) {
|
||||
super(par1, x, tags, y, z, par5, icon);
|
||||
inter = mod;
|
||||
}
|
||||
|
||||
public DarkResearchItem(
|
||||
String par1, String x, String mod, AspectList tags, int y, int z, int par5, ItemStack icon) {
|
||||
public DarkResearchItem(String par1, String x, String mod, AspectList tags, int y, int z, int par5,
|
||||
ItemStack icon) {
|
||||
super(par1, x, tags, y, z, par5, icon);
|
||||
inter = mod;
|
||||
}
|
||||
|
||||
@@ -1,20 +1,7 @@
|
||||
package fox.spiteful.forbidden;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
|
||||
import baubles.api.BaublesApi;
|
||||
import com.google.common.collect.Multimap;
|
||||
import cpw.mods.fml.common.eventhandler.EventPriority;
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
import cpw.mods.fml.common.gameevent.PlayerEvent.ItemCraftedEvent;
|
||||
import fox.spiteful.forbidden.blocks.ForbiddenBlocks;
|
||||
import fox.spiteful.forbidden.compat.Compat;
|
||||
import fox.spiteful.forbidden.enchantments.DarkEnchantments;
|
||||
import fox.spiteful.forbidden.items.ForbiddenItems;
|
||||
import fox.spiteful.forbidden.items.baubles.ItemSubCollar;
|
||||
import fox.spiteful.forbidden.items.tools.ItemRidingCrop;
|
||||
import fox.spiteful.forbidden.items.tools.ItemTaintPickaxe;
|
||||
import fox.spiteful.forbidden.potions.DarkPotions;
|
||||
import java.util.*;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.enchantment.Enchantment;
|
||||
import net.minecraft.enchantment.EnchantmentHelper;
|
||||
@@ -51,16 +38,35 @@ import net.minecraftforge.event.entity.player.PlayerEvent.BreakSpeed;
|
||||
import net.minecraftforge.event.entity.player.PlayerUseItemEvent;
|
||||
import net.minecraftforge.event.world.BlockEvent.HarvestDropsEvent;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
|
||||
import org.apache.logging.log4j.Level;
|
||||
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.api.entities.ITaintedMob;
|
||||
import thaumcraft.common.config.ConfigItems;
|
||||
import thaumcraft.common.items.wands.ItemWandCasting;
|
||||
import thaumcraft.common.lib.utils.Utils;
|
||||
import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
|
||||
import baubles.api.BaublesApi;
|
||||
|
||||
import com.google.common.collect.Multimap;
|
||||
|
||||
import cpw.mods.fml.common.eventhandler.EventPriority;
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
import cpw.mods.fml.common.gameevent.PlayerEvent.ItemCraftedEvent;
|
||||
import fox.spiteful.forbidden.blocks.ForbiddenBlocks;
|
||||
import fox.spiteful.forbidden.compat.Compat;
|
||||
import fox.spiteful.forbidden.enchantments.DarkEnchantments;
|
||||
import fox.spiteful.forbidden.items.ForbiddenItems;
|
||||
import fox.spiteful.forbidden.items.baubles.ItemSubCollar;
|
||||
import fox.spiteful.forbidden.items.tools.ItemRidingCrop;
|
||||
import fox.spiteful.forbidden.items.tools.ItemTaintPickaxe;
|
||||
import fox.spiteful.forbidden.potions.DarkPotions;
|
||||
|
||||
public class FMEventHandler {
|
||||
|
||||
Random randy = new Random();
|
||||
final Aspect[] primals = {Aspect.ENTROPY, Aspect.ORDER, Aspect.FIRE, Aspect.WATER, Aspect.EARTH, Aspect.AIR};
|
||||
final Aspect[] primals = { Aspect.ENTROPY, Aspect.ORDER, Aspect.FIRE, Aspect.WATER, Aspect.EARTH, Aspect.AIR };
|
||||
HashMap<String, Integer> lastLP = new HashMap<String, Integer>();
|
||||
|
||||
@SubscribeEvent
|
||||
@@ -96,85 +102,72 @@ public class FMEventHandler {
|
||||
}
|
||||
|
||||
if (Config.silverfishEmeralds && event.entityLiving instanceof EntitySilverfish) {
|
||||
if (event.entityLiving.worldObj.getBiomeGenForCoords(
|
||||
(int) event.entityLiving.posX, (int) event.entityLiving.posZ)
|
||||
.biomeID
|
||||
if (event.entityLiving.worldObj
|
||||
.getBiomeGenForCoords((int) event.entityLiving.posX, (int) event.entityLiving.posZ).biomeID
|
||||
== BiomeGenBase.extremeHills.biomeID) {
|
||||
if (event.recentlyHit
|
||||
&& event.source.getEntity() != null
|
||||
if (event.recentlyHit && event.source.getEntity() != null
|
||||
&& event.source.getEntity() instanceof EntityPlayer
|
||||
&& randy.nextInt(30) <= (2 + event.lootingLevel * 2))
|
||||
addDrop(event, new ItemStack(ForbiddenItems.resource, 1, 0));
|
||||
} else if (event.recentlyHit
|
||||
&& event.source.getEntity() != null
|
||||
} else if (event.recentlyHit && event.source.getEntity() != null
|
||||
&& event.source.getEntity() instanceof EntityPlayer
|
||||
&& !(event.source.getEntity() instanceof FakePlayer)
|
||||
&& randy.nextInt(70) <= (1 + event.lootingLevel * 3)) {
|
||||
addDrop(event, new ItemStack(ForbiddenItems.resource, 1, 0));
|
||||
}
|
||||
addDrop(event, new ItemStack(ForbiddenItems.resource, 1, 0));
|
||||
}
|
||||
}
|
||||
|
||||
if (Config.greedyEnch
|
||||
&& (event.entityLiving instanceof EntityVillager || event.entityLiving instanceof IMob)
|
||||
if (Config.greedyEnch && (event.entityLiving instanceof EntityVillager || event.entityLiving instanceof IMob)
|
||||
&& event.recentlyHit
|
||||
&& event.source.getEntity() != null
|
||||
&& event.source.getEntity() instanceof EntityPlayer) {
|
||||
EntityPlayer player = (EntityPlayer) event.source.getEntity();
|
||||
ItemStack equip = player.getCurrentEquippedItem();
|
||||
if (equip != null
|
||||
&& EnchantmentHelper.getEnchantmentLevel(DarkEnchantments.greedy.effectId, equip) > 0
|
||||
if (equip != null && EnchantmentHelper.getEnchantmentLevel(DarkEnchantments.greedy.effectId, equip) > 0
|
||||
&& event.lootingLevel <= 0) {
|
||||
if (event.entityLiving instanceof EntityVillager) addDrop(event, new ItemStack(Items.emerald, 1));
|
||||
else if (randy.nextInt(35) < 3) addDrop(event, new ItemStack(ForbiddenItems.resource, 1, 0));
|
||||
}
|
||||
}
|
||||
|
||||
if (event.entityLiving.getClass() == EntitySkeleton.class
|
||||
&& event.recentlyHit
|
||||
if (event.entityLiving.getClass() == EntitySkeleton.class && event.recentlyHit
|
||||
&& event.source.getEntity() != null
|
||||
&& event.source.getEntity() instanceof EntityPlayer) {
|
||||
ItemStack weap = ((EntityPlayer) event.source.getEntity()).getCurrentEquippedItem();
|
||||
if (weap != null
|
||||
&& weap.getItem() == ForbiddenItems.skullAxe
|
||||
if (weap != null && weap.getItem() == ForbiddenItems.skullAxe
|
||||
&& randy.nextInt(26)
|
||||
<= (3 + EnchantmentHelper.getEnchantmentLevel(Enchantment.looting.effectId, weap))) {
|
||||
addDrop(event, new ItemStack(Items.skull, 1, ((EntitySkeleton) event.entityLiving).getSkeletonType()));
|
||||
}
|
||||
}
|
||||
|
||||
if (event.entityLiving.getClass() == EntityZombie.class
|
||||
&& event.recentlyHit
|
||||
if (event.entityLiving.getClass() == EntityZombie.class && event.recentlyHit
|
||||
&& event.source.getEntity() != null
|
||||
&& event.source.getEntity() instanceof EntityPlayer) {
|
||||
ItemStack weap = ((EntityPlayer) event.source.getEntity()).getCurrentEquippedItem();
|
||||
if (weap != null
|
||||
&& weap.getItem() == ForbiddenItems.skullAxe
|
||||
if (weap != null && weap.getItem() == ForbiddenItems.skullAxe
|
||||
&& randy.nextInt(26)
|
||||
<= (2 + 2 * EnchantmentHelper.getEnchantmentLevel(Enchantment.looting.effectId, weap))) {
|
||||
addDrop(event, new ItemStack(Items.skull, 1, 2));
|
||||
}
|
||||
}
|
||||
|
||||
if (event.entityLiving.getClass() == EntityCreeper.class
|
||||
&& event.recentlyHit
|
||||
if (event.entityLiving.getClass() == EntityCreeper.class && event.recentlyHit
|
||||
&& event.source.getEntity() != null
|
||||
&& event.source.getEntity() instanceof EntityPlayer) {
|
||||
ItemStack weap = ((EntityPlayer) event.source.getEntity()).getCurrentEquippedItem();
|
||||
if (weap != null
|
||||
&& weap.getItem() == ForbiddenItems.skullAxe
|
||||
if (weap != null && weap.getItem() == ForbiddenItems.skullAxe
|
||||
&& randy.nextInt(26)
|
||||
<= (2 + 2 * EnchantmentHelper.getEnchantmentLevel(Enchantment.looting.effectId, weap))) {
|
||||
addDrop(event, new ItemStack(Items.skull, 1, 4));
|
||||
}
|
||||
}
|
||||
|
||||
if (event.entityLiving instanceof EntityPlayer
|
||||
&& event.recentlyHit
|
||||
if (event.entityLiving instanceof EntityPlayer && event.recentlyHit
|
||||
&& event.source.getEntity() != null
|
||||
&& event.source.getEntity() instanceof EntityPlayer) {
|
||||
ItemStack weap = ((EntityPlayer) event.source.getEntity()).getCurrentEquippedItem();
|
||||
if (weap != null
|
||||
&& weap.getItem() == ForbiddenItems.skullAxe
|
||||
if (weap != null && weap.getItem() == ForbiddenItems.skullAxe
|
||||
&& randy.nextInt(11)
|
||||
<= (1 + EnchantmentHelper.getEnchantmentLevel(Enchantment.looting.effectId, weap))) {
|
||||
ItemStack head = new ItemStack(Items.skull, 1, 3);
|
||||
@@ -187,8 +180,7 @@ public class FMEventHandler {
|
||||
|
||||
if (event.entityLiving.worldObj.provider.dimensionId != -1) return;
|
||||
|
||||
if (!event.recentlyHit
|
||||
|| event.source.getEntity() == null
|
||||
if (!event.recentlyHit || event.source.getEntity() == null
|
||||
|| !(event.source.getEntity() instanceof EntityPlayer)
|
||||
|| event.source.getEntity() instanceof FakePlayer) {
|
||||
if (randy.nextInt(30) < 4) {
|
||||
@@ -196,8 +188,7 @@ public class FMEventHandler {
|
||||
}
|
||||
}
|
||||
|
||||
if (event.recentlyHit
|
||||
&& event.source.getEntity() != null
|
||||
if (event.recentlyHit && event.source.getEntity() != null
|
||||
&& event.source.getEntity() instanceof EntityPlayer
|
||||
&& !(event.source.getEntity() instanceof FakePlayer)) {
|
||||
if (event.entityLiving instanceof IMob) {
|
||||
@@ -207,8 +198,8 @@ public class FMEventHandler {
|
||||
if (heldItem != null) {
|
||||
if (heldItem.getItem() instanceof ItemTool) {
|
||||
Multimap map = heldItem.getItem().getAttributeModifiers(heldItem);
|
||||
Collection collect =
|
||||
map.get(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName());
|
||||
Collection collect = map
|
||||
.get(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName());
|
||||
if (collect instanceof AttributeModifier) {
|
||||
wrath += (int) ((AttributeModifier) collect).getAmount();
|
||||
}
|
||||
@@ -278,8 +269,7 @@ public class FMEventHandler {
|
||||
|
||||
@SubscribeEvent
|
||||
public void onDeath(LivingDeathEvent event) {
|
||||
if (event.source.getEntity() != null
|
||||
&& event.source.getEntity() instanceof EntityPlayer
|
||||
if (event.source.getEntity() != null && event.source.getEntity() instanceof EntityPlayer
|
||||
&& ((EntityPlayer) event.source.getEntity()).getCurrentEquippedItem() != null) {
|
||||
ItemStack equip = ((EntityPlayer) event.source.getEntity()).getCurrentEquippedItem();
|
||||
if (equip.getItem() == ForbiddenItems.fork) {
|
||||
@@ -305,18 +295,18 @@ public class FMEventHandler {
|
||||
&& event.entityLiving instanceof EntityLiving
|
||||
&& EnchantmentHelper.getEnchantmentLevel(Enchantment.looting.effectId, equip) == 0) {
|
||||
try {
|
||||
int learning = 3
|
||||
* XPReflectionHelper.getXP(((EntityLiving) event.entityLiving))
|
||||
int learning = 3 * XPReflectionHelper.getXP(((EntityLiving) event.entityLiving))
|
||||
* EnchantmentHelper.getEnchantmentLevel(DarkEnchantments.educational.effectId, equip);
|
||||
while (learning > 0) {
|
||||
int xp = EntityXPOrb.getXPSplit(learning);
|
||||
learning -= xp;
|
||||
event.entityLiving.worldObj.spawnEntityInWorld(new EntityXPOrb(
|
||||
event.entityLiving.worldObj,
|
||||
event.entityLiving.posX,
|
||||
event.entityLiving.posY,
|
||||
event.entityLiving.posZ,
|
||||
xp));
|
||||
event.entityLiving.worldObj.spawnEntityInWorld(
|
||||
new EntityXPOrb(
|
||||
event.entityLiving.worldObj,
|
||||
event.entityLiving.posX,
|
||||
event.entityLiving.posY,
|
||||
event.entityLiving.posZ,
|
||||
xp));
|
||||
}
|
||||
} catch (Throwable e) {
|
||||
LogHandler.log(Level.ERROR, "Failed to educate!");
|
||||
@@ -328,8 +318,7 @@ public class FMEventHandler {
|
||||
public void imprintCrystal(EntityPlayer player, String mob) {
|
||||
for (int x = 0; x < player.inventory.getSizeInventory(); ++x) {
|
||||
ItemStack item = player.inventory.getStackInSlot(x);
|
||||
if (item != null
|
||||
&& item.getItem() == ForbiddenItems.mobCrystal
|
||||
if (item != null && item.getItem() == ForbiddenItems.mobCrystal
|
||||
&& (!item.hasTagCompound() || !item.getTagCompound().hasKey("mob"))) {
|
||||
if (!item.hasTagCompound()) item.setTagCompound(new NBTTagCompound());
|
||||
item.stackTagCompound.setString("mob", mob);
|
||||
@@ -435,8 +424,8 @@ public class FMEventHandler {
|
||||
if (event.entityPlayer.worldObj.provider.dimensionId == -1
|
||||
&& event.item.getItem() != ForbiddenItems.gluttonyShard
|
||||
&& randy.nextInt(10) < 2) {
|
||||
EntityItem ent =
|
||||
event.entityPlayer.entityDropItem(new ItemStack(ForbiddenItems.gluttonyShard, 1), 1.0F);
|
||||
EntityItem ent = event.entityPlayer
|
||||
.entityDropItem(new ItemStack(ForbiddenItems.gluttonyShard, 1), 1.0F);
|
||||
ent.motionY += randy.nextFloat() * 0.05F;
|
||||
ent.motionX += (randy.nextFloat() - randy.nextFloat()) * 0.1F;
|
||||
ent.motionZ += (randy.nextFloat() - randy.nextFloat()) * 0.1F;
|
||||
@@ -470,8 +459,7 @@ public class FMEventHandler {
|
||||
|
||||
@SubscribeEvent
|
||||
public void onSpawn(LivingSpawnEvent event) {
|
||||
if (event.entityLiving.worldObj.provider.dimensionId == -1
|
||||
&& event.entityLiving instanceof EntityPigZombie
|
||||
if (event.entityLiving.worldObj.provider.dimensionId == -1 && event.entityLiving instanceof EntityPigZombie
|
||||
&& randy.nextInt(175) == 1)
|
||||
event.entityLiving.setCurrentItemOrArmor(0, new ItemStack(ForbiddenItems.deadlyShards, 1, 1));
|
||||
}
|
||||
@@ -502,10 +490,7 @@ public class FMEventHandler {
|
||||
ItemStack equip = ((EntityPlayer) event.source.getEntity()).getCurrentEquippedItem();
|
||||
if (equip != null && equip.getItem() instanceof ItemWandCasting) {
|
||||
if (((ItemWandCasting) equip.getItem()).getCap(equip).getTag().equals("alchemical")
|
||||
&& ((ItemWandCasting) equip.getItem())
|
||||
.getRod(equip)
|
||||
.getTag()
|
||||
.startsWith("blood")) {
|
||||
&& ((ItemWandCasting) equip.getItem()).getRod(equip).getTag().startsWith("blood")) {
|
||||
event.entityLiving.addPotionEffect(new PotionEffect(Potion.weakness.id, 60, 2));
|
||||
}
|
||||
}
|
||||
@@ -543,32 +528,25 @@ public class FMEventHandler {
|
||||
@SubscribeEvent
|
||||
public void onTooltip(ItemTooltipEvent event) {
|
||||
if (event.itemStack.getItem() instanceof ItemWandCasting) {
|
||||
if (((ItemWandCasting) event.itemStack.getItem())
|
||||
.getRod(event.itemStack)
|
||||
.getTag()
|
||||
.startsWith("blood")
|
||||
if (((ItemWandCasting) event.itemStack.getItem()).getRod(event.itemStack).getTag().startsWith("blood")
|
||||
&& !event.itemStack.stackTagCompound.getString("ownerName").equals("")) {
|
||||
event.toolTip.add(StatCollector.translateToLocal("tooltip.currentowner") + " "
|
||||
+ event.itemStack.stackTagCompound.getString("ownerName"));
|
||||
} else if (((ItemWandCasting) event.itemStack.getItem())
|
||||
.getRod(event.itemStack)
|
||||
.getTag()
|
||||
.startsWith("neutronium")) {
|
||||
event.toolTip.add(StatCollector.translateToLocal("tooltip.creativeonly"));
|
||||
} else if (((ItemWandCasting) event.itemStack.getItem())
|
||||
.getRod(event.itemStack)
|
||||
.getTag()
|
||||
.startsWith("profane")) {
|
||||
event.toolTip.add(
|
||||
"Contract: " + event.itemStack.getTagCompound().getInteger("contract"));
|
||||
}
|
||||
StatCollector.translateToLocal("tooltip.currentowner") + " "
|
||||
+ event.itemStack.stackTagCompound.getString("ownerName"));
|
||||
} else if (((ItemWandCasting) event.itemStack.getItem()).getRod(event.itemStack).getTag()
|
||||
.startsWith("neutronium")) {
|
||||
event.toolTip.add(StatCollector.translateToLocal("tooltip.creativeonly"));
|
||||
} else
|
||||
if (((ItemWandCasting) event.itemStack.getItem()).getRod(event.itemStack).getTag()
|
||||
.startsWith("profane")) {
|
||||
event.toolTip.add("Contract: " + event.itemStack.getTagCompound().getInteger("contract"));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public void onEntityUpdate(LivingUpdateEvent event) {
|
||||
if (Compat.bm
|
||||
&& event.entityLiving != null
|
||||
if (Compat.bm && event.entityLiving != null
|
||||
&& event.entityLiving instanceof EntityPlayer
|
||||
&& !event.entityLiving.worldObj.isRemote) {
|
||||
EntityPlayer player = (EntityPlayer) event.entityLiving;
|
||||
|
||||
@@ -1,5 +1,11 @@
|
||||
package fox.spiteful.forbidden;
|
||||
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
|
||||
import thaumcraft.api.wands.WandTriggerRegistry;
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
import cpw.mods.fml.common.Mod;
|
||||
import cpw.mods.fml.common.Mod.EventHandler;
|
||||
@@ -14,11 +20,6 @@ import fox.spiteful.forbidden.compat.Compat;
|
||||
import fox.spiteful.forbidden.enchantments.DarkEnchantments;
|
||||
import fox.spiteful.forbidden.items.ForbiddenItems;
|
||||
import fox.spiteful.forbidden.potions.DarkPotions;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import thaumcraft.api.wands.WandTriggerRegistry;
|
||||
|
||||
@Mod(
|
||||
modid = "ForbiddenMagic",
|
||||
@@ -26,10 +27,12 @@ import thaumcraft.api.wands.WandTriggerRegistry;
|
||||
version = "GRADLETOKEN_VERSION",
|
||||
dependencies = "required-after:Thaumcraft@[4.2.2.0,);after:ThaumicTinkerer;after:AWWayofTime;after:Botania")
|
||||
public class Forbidden {
|
||||
|
||||
@Instance("ForbiddenMagic")
|
||||
public static Forbidden instance;
|
||||
|
||||
public static CreativeTabs tab = new CreativeTabs("forbidden") {
|
||||
|
||||
@Override
|
||||
public Item getTabIconItem() {
|
||||
return ForbiddenItems.fork;
|
||||
@@ -49,13 +52,13 @@ public class Forbidden {
|
||||
public void prelude(FMLPreInitializationEvent event) {
|
||||
instance = this;
|
||||
Config.configurate(event.getSuggestedConfigurationFile());
|
||||
if (Config.wrathCage)
|
||||
crysTab = new CreativeTabs("mobcrystal") {
|
||||
@Override
|
||||
public Item getTabIconItem() {
|
||||
return ForbiddenItems.mobCrystal;
|
||||
}
|
||||
};
|
||||
if (Config.wrathCage) crysTab = new CreativeTabs("mobcrystal") {
|
||||
|
||||
@Override
|
||||
public Item getTabIconItem() {
|
||||
return ForbiddenItems.mobCrystal;
|
||||
}
|
||||
};
|
||||
Compat.initiate();
|
||||
DarkAspects.initAspects();
|
||||
Config.spawnilify();
|
||||
|
||||
@@ -1,24 +1,27 @@
|
||||
package fox.spiteful.forbidden;
|
||||
|
||||
import cpw.mods.fml.common.IFuelHandler;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import fox.spiteful.forbidden.blocks.ForbiddenBlocks;
|
||||
import fox.spiteful.forbidden.enchantments.DarkEnchantments;
|
||||
import fox.spiteful.forbidden.items.ForbiddenItems;
|
||||
import java.util.Random;
|
||||
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.crafting.CraftingManager;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
|
||||
import thaumcraft.api.ItemApi;
|
||||
import thaumcraft.api.ThaumcraftApi;
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.api.aspects.AspectList;
|
||||
import thaumcraft.common.config.ConfigBlocks;
|
||||
import thaumcraft.common.config.ConfigItems;
|
||||
import cpw.mods.fml.common.IFuelHandler;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import fox.spiteful.forbidden.blocks.ForbiddenBlocks;
|
||||
import fox.spiteful.forbidden.enchantments.DarkEnchantments;
|
||||
import fox.spiteful.forbidden.items.ForbiddenItems;
|
||||
|
||||
public class ForbiddenRecipes {
|
||||
|
||||
public static void addRecipes() {
|
||||
ForbiddenResearch.recipes.put(
|
||||
"TaintShovel",
|
||||
@@ -26,54 +29,37 @@ public class ForbiddenRecipes {
|
||||
"TAINTSHOVEL",
|
||||
new ItemStack(ForbiddenItems.taintShovel),
|
||||
5,
|
||||
(new AspectList())
|
||||
.add(Aspect.HEAL, 8)
|
||||
.add(Aspect.CRYSTAL, 24)
|
||||
.add(Aspect.MINE, 12),
|
||||
(new AspectList()).add(Aspect.HEAL, 8).add(Aspect.CRYSTAL, 24).add(Aspect.MINE, 12),
|
||||
ItemApi.getItem("itemShovelThaumium", 0),
|
||||
new ItemStack[] {
|
||||
ItemApi.getItem("itemShard", 4),
|
||||
new ItemStack(ConfigItems.itemResource, 1, 6),
|
||||
new ItemStack(Items.diamond),
|
||||
ItemApi.getBlock("blockMagicalLog", 1)
|
||||
}));
|
||||
new ItemStack[] { ItemApi.getItem("itemShard", 4),
|
||||
new ItemStack(ConfigItems.itemResource, 1, 6), new ItemStack(Items.diamond),
|
||||
ItemApi.getBlock("blockMagicalLog", 1) }));
|
||||
ForbiddenResearch.recipes.put(
|
||||
"TaintPick",
|
||||
ThaumcraftApi.addInfusionCraftingRecipe(
|
||||
"TAINTPICK",
|
||||
new ItemStack(ForbiddenItems.taintPickaxe),
|
||||
1,
|
||||
(new AspectList())
|
||||
.add(Aspect.ENTROPY, 8)
|
||||
.add(Aspect.MINE, 8)
|
||||
.add(Aspect.TAINT, 12),
|
||||
(new AspectList()).add(Aspect.ENTROPY, 8).add(Aspect.MINE, 8).add(Aspect.TAINT, 12),
|
||||
ItemApi.getItem("itemPickThaumium", 0),
|
||||
new ItemStack[] {
|
||||
ItemApi.getItem("itemShard", 5),
|
||||
new ItemStack(ForbiddenItems.deadlyShards, 1, 2),
|
||||
new ItemStack(Items.diamond),
|
||||
ItemApi.getBlock("blockMagicalLog", 0)
|
||||
}));
|
||||
new ItemStack[] { ItemApi.getItem("itemShard", 5),
|
||||
new ItemStack(ForbiddenItems.deadlyShards, 1, 2), new ItemStack(Items.diamond),
|
||||
ItemApi.getBlock("blockMagicalLog", 0) }));
|
||||
ForbiddenResearch.recipes.put(
|
||||
"WandRodTainted",
|
||||
ThaumcraftApi.addInfusionCraftingRecipe(
|
||||
"ROD_tainted",
|
||||
new ItemStack(ForbiddenItems.wandCore, 1, 0),
|
||||
5,
|
||||
(new AspectList())
|
||||
.add(Aspect.TAINT, 24)
|
||||
.add(Aspect.MAGIC, 12)
|
||||
.add(Aspect.ENTROPY, 12),
|
||||
(new AspectList()).add(Aspect.TAINT, 24).add(Aspect.MAGIC, 12).add(Aspect.ENTROPY, 12),
|
||||
ItemApi.getItem("itemResource", 12),
|
||||
new ItemStack[] {
|
||||
ItemApi.getItem("itemResource", 14),
|
||||
new ItemStack(ForbiddenItems.deadlyShards, 1, 2),
|
||||
new ItemStack(ForbiddenItems.deadlyShards, 1, 2),
|
||||
new ItemStack(ForbiddenItems.deadlyShards, 1, 2),
|
||||
new ItemStack(ForbiddenItems.deadlyShards, 1, 2),
|
||||
new ItemStack(ForbiddenItems.deadlyShards, 1, 2),
|
||||
new ItemStack(ForbiddenItems.deadlyShards, 1, 2)
|
||||
}));
|
||||
new ItemStack[] { ItemApi.getItem("itemResource", 14),
|
||||
new ItemStack(ForbiddenItems.deadlyShards, 1, 2),
|
||||
new ItemStack(ForbiddenItems.deadlyShards, 1, 2),
|
||||
new ItemStack(ForbiddenItems.deadlyShards, 1, 2),
|
||||
new ItemStack(ForbiddenItems.deadlyShards, 1, 2),
|
||||
new ItemStack(ForbiddenItems.deadlyShards, 1, 2),
|
||||
new ItemStack(ForbiddenItems.deadlyShards, 1, 2) }));
|
||||
ForbiddenResearch.recipes.put(
|
||||
"TaintTree",
|
||||
ThaumcraftApi.addCrucibleRecipe(
|
||||
@@ -83,9 +69,9 @@ public class ForbiddenRecipes {
|
||||
(new AspectList()).merge(Aspect.TAINT, 10).add(Aspect.POISON, 4)));
|
||||
ForbiddenResearch.recipes.put(
|
||||
"TaintPlank",
|
||||
CraftingManager.getInstance().addRecipe(new ItemStack(ForbiddenBlocks.taintPlanks, 4, 0), new Object[] {
|
||||
"#", Character.valueOf('#'), new ItemStack(ForbiddenBlocks.taintLog, 1, 0)
|
||||
}));
|
||||
CraftingManager.getInstance().addRecipe(
|
||||
new ItemStack(ForbiddenBlocks.taintPlanks, 4, 0),
|
||||
new Object[] { "#", Character.valueOf('#'), new ItemStack(ForbiddenBlocks.taintLog, 1, 0) }));
|
||||
GameRegistry.addSmelting(ForbiddenBlocks.taintLog, new ItemStack(ForbiddenItems.taintCoal, 1), 0.15F);
|
||||
OreDictionary.registerOre("resourceTaint", new ItemStack(ConfigItems.itemResource, 1, 11));
|
||||
OreDictionary.registerOre("resourceTaint", new ItemStack(ForbiddenItems.deadlyShards, 1, 2));
|
||||
@@ -95,20 +81,14 @@ public class ForbiddenRecipes {
|
||||
"TAINTSTONE",
|
||||
new ItemStack(ForbiddenBlocks.taintStone, 9, 0),
|
||||
(new AspectList()).add(Aspect.ENTROPY, 2).add(Aspect.ORDER, 1),
|
||||
new Object[] {
|
||||
"SSS",
|
||||
"SXS",
|
||||
"SSS",
|
||||
Character.valueOf('S'),
|
||||
new ItemStack(Blocks.stone, 1),
|
||||
Character.valueOf('X'),
|
||||
"resourceTaint"
|
||||
}));
|
||||
new Object[] { "SSS", "SXS", "SSS", Character.valueOf('S'), new ItemStack(Blocks.stone, 1),
|
||||
Character.valueOf('X'), "resourceTaint" }));
|
||||
ForbiddenResearch.recipes.put(
|
||||
"TaintBrick",
|
||||
CraftingManager.getInstance().addRecipe(new ItemStack(ForbiddenBlocks.taintStone, 4, 1), new Object[] {
|
||||
"##", "##", Character.valueOf('#'), new ItemStack(ForbiddenBlocks.taintStone, 1, 0)
|
||||
}));
|
||||
CraftingManager.getInstance().addRecipe(
|
||||
new ItemStack(ForbiddenBlocks.taintStone, 4, 1),
|
||||
new Object[] { "##", "##", Character.valueOf('#'),
|
||||
new ItemStack(ForbiddenBlocks.taintStone, 1, 0) }));
|
||||
|
||||
ForbiddenResearch.recipes.put(
|
||||
"SkullAxe",
|
||||
@@ -116,37 +96,24 @@ public class ForbiddenRecipes {
|
||||
"SKULLAXE",
|
||||
new ItemStack(ForbiddenItems.skullAxe),
|
||||
1,
|
||||
(new AspectList())
|
||||
.add(DarkAspects.WRATH, 8)
|
||||
.add(Aspect.WEAPON, 8)
|
||||
.add(DarkAspects.NETHER, 8),
|
||||
(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),
|
||||
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[] { 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),
|
||||
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(ForbiddenItems.deadlyShards, 1, 4),
|
||||
new ItemStack(Items.lead, 1),
|
||||
new ItemStack(ConfigItems.itemBaubleBlanks, 1, 2)
|
||||
}));
|
||||
new ItemStack(ForbiddenItems.deadlyShards, 1, 4), new ItemStack(Items.lead, 1),
|
||||
new ItemStack(ConfigItems.itemBaubleBlanks, 1, 2) }));
|
||||
if (Config.gluttony == 0) {
|
||||
ForbiddenResearch.recipes.put(
|
||||
"ArcaneCake",
|
||||
@@ -154,39 +121,23 @@ public class ForbiddenRecipes {
|
||||
"ARCANECAKE",
|
||||
new ItemStack(ForbiddenItems.arcaneCakeItem),
|
||||
3,
|
||||
(new AspectList())
|
||||
.add(DarkAspects.GLUTTONY, 12)
|
||||
.add(Aspect.HUNGER, 24)
|
||||
(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(ForbiddenItems.gluttonyShard),
|
||||
new ItemStack(ForbiddenItems.gluttonyShard)
|
||||
}));
|
||||
new ItemStack[] { ItemApi.getItem("itemResource", 14), new ItemStack(Items.egg),
|
||||
new ItemStack(Items.milk_bucket), new ItemStack(Items.egg),
|
||||
new ItemStack(ForbiddenItems.gluttonyShard),
|
||||
new ItemStack(ForbiddenItems.gluttonyShard) }));
|
||||
ForbiddenResearch.recipes.put(
|
||||
"RingFood",
|
||||
ThaumcraftApi.addArcaneCraftingRecipe(
|
||||
"RINGFOOD",
|
||||
new ItemStack(ForbiddenItems.ringFood),
|
||||
(new AspectList())
|
||||
.add(Aspect.ENTROPY, 10)
|
||||
.add(Aspect.WATER, 20)
|
||||
.add(Aspect.EARTH, 20),
|
||||
new Object[] {
|
||||
" D ",
|
||||
"SXS",
|
||||
" S ",
|
||||
Character.valueOf('S'),
|
||||
new ItemStack(ForbiddenItems.gluttonyShard, 1),
|
||||
Character.valueOf('X'),
|
||||
new ItemStack(ConfigItems.itemBaubleBlanks, 1, 1),
|
||||
Character.valueOf('D'),
|
||||
new ItemStack(Items.diamond)
|
||||
}));
|
||||
(new AspectList()).add(Aspect.ENTROPY, 10).add(Aspect.WATER, 20).add(Aspect.EARTH, 20),
|
||||
new Object[] { " D ", "SXS", " S ", Character.valueOf('S'),
|
||||
new ItemStack(ForbiddenItems.gluttonyShard, 1), Character.valueOf('X'),
|
||||
new ItemStack(ConfigItems.itemBaubleBlanks, 1, 1), Character.valueOf('D'),
|
||||
new ItemStack(Items.diamond) }));
|
||||
} else if (Config.gluttony == 2) {
|
||||
ForbiddenResearch.recipes.put(
|
||||
"ArcaneCake",
|
||||
@@ -194,39 +145,23 @@ public class ForbiddenRecipes {
|
||||
"ARCANECAKE",
|
||||
new ItemStack(ForbiddenItems.arcaneCakeItem),
|
||||
3,
|
||||
(new AspectList())
|
||||
.add(DarkAspects.GLUTTONY, 12)
|
||||
.add(Aspect.HUNGER, 24)
|
||||
(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(ForbiddenBlocks.starBlock),
|
||||
new ItemStack(ForbiddenBlocks.starBlock),
|
||||
new ItemStack(Items.egg),
|
||||
new ItemStack(ForbiddenItems.gluttonyShard),
|
||||
new ItemStack(ForbiddenItems.gluttonyShard)
|
||||
}));
|
||||
new ItemStack[] { ItemApi.getItem("itemResource", 14),
|
||||
new ItemStack(ForbiddenBlocks.starBlock), new ItemStack(ForbiddenBlocks.starBlock),
|
||||
new ItemStack(Items.egg), new ItemStack(ForbiddenItems.gluttonyShard),
|
||||
new ItemStack(ForbiddenItems.gluttonyShard) }));
|
||||
ForbiddenResearch.recipes.put(
|
||||
"RingFood",
|
||||
ThaumcraftApi.addArcaneCraftingRecipe(
|
||||
"RINGFOOD",
|
||||
new ItemStack(ForbiddenItems.ringFood),
|
||||
(new AspectList())
|
||||
.add(Aspect.ENTROPY, 10)
|
||||
.add(Aspect.WATER, 20)
|
||||
.add(Aspect.EARTH, 20),
|
||||
new Object[] {
|
||||
" D ",
|
||||
"SXS",
|
||||
" S ",
|
||||
Character.valueOf('S'),
|
||||
new ItemStack(ForbiddenItems.gluttonyShard, 1),
|
||||
Character.valueOf('X'),
|
||||
new ItemStack(ConfigItems.itemBaubleBlanks, 1, 1),
|
||||
Character.valueOf('D'),
|
||||
new ItemStack(ForbiddenBlocks.starBlock)
|
||||
}));
|
||||
(new AspectList()).add(Aspect.ENTROPY, 10).add(Aspect.WATER, 20).add(Aspect.EARTH, 20),
|
||||
new Object[] { " D ", "SXS", " S ", Character.valueOf('S'),
|
||||
new ItemStack(ForbiddenItems.gluttonyShard, 1), Character.valueOf('X'),
|
||||
new ItemStack(ConfigItems.itemBaubleBlanks, 1, 1), Character.valueOf('D'),
|
||||
new ItemStack(ForbiddenBlocks.starBlock) }));
|
||||
}
|
||||
ForbiddenResearch.recipes.put(
|
||||
"FocusBlink",
|
||||
@@ -234,112 +169,69 @@ public class ForbiddenRecipes {
|
||||
"FOCUSBLINK",
|
||||
new ItemStack(ForbiddenItems.blinkFocus),
|
||||
3,
|
||||
(new AspectList())
|
||||
.add(Aspect.TRAVEL, 25)
|
||||
.add(DarkAspects.NETHER, 10)
|
||||
.add(DarkAspects.SLOTH, 10)
|
||||
(new AspectList()).add(Aspect.TRAVEL, 25).add(DarkAspects.NETHER, 10).add(DarkAspects.SLOTH, 10)
|
||||
.add(Aspect.ENTROPY, 25),
|
||||
new ItemStack(Items.ender_pearl),
|
||||
new ItemStack[] {
|
||||
new ItemStack(Items.quartz),
|
||||
new ItemStack(ForbiddenItems.deadlyShards, 1, 5),
|
||||
new ItemStack(Items.quartz),
|
||||
new ItemStack(ForbiddenItems.deadlyShards, 1, 5),
|
||||
new ItemStack(Items.quartz),
|
||||
new ItemStack(ForbiddenItems.deadlyShards, 1, 5)
|
||||
}));
|
||||
new ItemStack[] { new ItemStack(Items.quartz), new ItemStack(ForbiddenItems.deadlyShards, 1, 5),
|
||||
new ItemStack(Items.quartz), new ItemStack(ForbiddenItems.deadlyShards, 1, 5),
|
||||
new ItemStack(Items.quartz), new ItemStack(ForbiddenItems.deadlyShards, 1, 5) }));
|
||||
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),
|
||||
(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)
|
||||
}));
|
||||
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),
|
||||
(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)
|
||||
}));
|
||||
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(
|
||||
"MorphShovel",
|
||||
ThaumcraftApi.addInfusionCraftingRecipe(
|
||||
"MORPHTOOLS",
|
||||
new ItemStack(ForbiddenItems.morphShovel),
|
||||
6,
|
||||
(new AspectList())
|
||||
.add(Aspect.EXCHANGE, 32)
|
||||
.add(DarkAspects.ENVY, 16)
|
||||
.add(Aspect.TOOL, 16),
|
||||
(new AspectList()).add(Aspect.EXCHANGE, 32).add(DarkAspects.ENVY, 16).add(Aspect.TOOL, 16),
|
||||
ItemApi.getItem("itemShovelThaumium", 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)
|
||||
}));
|
||||
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(
|
||||
"MorphAxe",
|
||||
ThaumcraftApi.addInfusionCraftingRecipe(
|
||||
"MORPHTOOLS",
|
||||
new ItemStack(ForbiddenItems.morphAxe),
|
||||
6,
|
||||
(new AspectList())
|
||||
.add(Aspect.EXCHANGE, 32)
|
||||
.add(DarkAspects.ENVY, 16)
|
||||
.add(Aspect.TOOL, 16),
|
||||
(new AspectList()).add(Aspect.EXCHANGE, 32).add(DarkAspects.ENVY, 16).add(Aspect.TOOL, 16),
|
||||
ItemApi.getItem("itemAxeThaumium", 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)
|
||||
}));
|
||||
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(
|
||||
"WandRodInfernal",
|
||||
ThaumcraftApi.addInfusionCraftingRecipe(
|
||||
"ROD_infernal",
|
||||
new ItemStack(ForbiddenItems.wandCore, 1, 1),
|
||||
5,
|
||||
(new AspectList())
|
||||
.add(DarkAspects.NETHER, 32)
|
||||
.add(Aspect.MAGIC, 12)
|
||||
.add(DarkAspects.PRIDE, 12),
|
||||
(new AspectList()).add(DarkAspects.NETHER, 32).add(Aspect.MAGIC, 12).add(DarkAspects.PRIDE, 12),
|
||||
new ItemStack(Items.blaze_rod),
|
||||
new ItemStack[] {
|
||||
ItemApi.getItem("itemResource", 14),
|
||||
new ItemStack(ForbiddenItems.deadlyShards, 1, 3),
|
||||
new ItemStack(ForbiddenItems.deadlyShards, 1, 3),
|
||||
new ItemStack(Blocks.soul_sand),
|
||||
new ItemStack(Items.skull, 1, 1),
|
||||
new ItemStack(Items.quartz),
|
||||
new ItemStack(Items.blaze_powder)
|
||||
}));
|
||||
new ItemStack[] { ItemApi.getItem("itemResource", 14),
|
||||
new ItemStack(ForbiddenItems.deadlyShards, 1, 3),
|
||||
new ItemStack(ForbiddenItems.deadlyShards, 1, 3), new ItemStack(Blocks.soul_sand),
|
||||
new ItemStack(Items.skull, 1, 1), new ItemStack(Items.quartz),
|
||||
new ItemStack(Items.blaze_powder) }));
|
||||
if (Config.wrathCage) {
|
||||
ForbiddenResearch.recipes.put(
|
||||
"WrathCage",
|
||||
@@ -347,25 +239,17 @@ public class ForbiddenRecipes {
|
||||
"WRATHCAGE",
|
||||
new ItemStack(ForbiddenBlocks.wrathCage, 1, 0),
|
||||
10,
|
||||
(new AspectList())
|
||||
.add(DarkAspects.WRATH, 32)
|
||||
.add(Aspect.MAGIC, 32)
|
||||
.add(Aspect.BEAST, 32)
|
||||
(new AspectList()).add(DarkAspects.WRATH, 32).add(Aspect.MAGIC, 32).add(Aspect.BEAST, 32)
|
||||
.add(Aspect.MECHANISM, 16),
|
||||
ItemApi.getBlock("blockCosmeticSolid", 4),
|
||||
new ItemStack[] {
|
||||
new ItemStack(ForbiddenItems.deadlyShards, 1, 0),
|
||||
new ItemStack(ForbiddenItems.deadlyShards, 1, 0),
|
||||
new ItemStack(ForbiddenItems.deadlyShards, 1, 0),
|
||||
new ItemStack(ForbiddenItems.deadlyShards, 1, 0),
|
||||
new ItemStack(Items.diamond, 1, 0),
|
||||
new ItemStack(Items.diamond, 1, 0),
|
||||
new ItemStack(Items.diamond, 1, 0),
|
||||
new ItemStack(Items.diamond, 1, 0),
|
||||
ItemApi.getBlock("blockJar", 0),
|
||||
ItemApi.getBlock("blockJar", 0),
|
||||
ItemApi.getBlock("blockJar", 0)
|
||||
}));
|
||||
new ItemStack[] { new ItemStack(ForbiddenItems.deadlyShards, 1, 0),
|
||||
new ItemStack(ForbiddenItems.deadlyShards, 1, 0),
|
||||
new ItemStack(ForbiddenItems.deadlyShards, 1, 0),
|
||||
new ItemStack(ForbiddenItems.deadlyShards, 1, 0),
|
||||
new ItemStack(Items.diamond, 1, 0), new ItemStack(Items.diamond, 1, 0),
|
||||
new ItemStack(Items.diamond, 1, 0), new ItemStack(Items.diamond, 1, 0),
|
||||
ItemApi.getBlock("blockJar", 0), ItemApi.getBlock("blockJar", 0),
|
||||
ItemApi.getBlock("blockJar", 0) }));
|
||||
ForbiddenResearch.recipes.put(
|
||||
"MobCrystal",
|
||||
ThaumcraftApi.addCrucibleRecipe(
|
||||
@@ -381,26 +265,18 @@ public class ForbiddenRecipes {
|
||||
"FORK",
|
||||
new ItemStack(ForbiddenItems.fork, 1, 0),
|
||||
1,
|
||||
(new AspectList())
|
||||
.add(DarkAspects.NETHER, 8)
|
||||
.add(Aspect.MECHANISM, 8)
|
||||
.add(Aspect.ENERGY, 8),
|
||||
(new AspectList()).add(DarkAspects.NETHER, 8).add(Aspect.MECHANISM, 8).add(Aspect.ENERGY, 8),
|
||||
ItemApi.getItem("itemSwordThaumium", 0),
|
||||
new ItemStack[] {
|
||||
new ItemStack(Items.quartz),
|
||||
new ItemStack(Items.quartz),
|
||||
new ItemStack(Items.quartz),
|
||||
new ItemStack(Items.redstone)
|
||||
}));
|
||||
new ItemStack[] { new ItemStack(Items.quartz), new ItemStack(Items.quartz),
|
||||
new ItemStack(Items.quartz), new ItemStack(Items.redstone) }));
|
||||
|
||||
if (Config.emeraldTrans)
|
||||
ForbiddenResearch.recipes.put(
|
||||
"TransEmerald",
|
||||
ThaumcraftApi.addCrucibleRecipe(
|
||||
"TRANSEMERALD",
|
||||
new ItemStack(ForbiddenItems.resource, 4, 0),
|
||||
"nuggetEmerald",
|
||||
(new AspectList()).merge(Aspect.CRYSTAL, 2).merge(Aspect.GREED, 2)));
|
||||
if (Config.emeraldTrans) ForbiddenResearch.recipes.put(
|
||||
"TransEmerald",
|
||||
ThaumcraftApi.addCrucibleRecipe(
|
||||
"TRANSEMERALD",
|
||||
new ItemStack(ForbiddenItems.resource, 4, 0),
|
||||
"nuggetEmerald",
|
||||
(new AspectList()).merge(Aspect.CRYSTAL, 2).merge(Aspect.GREED, 2)));
|
||||
ForbiddenResearch.recipes.put(
|
||||
"BlackFlower",
|
||||
ThaumcraftApi.addCrucibleRecipe(
|
||||
@@ -410,138 +286,95 @@ public class ForbiddenRecipes {
|
||||
(new AspectList()).merge(Aspect.DARKNESS, 8).merge(Aspect.LIFE, 5)));
|
||||
ForbiddenResearch.recipes.put(
|
||||
"BlackInk",
|
||||
CraftingManager.getInstance().addRecipe(new ItemStack(ForbiddenItems.resource, 2, 1), new Object[] {
|
||||
"#", Character.valueOf('#'), new ItemStack(ForbiddenBlocks.blackFlower, 1, 0)
|
||||
}));
|
||||
CraftingManager.getInstance().addRecipe(
|
||||
new ItemStack(ForbiddenItems.resource, 2, 1),
|
||||
new Object[] { "#", Character.valueOf('#'),
|
||||
new ItemStack(ForbiddenBlocks.blackFlower, 1, 0) }));
|
||||
|
||||
if (thaumcraft.common.config.Config.researchDifficulty == -1)
|
||||
ForbiddenResearch.recipes.put(
|
||||
"Crystalwell",
|
||||
ThaumcraftApi.addShapelessArcaneCraftingRecipe(
|
||||
"CRYSTALWELL",
|
||||
new ItemStack(ForbiddenItems.crystalwell, 1, 0),
|
||||
(new AspectList()).add(Aspect.WATER, 1).add(Aspect.ORDER, 1),
|
||||
new Object[] {
|
||||
new ItemStack(ConfigItems.itemInkwell, 1, 32767),
|
||||
"dyeBlack",
|
||||
if (thaumcraft.common.config.Config.researchDifficulty == -1) ForbiddenResearch.recipes.put(
|
||||
"Crystalwell",
|
||||
ThaumcraftApi.addShapelessArcaneCraftingRecipe(
|
||||
"CRYSTALWELL",
|
||||
new ItemStack(ForbiddenItems.crystalwell, 1, 0),
|
||||
(new AspectList()).add(Aspect.WATER, 1).add(Aspect.ORDER, 1),
|
||||
new Object[] { new ItemStack(ConfigItems.itemInkwell, 1, 32767), "dyeBlack",
|
||||
new ItemStack(ConfigItems.itemShard, 1, 6),
|
||||
new ItemStack(ConfigItems.itemShard, 1, 6)
|
||||
}));
|
||||
else
|
||||
ForbiddenResearch.recipes.put(
|
||||
"Crystalwell",
|
||||
ThaumcraftApi.addShapelessArcaneCraftingRecipe(
|
||||
"CRYSTALWELL",
|
||||
new ItemStack(ForbiddenItems.crystalwell, 1, 0),
|
||||
(new AspectList()).add(Aspect.WATER, 1).add(Aspect.ORDER, 1),
|
||||
new Object[] {
|
||||
new ItemStack(ConfigItems.itemInkwell, 1, 32767),
|
||||
"dyeBlack",
|
||||
new ItemStack(ConfigItems.itemShard, 1, 6) }));
|
||||
else ForbiddenResearch.recipes.put(
|
||||
"Crystalwell",
|
||||
ThaumcraftApi.addShapelessArcaneCraftingRecipe(
|
||||
"CRYSTALWELL",
|
||||
new ItemStack(ForbiddenItems.crystalwell, 1, 0),
|
||||
(new AspectList()).add(Aspect.WATER, 1).add(Aspect.ORDER, 1),
|
||||
new Object[] { new ItemStack(ConfigItems.itemInkwell, 1, 32767), "dyeBlack",
|
||||
new ItemStack(ConfigBlocks.blockCrystal, 1, 6),
|
||||
new ItemStack(ConfigItems.itemShard, 1, 6),
|
||||
new ItemStack(ConfigItems.itemShard, 1, 6),
|
||||
new ItemStack(ConfigItems.itemShard, 1, 6)
|
||||
}));
|
||||
new ItemStack(ConfigItems.itemShard, 1, 6), new ItemStack(ConfigItems.itemShard, 1, 6),
|
||||
new ItemStack(ConfigItems.itemShard, 1, 6) }));
|
||||
|
||||
ForbiddenResearch.recipes.put(
|
||||
"Primewell",
|
||||
ThaumcraftApi.addShapelessArcaneCraftingRecipe(
|
||||
"PRIMEWELL",
|
||||
new ItemStack(ForbiddenItems.primewell, 1, 0),
|
||||
(new AspectList())
|
||||
.add(Aspect.WATER, 50)
|
||||
.add(Aspect.EARTH, 50)
|
||||
.add(Aspect.FIRE, 50)
|
||||
.add(Aspect.AIR, 50)
|
||||
.add(Aspect.ORDER, 50)
|
||||
.add(Aspect.ENTROPY, 50),
|
||||
new Object[] {
|
||||
new ItemStack(Items.feather, 1, 0),
|
||||
new ItemStack(ConfigItems.itemEldritchObject, 1, 3),
|
||||
new ItemStack(Items.glass_bottle, 1, 0)
|
||||
}));
|
||||
(new AspectList()).add(Aspect.WATER, 50).add(Aspect.EARTH, 50).add(Aspect.FIRE, 50)
|
||||
.add(Aspect.AIR, 50).add(Aspect.ORDER, 50).add(Aspect.ENTROPY, 50),
|
||||
new Object[] { new ItemStack(Items.feather, 1, 0),
|
||||
new ItemStack(ConfigItems.itemEldritchObject, 1, 3),
|
||||
new ItemStack(Items.glass_bottle, 1, 0) }));
|
||||
|
||||
if (Config.enchanting) {
|
||||
if (Config.greedyEnch)
|
||||
ForbiddenResearch.recipes.put(
|
||||
"Greedy",
|
||||
ThaumcraftApi.addInfusionEnchantmentRecipe(
|
||||
"GREEDY",
|
||||
DarkEnchantments.greedy,
|
||||
4,
|
||||
(new AspectList())
|
||||
.add(DarkAspects.NETHER, 16)
|
||||
.add(Aspect.WEAPON, 8)
|
||||
.add(Aspect.GREED, 16),
|
||||
new ItemStack[] {
|
||||
new ItemStack(Items.golden_sword),
|
||||
new ItemStack(Items.diamond),
|
||||
if (Config.greedyEnch) ForbiddenResearch.recipes.put(
|
||||
"Greedy",
|
||||
ThaumcraftApi.addInfusionEnchantmentRecipe(
|
||||
"GREEDY",
|
||||
DarkEnchantments.greedy,
|
||||
4,
|
||||
(new AspectList()).add(DarkAspects.NETHER, 16).add(Aspect.WEAPON, 8).add(Aspect.GREED, 16),
|
||||
new ItemStack[] { new ItemStack(Items.golden_sword), new ItemStack(Items.diamond),
|
||||
new ItemStack(ForbiddenItems.deadlyShards, 1, 6),
|
||||
new ItemStack(ForbiddenItems.deadlyShards, 1, 6),
|
||||
new ItemStack(ConfigItems.itemResource, 1, 14)
|
||||
}));
|
||||
new ItemStack(ConfigItems.itemResource, 1, 14) }));
|
||||
ForbiddenResearch.recipes.put(
|
||||
"Consuming",
|
||||
ThaumcraftApi.addInfusionEnchantmentRecipe(
|
||||
"CONSUMING",
|
||||
DarkEnchantments.consuming,
|
||||
3,
|
||||
(new AspectList())
|
||||
.add(Aspect.VOID, 8)
|
||||
.add(Aspect.TOOL, 8)
|
||||
.add(Aspect.HUNGER, 8),
|
||||
new ItemStack[] {
|
||||
new ItemStack(Items.iron_pickaxe),
|
||||
new ItemStack(Items.lava_bucket),
|
||||
ItemApi.getItem("itemResource", 14)
|
||||
}));
|
||||
(new AspectList()).add(Aspect.VOID, 8).add(Aspect.TOOL, 8).add(Aspect.HUNGER, 8),
|
||||
new ItemStack[] { new ItemStack(Items.iron_pickaxe), new ItemStack(Items.lava_bucket),
|
||||
ItemApi.getItem("itemResource", 14) }));
|
||||
ForbiddenResearch.recipes.put(
|
||||
"Wrath",
|
||||
ThaumcraftApi.addInfusionEnchantmentRecipe(
|
||||
"WRATH",
|
||||
DarkEnchantments.wrath,
|
||||
8,
|
||||
(new AspectList())
|
||||
.add(DarkAspects.WRATH, 16)
|
||||
.add(Aspect.WEAPON, 16)
|
||||
(new AspectList()).add(DarkAspects.WRATH, 16).add(Aspect.WEAPON, 16)
|
||||
.add(DarkAspects.NETHER, 8),
|
||||
new ItemStack[] {
|
||||
ItemApi.getItem("itemResource", 14),
|
||||
new ItemStack(Items.diamond_sword, 1, 0),
|
||||
new ItemStack(ForbiddenItems.deadlyShards, 1, 0),
|
||||
new ItemStack(ForbiddenItems.deadlyShards, 1, 0),
|
||||
new ItemStack(ForbiddenItems.deadlyShards, 1, 0)
|
||||
}));
|
||||
new ItemStack[] { ItemApi.getItem("itemResource", 14),
|
||||
new ItemStack(Items.diamond_sword, 1, 0),
|
||||
new ItemStack(ForbiddenItems.deadlyShards, 1, 0),
|
||||
new ItemStack(ForbiddenItems.deadlyShards, 1, 0),
|
||||
new ItemStack(ForbiddenItems.deadlyShards, 1, 0) }));
|
||||
ForbiddenResearch.recipes.put(
|
||||
"Educational",
|
||||
ThaumcraftApi.addInfusionEnchantmentRecipe(
|
||||
"EDUCATIONAL",
|
||||
DarkEnchantments.educational,
|
||||
3,
|
||||
(new AspectList())
|
||||
.add(Aspect.MAGIC, 4)
|
||||
.add(Aspect.WEAPON, 4)
|
||||
.add(Aspect.MIND, 8),
|
||||
new ItemStack[] {
|
||||
ItemApi.getItem("itemZombieBrain", 0),
|
||||
new ItemStack(Items.book),
|
||||
ItemApi.getItem("itemResource", 14)
|
||||
}));
|
||||
(new AspectList()).add(Aspect.MAGIC, 4).add(Aspect.WEAPON, 4).add(Aspect.MIND, 8),
|
||||
new ItemStack[] { ItemApi.getItem("itemZombieBrain", 0), new ItemStack(Items.book),
|
||||
ItemApi.getItem("itemResource", 14) }));
|
||||
ForbiddenResearch.recipes.put(
|
||||
"Corrupting",
|
||||
ThaumcraftApi.addInfusionEnchantmentRecipe(
|
||||
"CORRUPTING",
|
||||
DarkEnchantments.corrupting,
|
||||
4,
|
||||
(new AspectList())
|
||||
.add(DarkAspects.NETHER, 16)
|
||||
.add(Aspect.EXCHANGE, 16)
|
||||
(new AspectList()).add(DarkAspects.NETHER, 16).add(Aspect.EXCHANGE, 16)
|
||||
.add(Aspect.CRYSTAL, 8),
|
||||
new ItemStack[] {
|
||||
new ItemStack(Items.nether_wart),
|
||||
new ItemStack(Blocks.soul_sand),
|
||||
ItemApi.getItem("itemResource", 14)
|
||||
}));
|
||||
new ItemStack[] { new ItemStack(Items.nether_wart), new ItemStack(Blocks.soul_sand),
|
||||
ItemApi.getItem("itemResource", 14) }));
|
||||
|
||||
ForbiddenResearch.recipes.put(
|
||||
"Cluster",
|
||||
@@ -549,13 +382,9 @@ public class ForbiddenRecipes {
|
||||
"CLUSTER",
|
||||
DarkEnchantments.cluster,
|
||||
3,
|
||||
(new AspectList())
|
||||
.add(Aspect.FIRE, 4)
|
||||
.add(Aspect.METAL, 4)
|
||||
.add(Aspect.GREED, 4),
|
||||
new ItemStack[] {
|
||||
ItemApi.getItem("itemPickElemental", 0), ItemApi.getItem("itemResource", 14)
|
||||
}));
|
||||
(new AspectList()).add(Aspect.FIRE, 4).add(Aspect.METAL, 4).add(Aspect.GREED, 4),
|
||||
new ItemStack[] { ItemApi.getItem("itemPickElemental", 0),
|
||||
ItemApi.getItem("itemResource", 14) }));
|
||||
ForbiddenResearch.recipes.put(
|
||||
"Impact",
|
||||
ThaumcraftApi.addInfusionEnchantmentRecipe(
|
||||
@@ -563,54 +392,48 @@ public class ForbiddenRecipes {
|
||||
DarkEnchantments.impact,
|
||||
4,
|
||||
(new AspectList()).add(Aspect.ENTROPY, 16).add(Aspect.MINE, 16),
|
||||
new ItemStack[] {
|
||||
ItemApi.getItem("itemResource", 14),
|
||||
new ItemStack(ForbiddenItems.deadlyShards, 1, 1),
|
||||
new ItemStack(ForbiddenItems.deadlyShards, 1, 1),
|
||||
new ItemStack(ConfigItems.itemShovelElemental, 1, 0)
|
||||
}));
|
||||
new ItemStack[] { ItemApi.getItem("itemResource", 14),
|
||||
new ItemStack(ForbiddenItems.deadlyShards, 1, 1),
|
||||
new ItemStack(ForbiddenItems.deadlyShards, 1, 1),
|
||||
new ItemStack(ConfigItems.itemShovelElemental, 1, 0) }));
|
||||
ForbiddenResearch.recipes.put(
|
||||
"Voidtouched",
|
||||
ThaumcraftApi.addInfusionEnchantmentRecipe(
|
||||
"VOIDTOUCHED",
|
||||
DarkEnchantments.voidtouched,
|
||||
8,
|
||||
(new AspectList())
|
||||
.add(Aspect.VOID, 16)
|
||||
.add(Aspect.DARKNESS, 16)
|
||||
.add(DarkAspects.ENVY, 24)
|
||||
(new AspectList()).add(Aspect.VOID, 16).add(Aspect.DARKNESS, 16).add(DarkAspects.ENVY, 24)
|
||||
.add(Aspect.ELDRITCH, 16),
|
||||
new ItemStack[] {
|
||||
ItemApi.getItem("itemResource", 14),
|
||||
ItemApi.getItem("itemResource", 16),
|
||||
ItemApi.getItem("itemResource", 16),
|
||||
ItemApi.getItem("itemResource", 16),
|
||||
new ItemStack(ForbiddenItems.deadlyShards, 1, 1),
|
||||
new ItemStack(ForbiddenItems.deadlyShards, 1, 1),
|
||||
new ItemStack(ForbiddenItems.deadlyShards, 1, 1)
|
||||
}));
|
||||
new ItemStack[] { ItemApi.getItem("itemResource", 14), ItemApi.getItem("itemResource", 16),
|
||||
ItemApi.getItem("itemResource", 16), ItemApi.getItem("itemResource", 16),
|
||||
new ItemStack(ForbiddenItems.deadlyShards, 1, 1),
|
||||
new ItemStack(ForbiddenItems.deadlyShards, 1, 1),
|
||||
new ItemStack(ForbiddenItems.deadlyShards, 1, 1) }));
|
||||
}
|
||||
|
||||
CraftingManager.getInstance().addRecipe(new ItemStack(Items.emerald, 1, 0), new Object[] {
|
||||
"###", "###", "###", Character.valueOf('#'), new ItemStack(ForbiddenItems.resource, 1, 0)
|
||||
});
|
||||
CraftingManager.getInstance().addRecipe(new ItemStack(ForbiddenItems.resource, 9, 0), new Object[] {
|
||||
"#", Character.valueOf('#'), new ItemStack(Items.emerald, 1, 0)
|
||||
});
|
||||
CraftingManager.getInstance().addRecipe(new ItemStack(ForbiddenBlocks.starBlock, 1, 0), new Object[] {
|
||||
"###", "###", "###", Character.valueOf('#'), new ItemStack(Items.nether_star, 1, 0)
|
||||
});
|
||||
CraftingManager.getInstance().addRecipe(new ItemStack(Items.nether_star, 9, 0), new Object[] {
|
||||
"#", Character.valueOf('#'), new ItemStack(ForbiddenBlocks.starBlock, 1, 0)
|
||||
});
|
||||
CraftingManager.getInstance().addRecipe(
|
||||
new ItemStack(Items.emerald, 1, 0),
|
||||
new Object[] { "###", "###", "###", Character.valueOf('#'),
|
||||
new ItemStack(ForbiddenItems.resource, 1, 0) });
|
||||
CraftingManager.getInstance().addRecipe(
|
||||
new ItemStack(ForbiddenItems.resource, 9, 0),
|
||||
new Object[] { "#", Character.valueOf('#'), new ItemStack(Items.emerald, 1, 0) });
|
||||
CraftingManager.getInstance().addRecipe(
|
||||
new ItemStack(ForbiddenBlocks.starBlock, 1, 0),
|
||||
new Object[] { "###", "###", "###", Character.valueOf('#'), new ItemStack(Items.nether_star, 1, 0) });
|
||||
CraftingManager.getInstance().addRecipe(
|
||||
new ItemStack(Items.nether_star, 9, 0),
|
||||
new Object[] { "#", Character.valueOf('#'), new ItemStack(ForbiddenBlocks.starBlock, 1, 0) });
|
||||
ForbiddenResearch.recipes.put(
|
||||
"RidingCrop",
|
||||
CraftingManager.getInstance().addRecipe(new ItemStack(ForbiddenItems.ridingCrop, 1, 0), new Object[] {
|
||||
"X", "#", "#", Character.valueOf('#'), Items.stick, Character.valueOf('X'), Items.leather
|
||||
}));
|
||||
CraftingManager.getInstance().addRecipe(
|
||||
new ItemStack(ForbiddenItems.ridingCrop, 1, 0),
|
||||
new Object[] { "X", "#", "#", Character.valueOf('#'), Items.stick, Character.valueOf('X'),
|
||||
Items.leather }));
|
||||
ThaumcraftApi.addSmeltingBonus(new ItemStack(Items.emerald), new ItemStack(ForbiddenItems.resource, 0, 0));
|
||||
|
||||
GameRegistry.registerFuelHandler(new IFuelHandler() {
|
||||
|
||||
Random randy = new Random();
|
||||
|
||||
@Override
|
||||
@@ -623,7 +446,7 @@ public class ForbiddenRecipes {
|
||||
}
|
||||
});
|
||||
|
||||
OreDictionary.registerOre(
|
||||
"logWood", new ItemStack(ConfigBlocks.blockMagicalLog, 1, OreDictionary.WILDCARD_VALUE));
|
||||
OreDictionary
|
||||
.registerOre("logWood", new ItemStack(ConfigBlocks.blockMagicalLog, 1, OreDictionary.WILDCARD_VALUE));
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large.
Load diff
@@ -5,6 +5,7 @@ import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
|
||||
public class LogHandler {
|
||||
|
||||
public static final Logger logger = LogManager.getLogger("Forbidden Magic");
|
||||
|
||||
public static void log(Level level, Throwable e, String message) {
|
||||
|
||||
@@ -1,75 +1,90 @@
|
||||
package fox.spiteful.forbidden;
|
||||
|
||||
import cpw.mods.fml.common.registry.VillagerRegistry.IVillageTradeHandler;
|
||||
import fox.spiteful.forbidden.items.ForbiddenItems;
|
||||
import java.util.Random;
|
||||
|
||||
import net.minecraft.entity.passive.EntityVillager;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.village.MerchantRecipe;
|
||||
import net.minecraft.village.MerchantRecipeList;
|
||||
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.api.aspects.AspectList;
|
||||
import thaumcraft.api.wands.WandCap;
|
||||
import thaumcraft.api.wands.WandRod;
|
||||
import thaumcraft.common.config.ConfigItems;
|
||||
import thaumcraft.common.items.wands.ItemWandCasting;
|
||||
import cpw.mods.fml.common.registry.VillagerRegistry.IVillageTradeHandler;
|
||||
import fox.spiteful.forbidden.items.ForbiddenItems;
|
||||
|
||||
public class VillagerHereticManager implements IVillageTradeHandler {
|
||||
|
||||
public void manipulateTradesForVillager(EntityVillager villager, MerchantRecipeList recipeList, Random random) {
|
||||
if (villager.getProfession() == Config.hereticID) {
|
||||
/*recipeList.add(new MerchantRecipe(new ItemStack(ConfigItems.itemResource, 20 + random.nextInt(3), 18), new ItemStack(Items.emerald)));
|
||||
recipeList.add(new MerchantRecipe(new ItemStack(Items.emerald), new ItemStack(ConfigItems.itemResource, 1, 9)));
|
||||
recipeList.add(new MerchantRecipe(new ItemStack(ConfigItems.itemResource, 4 + random.nextInt(3), 3), new ItemStack(Items.emerald)));
|
||||
recipeList.add(new MerchantRecipe(new ItemStack(Items.emerald), new ItemStack(ConfigItems.itemResource, 1, 0)));
|
||||
recipeList.add(new MerchantRecipe(new ItemStack(ConfigItems.itemResource, 4 + random.nextInt(3), 6), new ItemStack(Items.emerald)));
|
||||
recipeList.add(new MerchantRecipe(new ItemStack(Items.emerald), new ItemStack(ConfigItems.itemResource, 1, 1)));
|
||||
recipeList.add(new MerchantRecipe(new ItemStack(ConfigItems.itemNuggetChicken, 24 + random.nextInt(8), 0), new ItemStack(Items.emerald)));
|
||||
recipeList.add(new MerchantRecipe(new ItemStack(Items.book, 4 + random.nextInt(3), 0), new ItemStack(ConfigItems.itemResource, 1, 9)));
|
||||
recipeList.add(new MerchantRecipe(new ItemStack(ConfigItems.itemNuggetBeef, 24 + random.nextInt(8), 0), new ItemStack(Items.emerald)));
|
||||
recipeList.add(new MerchantRecipe(new ItemStack(Items.emerald), new ItemStack(ConfigItems.itemShard, 2 + random.nextInt(2), random.nextInt(6))));
|
||||
recipeList.add(new MerchantRecipe(new ItemStack(Items.emerald), new ItemStack(ConfigItems.itemManaBean, 1 + random.nextInt(2), 0)));
|
||||
recipeList.add(new MerchantRecipe(new ItemStack(Items.emerald, 5 + random.nextInt(3)), new ItemStack(ConfigItems.itemBathSalts, 1, 0)));
|
||||
recipeList.add(new MerchantRecipe(new ItemStack(Items.emerald, 5 + random.nextInt(3)), new ItemStack(ConfigItems.itemRingRunic, 1, 0)));
|
||||
recipeList.add(new MerchantRecipe(new ItemStack(Items.emerald, 5 + random.nextInt(3)), new ItemStack(ConfigItems.itemAmuletVis, 1, 0)));
|
||||
recipeList.add(new MerchantRecipe(new ItemStack(Items.emerald, 5 + random.nextInt(3)), new ItemStack(ConfigItems.itemBaubleBlanks, 1, 3 + random.nextInt(6))));
|
||||
*/
|
||||
recipeList.add(new MerchantRecipe(
|
||||
new ItemStack(Items.emerald, 1 + random.nextInt(2)),
|
||||
new ItemStack(ForbiddenItems.deadlyShards, 3 + random.nextInt(2), 6)));
|
||||
if (!Config.noLust)
|
||||
recipeList.add(new MerchantRecipe(
|
||||
new ItemStack(ForbiddenItems.deadlyShards, 2 + random.nextInt(4), 4),
|
||||
new ItemStack(Items.emerald)));
|
||||
recipeList.add(new MerchantRecipe(
|
||||
new ItemStack(ForbiddenItems.deadlyShards, 4 + random.nextInt(6), 0),
|
||||
new ItemStack(Items.emerald)));
|
||||
recipeList.add(new MerchantRecipe(
|
||||
new ItemStack(ForbiddenItems.gluttonyShard, 4 + random.nextInt(6), 0),
|
||||
new ItemStack(Items.emerald)));
|
||||
recipeList.add(new MerchantRecipe(
|
||||
new ItemStack(Items.emerald, 1 + random.nextInt(3)), new ItemStack(Items.skull, 1, 0)));
|
||||
recipeList.add(new MerchantRecipe(
|
||||
new ItemStack(Items.emerald, 4 + random.nextInt(4)), new ItemStack(Items.ghast_tear, 1)));
|
||||
recipeList.add(new MerchantRecipe(
|
||||
new ItemStack(Items.emerald, 1), new ItemStack(Items.glowstone_dust, 8 + random.nextInt(9))));
|
||||
/*
|
||||
* recipeList.add(new MerchantRecipe(new ItemStack(ConfigItems.itemResource, 20 + random.nextInt(3), 18),
|
||||
* new ItemStack(Items.emerald))); recipeList.add(new MerchantRecipe(new ItemStack(Items.emerald), new
|
||||
* ItemStack(ConfigItems.itemResource, 1, 9))); recipeList.add(new MerchantRecipe(new
|
||||
* ItemStack(ConfigItems.itemResource, 4 + random.nextInt(3), 3), new ItemStack(Items.emerald)));
|
||||
* recipeList.add(new MerchantRecipe(new ItemStack(Items.emerald), new ItemStack(ConfigItems.itemResource,
|
||||
* 1, 0))); recipeList.add(new MerchantRecipe(new ItemStack(ConfigItems.itemResource, 4 + random.nextInt(3),
|
||||
* 6), new ItemStack(Items.emerald))); recipeList.add(new MerchantRecipe(new ItemStack(Items.emerald), new
|
||||
* ItemStack(ConfigItems.itemResource, 1, 1))); recipeList.add(new MerchantRecipe(new
|
||||
* ItemStack(ConfigItems.itemNuggetChicken, 24 + random.nextInt(8), 0), new ItemStack(Items.emerald)));
|
||||
* recipeList.add(new MerchantRecipe(new ItemStack(Items.book, 4 + random.nextInt(3), 0), new
|
||||
* ItemStack(ConfigItems.itemResource, 1, 9))); recipeList.add(new MerchantRecipe(new
|
||||
* ItemStack(ConfigItems.itemNuggetBeef, 24 + random.nextInt(8), 0), new ItemStack(Items.emerald)));
|
||||
* recipeList.add(new MerchantRecipe(new ItemStack(Items.emerald), new ItemStack(ConfigItems.itemShard, 2 +
|
||||
* random.nextInt(2), random.nextInt(6)))); recipeList.add(new MerchantRecipe(new ItemStack(Items.emerald),
|
||||
* new ItemStack(ConfigItems.itemManaBean, 1 + random.nextInt(2), 0))); recipeList.add(new
|
||||
* MerchantRecipe(new ItemStack(Items.emerald, 5 + random.nextInt(3)), new
|
||||
* ItemStack(ConfigItems.itemBathSalts, 1, 0))); recipeList.add(new MerchantRecipe(new
|
||||
* ItemStack(Items.emerald, 5 + random.nextInt(3)), new ItemStack(ConfigItems.itemRingRunic, 1, 0)));
|
||||
* recipeList.add(new MerchantRecipe(new ItemStack(Items.emerald, 5 + random.nextInt(3)), new
|
||||
* ItemStack(ConfigItems.itemAmuletVis, 1, 0))); recipeList.add(new MerchantRecipe(new
|
||||
* ItemStack(Items.emerald, 5 + random.nextInt(3)), new ItemStack(ConfigItems.itemBaubleBlanks, 1, 3 +
|
||||
* random.nextInt(6))));
|
||||
*/
|
||||
recipeList.add(
|
||||
new MerchantRecipe(
|
||||
new ItemStack(Items.emerald, 1 + random.nextInt(2)),
|
||||
new ItemStack(ForbiddenItems.deadlyShards, 3 + random.nextInt(2), 6)));
|
||||
if (!Config.noLust) recipeList.add(
|
||||
new MerchantRecipe(
|
||||
new ItemStack(ForbiddenItems.deadlyShards, 2 + random.nextInt(4), 4),
|
||||
new ItemStack(Items.emerald)));
|
||||
recipeList.add(
|
||||
new MerchantRecipe(
|
||||
new ItemStack(ForbiddenItems.deadlyShards, 4 + random.nextInt(6), 0),
|
||||
new ItemStack(Items.emerald)));
|
||||
recipeList.add(
|
||||
new MerchantRecipe(
|
||||
new ItemStack(ForbiddenItems.gluttonyShard, 4 + random.nextInt(6), 0),
|
||||
new ItemStack(Items.emerald)));
|
||||
recipeList.add(
|
||||
new MerchantRecipe(
|
||||
new ItemStack(Items.emerald, 1 + random.nextInt(3)),
|
||||
new ItemStack(Items.skull, 1, 0)));
|
||||
recipeList.add(
|
||||
new MerchantRecipe(
|
||||
new ItemStack(Items.emerald, 4 + random.nextInt(4)),
|
||||
new ItemStack(Items.ghast_tear, 1)));
|
||||
recipeList.add(
|
||||
new MerchantRecipe(
|
||||
new ItemStack(Items.emerald, 1),
|
||||
new ItemStack(Items.glowstone_dust, 8 + random.nextInt(9))));
|
||||
|
||||
ItemStack wand = new ItemStack(ConfigItems.itemWandCasting, 1, 36);
|
||||
((ItemWandCasting) wand.getItem()).setCap(wand, (WandCap) WandCap.caps.get("iron"));
|
||||
((ItemWandCasting) wand.getItem()).setRod(wand, (WandRod) WandRod.rods.get("profane"));
|
||||
((ItemWandCasting) wand.getItem())
|
||||
.storeAllVis(
|
||||
wand,
|
||||
new AspectList()
|
||||
.add(Aspect.FIRE, 5000)
|
||||
.add(Aspect.WATER, 5000)
|
||||
.add(Aspect.EARTH, 5000)
|
||||
.add(Aspect.AIR, 5000)
|
||||
.add(Aspect.ORDER, 5000)
|
||||
.add(Aspect.ENTROPY, 5000));
|
||||
((ItemWandCasting) wand.getItem()).storeAllVis(
|
||||
wand,
|
||||
new AspectList().add(Aspect.FIRE, 5000).add(Aspect.WATER, 5000).add(Aspect.EARTH, 5000)
|
||||
.add(Aspect.AIR, 5000).add(Aspect.ORDER, 5000).add(Aspect.ENTROPY, 5000));
|
||||
MerchantRecipe profane = new MerchantRecipe(
|
||||
new ItemStack(Items.emerald, 8 + random.nextInt(5)), new ItemStack(Items.stick), wand);
|
||||
new ItemStack(Items.emerald, 8 + random.nextInt(5)),
|
||||
new ItemStack(Items.stick),
|
||||
wand);
|
||||
profane.func_82783_a(-6);
|
||||
recipeList.add(profane);
|
||||
MerchantRecipe fire = new MerchantRecipe(
|
||||
|
||||
@@ -5,26 +5,28 @@ import net.minecraft.init.Blocks;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.api.wands.IWandTriggerManager;
|
||||
import thaumcraft.common.items.wands.ItemWandCasting;
|
||||
import thaumcraft.common.lib.research.ResearchManager;
|
||||
|
||||
public class WandOverlord implements IWandTriggerManager {
|
||||
|
||||
@Override
|
||||
public boolean performTrigger(
|
||||
World world, ItemStack wand, EntityPlayer player, int x, int y, int z, int side, int event) {
|
||||
public boolean performTrigger(World world, ItemStack wand, EntityPlayer player, int x, int y, int z, int side,
|
||||
int event) {
|
||||
if (event == 1 && side == 1) return hellfire(world, wand, player, x, y, z, side);
|
||||
return false;
|
||||
}
|
||||
|
||||
public boolean hellfire(World world, ItemStack wand, EntityPlayer player, int x, int y, int z, int side) {
|
||||
if (world.isRemote
|
||||
|| wand == null
|
||||
if (world.isRemote || wand == null
|
||||
|| !(wand.getItem() instanceof ItemWandCasting)
|
||||
|| ((ItemWandCasting) wand.getItem()).getFocusItem(wand) != null
|
||||
|| !ResearchManager.isResearchComplete(player.getCommandSenderName(), "HELLFIRE")
|
||||
|| !player.canPlayerEdit(x, y, z, side, new ItemStack(Items.fire_charge))) return false;
|
||||
|| !player.canPlayerEdit(x, y, z, side, new ItemStack(Items.fire_charge)))
|
||||
return false;
|
||||
|
||||
if (world.isAirBlock(x, y + 1, z)
|
||||
&& ((ItemWandCasting) wand.getItem()).consumeVis(wand, player, Aspect.FIRE, 2, false)) {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package fox.spiteful.forbidden;
|
||||
|
||||
import fox.spiteful.forbidden.blocks.ForbiddenBlocks;
|
||||
import java.util.Random;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockSapling;
|
||||
import net.minecraft.init.Blocks;
|
||||
@@ -9,7 +9,10 @@ import net.minecraft.world.World;
|
||||
import net.minecraft.world.gen.feature.WorldGenAbstractTree;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
|
||||
import fox.spiteful.forbidden.blocks.ForbiddenBlocks;
|
||||
|
||||
public class WorldGenTaintedTree extends WorldGenAbstractTree {
|
||||
|
||||
/** The minimum height of a generated tree. */
|
||||
private final int minTreeHeight;
|
||||
|
||||
@@ -63,11 +66,21 @@ public class WorldGenTaintedTree extends WorldGenAbstractTree {
|
||||
Block block2 = p_76484_1_.getBlock(p_76484_3_, p_76484_4_ - 1, p_76484_5_);
|
||||
|
||||
boolean isSoil = block2.canSustainPlant(
|
||||
p_76484_1_, p_76484_3_, p_76484_4_ - 1, p_76484_5_, ForgeDirection.UP, (BlockSapling)
|
||||
Blocks.sapling);
|
||||
p_76484_1_,
|
||||
p_76484_3_,
|
||||
p_76484_4_ - 1,
|
||||
p_76484_5_,
|
||||
ForgeDirection.UP,
|
||||
(BlockSapling) Blocks.sapling);
|
||||
if (isSoil && p_76484_4_ < 256 - l - 1) {
|
||||
block2.onPlantGrow(
|
||||
p_76484_1_, p_76484_3_, p_76484_4_ - 1, p_76484_5_, p_76484_3_, p_76484_4_, p_76484_5_);
|
||||
p_76484_1_,
|
||||
p_76484_3_,
|
||||
p_76484_4_ - 1,
|
||||
p_76484_5_,
|
||||
p_76484_3_,
|
||||
p_76484_4_,
|
||||
p_76484_5_);
|
||||
b0 = 3;
|
||||
byte b1 = 0;
|
||||
int l1;
|
||||
@@ -91,7 +104,12 @@ public class WorldGenTaintedTree extends WorldGenAbstractTree {
|
||||
if (block1.isAir(p_76484_1_, i2, k1, k2)
|
||||
|| block1.isLeaves(p_76484_1_, i2, k1, k2)) {
|
||||
this.setBlockAndNotifyAdequately(
|
||||
p_76484_1_, i2, k1, k2, ForbiddenBlocks.taintLeaves, 0);
|
||||
p_76484_1_,
|
||||
i2,
|
||||
k1,
|
||||
k2,
|
||||
ForbiddenBlocks.taintLeaves,
|
||||
0);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -104,7 +122,12 @@ public class WorldGenTaintedTree extends WorldGenAbstractTree {
|
||||
if (block.isAir(p_76484_1_, p_76484_3_, p_76484_4_ + k1, p_76484_5_)
|
||||
|| block.isLeaves(p_76484_1_, p_76484_3_, p_76484_4_ + k1, p_76484_5_)) {
|
||||
this.setBlockAndNotifyAdequately(
|
||||
p_76484_1_, p_76484_3_, p_76484_4_ + k1, p_76484_5_, ForbiddenBlocks.taintLog, 0);
|
||||
p_76484_1_,
|
||||
p_76484_3_,
|
||||
p_76484_4_ + k1,
|
||||
p_76484_5_,
|
||||
ForbiddenBlocks.taintLog,
|
||||
0);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -128,10 +151,8 @@ public class WorldGenTaintedTree extends WorldGenAbstractTree {
|
||||
while (true) {
|
||||
--p_76529_3_;
|
||||
|
||||
if (!p_76529_1_
|
||||
.getBlock(p_76529_2_, p_76529_3_, p_76529_4_)
|
||||
.isAir(p_76529_1_, p_76529_2_, p_76529_3_, p_76529_4_)
|
||||
|| i1 <= 0) {
|
||||
if (!p_76529_1_.getBlock(p_76529_2_, p_76529_3_, p_76529_4_)
|
||||
.isAir(p_76529_1_, p_76529_2_, p_76529_3_, p_76529_4_) || i1 <= 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,17 +1,21 @@
|
||||
package fox.spiteful.forbidden;
|
||||
|
||||
import cpw.mods.fml.relauncher.ReflectionHelper;
|
||||
import java.lang.reflect.Field;
|
||||
|
||||
import net.minecraft.entity.EntityLiving;
|
||||
|
||||
import org.apache.logging.log4j.Level;
|
||||
|
||||
import cpw.mods.fml.relauncher.ReflectionHelper;
|
||||
|
||||
public class XPReflectionHelper {
|
||||
|
||||
public static Field stupidMojangProtectedVariable;
|
||||
|
||||
static {
|
||||
try {
|
||||
stupidMojangProtectedVariable =
|
||||
ReflectionHelper.findField(EntityLiving.class, "experienceValue", "field_70728_aV");
|
||||
stupidMojangProtectedVariable = ReflectionHelper
|
||||
.findField(EntityLiving.class, "experienceValue", "field_70728_aV");
|
||||
stupidMojangProtectedVariable.setAccessible(true);
|
||||
} catch (Exception e) {
|
||||
LogHandler.log(Level.ERROR, e.toString());
|
||||
|
||||
@@ -1,10 +1,7 @@
|
||||
package fox.spiteful.forbidden.blocks;
|
||||
|
||||
import cpw.mods.fml.common.Loader;
|
||||
import cpw.mods.fml.common.Optional;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import java.util.Random;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
@@ -16,12 +13,18 @@ import net.minecraft.util.IIcon;
|
||||
import net.minecraft.util.MovingObjectPosition;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import squeek.applecore.api.food.FoodValues;
|
||||
import squeek.applecore.api.food.IEdibleBlock;
|
||||
import squeek.applecore.api.food.ItemFoodProxy;
|
||||
import cpw.mods.fml.common.Loader;
|
||||
import cpw.mods.fml.common.Optional;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
@Optional.Interface(iface = "squeek.applecore.api.food.IEdibleBlock", modid = "AppleCore")
|
||||
public class BlockArcaneCake extends Block implements IEdibleBlock {
|
||||
|
||||
private boolean isEdibleAtMaxHunger = false;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@@ -98,8 +101,7 @@ public class BlockArcaneCake extends Block implements IEdibleBlock {
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public IIcon getIcon(int par1, int x) {
|
||||
return par1 == 1
|
||||
? this.cakeTopIcon
|
||||
return par1 == 1 ? this.cakeTopIcon
|
||||
: (par1 == 0 ? this.cakeBottomIcon : (x > 0 && par1 == 4 ? this.cakeInsideIcon : this.blockIcon));
|
||||
}
|
||||
|
||||
@@ -118,8 +120,8 @@ public class BlockArcaneCake extends Block implements IEdibleBlock {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onBlockActivated(
|
||||
World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) {
|
||||
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX,
|
||||
float hitY, float hitZ) {
|
||||
this.eatCakeSlice(world, x, y, z, player);
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -1,10 +1,8 @@
|
||||
package fox.spiteful.forbidden.blocks;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
import java.util.List;
|
||||
import java.util.Random;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockFlower;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
@@ -15,7 +13,12 @@ import net.minecraft.util.IIcon;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
|
||||
public class BlockBlackFlower extends BlockFlower {
|
||||
|
||||
protected BlockBlackFlower() {
|
||||
super(1);
|
||||
float f = 0.2F;
|
||||
|
||||
@@ -1,12 +1,8 @@
|
||||
package fox.spiteful.forbidden.blocks;
|
||||
|
||||
import cpw.mods.fml.relauncher.ReflectionHelper;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
import fox.spiteful.forbidden.items.ForbiddenItems;
|
||||
import java.lang.reflect.Field;
|
||||
import java.util.Random;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockLeaves;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
@@ -16,10 +12,17 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import thaumcraft.common.config.Config;
|
||||
import thaumcraft.common.config.ConfigBlocks;
|
||||
import cpw.mods.fml.relauncher.ReflectionHelper;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
import fox.spiteful.forbidden.items.ForbiddenItems;
|
||||
|
||||
public class BlockLeavesTainted extends BlockLeaves {
|
||||
|
||||
int[] decayThingy;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
|
||||
@@ -1,20 +1,23 @@
|
||||
package fox.spiteful.forbidden.blocks;
|
||||
|
||||
import cpw.mods.fml.relauncher.ReflectionHelper;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
import java.lang.reflect.Field;
|
||||
import java.util.Random;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockLog;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
|
||||
import thaumcraft.common.config.Config;
|
||||
import thaumcraft.common.config.ConfigBlocks;
|
||||
import cpw.mods.fml.relauncher.ReflectionHelper;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
|
||||
public class BlockLogTainted extends BlockLog {
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
private IIcon sides;
|
||||
|
||||
@@ -58,10 +61,8 @@ public class BlockLogTainted extends BlockLog {
|
||||
@Override
|
||||
public IIcon getIcon(int side, int meta) {
|
||||
int logDirection = meta & 12;
|
||||
return logDirection == 0 && (side == 1 || side == 0)
|
||||
? ends
|
||||
: (logDirection == 4 && (side == 5 || side == 4)
|
||||
? ends
|
||||
return logDirection == 0 && (side == 1 || side == 0) ? ends
|
||||
: (logDirection == 4 && (side == 5 || side == 4) ? ends
|
||||
: (logDirection == 8 && (side == 2 || side == 3) ? ends : sides));
|
||||
}
|
||||
|
||||
@@ -70,9 +71,9 @@ public class BlockLogTainted extends BlockLog {
|
||||
public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) {
|
||||
int meta = world.getBlockMetadata(x, y, z);
|
||||
int logDirection = meta & 12;
|
||||
if ((logDirection == 0 && (side == 1 || side == 0))
|
||||
|| (logDirection == 4 && (side == 5 || side == 4))
|
||||
|| (logDirection == 8 && (side == 2 || side == 3))) return ends;
|
||||
if ((logDirection == 0 && (side == 1 || side == 0)) || (logDirection == 4 && (side == 5 || side == 4))
|
||||
|| (logDirection == 8 && (side == 2 || side == 3)))
|
||||
return ends;
|
||||
else {
|
||||
Random r = new Random((long) (side + y + x * z));
|
||||
return r.nextInt(100) < 75 ? sides : r.nextBoolean() ? gross : gross2;
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
package fox.spiteful.forbidden.blocks;
|
||||
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
import net.minecraft.block.Block;
|
||||
|
||||
import thaumcraft.common.config.Config;
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
|
||||
public class BlockPlanksTainted extends Block {
|
||||
|
||||
|
||||
@@ -1,11 +1,13 @@
|
||||
package fox.spiteful.forbidden.blocks;
|
||||
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
|
||||
public class BlockResource extends Block {
|
||||
|
||||
public BlockResource() {
|
||||
|
||||
super(Material.iron);
|
||||
|
||||
@@ -1,9 +1,7 @@
|
||||
package fox.spiteful.forbidden.blocks;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
import java.util.Random;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockBush;
|
||||
import net.minecraft.block.IGrowable;
|
||||
@@ -17,6 +15,10 @@ import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
|
||||
public class BlockRoseBush extends BlockBush implements IGrowable {
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@@ -44,8 +46,8 @@ public class BlockRoseBush extends BlockBush implements IGrowable {
|
||||
/**
|
||||
* Updates the blocks bounds based on its current state. Args: world, x, y, z
|
||||
*/
|
||||
public void setBlockBoundsBasedOnState(
|
||||
IBlockAccess p_149719_1_, int p_149719_2_, int p_149719_3_, int p_149719_4_) {
|
||||
public void setBlockBoundsBasedOnState(IBlockAccess p_149719_1_, int p_149719_2_, int p_149719_3_,
|
||||
int p_149719_4_) {
|
||||
this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
|
||||
}
|
||||
|
||||
@@ -74,13 +76,13 @@ public class BlockRoseBush extends BlockBush implements IGrowable {
|
||||
}
|
||||
|
||||
/**
|
||||
* Can this block stay at this position. Similar to canPlaceBlockAt except gets checked often with plants.
|
||||
* Can this block stay at this position. Similar to canPlaceBlockAt except gets checked often with plants.
|
||||
*/
|
||||
public boolean canBlockStay(World world, int x, int y, int z) {
|
||||
if (world.getBlock(x, y, z) != this)
|
||||
return super.canBlockStay(
|
||||
world, x, y,
|
||||
z); // Forge: This function is called during world gen and placement, before this block is set, so
|
||||
if (world.getBlock(x, y, z) != this) return super.canBlockStay(world, x, y, z); // Forge: This function is
|
||||
// called during world gen and
|
||||
// placement, before this block
|
||||
// is set, so
|
||||
// if we are not 'here' then assume it's the pre-check.
|
||||
if (world.getBlockMetadata(x, y, z) == 0) return world.getBlock(x, y - 1, z) == this;
|
||||
Block block = world.getBlock(x, y - 1, z);
|
||||
@@ -119,20 +121,20 @@ public class BlockRoseBush extends BlockBush implements IGrowable {
|
||||
}
|
||||
|
||||
@Override
|
||||
/* Whether the plant isn't fully grown? Who knows? Aside from Mojang. */
|
||||
/* Whether the plant isn't fully grown? Who knows? Aside from Mojang. */
|
||||
public boolean func_149851_a(World world, int p_149851_2_, int p_149851_3_, int p_149851_4_, boolean p_149851_5_) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
/* Whether it can accept bonemeal? Who knows? Aside from Mojang. */
|
||||
public boolean func_149852_a(
|
||||
World p_149852_1_, Random p_149852_2_, int p_149852_3_, int p_149852_4_, int p_149852_5_) {
|
||||
/* Whether it can accept bonemeal? Who knows? Aside from Mojang. */
|
||||
public boolean func_149852_a(World p_149852_1_, Random p_149852_2_, int p_149852_3_, int p_149852_4_,
|
||||
int p_149852_5_) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
/* What happens when the block is bonemealed? Maybe? Fuck Obfuscation. */
|
||||
/* What happens when the block is bonemealed? Maybe? Fuck Obfuscation. */
|
||||
public void func_149853_b(World world, Random rand, int x, int y, int z) {
|
||||
spreadFlowers(world, x, y, z, rand);
|
||||
}
|
||||
|
||||
@@ -1,13 +1,9 @@
|
||||
package fox.spiteful.forbidden.blocks;
|
||||
|
||||
import cpw.mods.fml.relauncher.ReflectionHelper;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
import fox.spiteful.forbidden.WorldGenTaintedTree;
|
||||
import java.lang.reflect.Field;
|
||||
import java.util.List;
|
||||
import java.util.Random;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockSapling;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
@@ -16,10 +12,17 @@ import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import thaumcraft.common.config.Config;
|
||||
import thaumcraft.common.config.ConfigBlocks;
|
||||
import cpw.mods.fml.relauncher.ReflectionHelper;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
import fox.spiteful.forbidden.WorldGenTaintedTree;
|
||||
|
||||
public class BlockSaplingTainted extends BlockSapling {
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
private IIcon icon;
|
||||
|
||||
|
||||
@@ -1,16 +1,18 @@
|
||||
package fox.spiteful.forbidden.blocks;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.IIcon;
|
||||
|
||||
import thaumcraft.common.config.Config;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
|
||||
public class BlockStoneTainted extends Block {
|
||||
|
||||
|
||||
@@ -1,12 +1,7 @@
|
||||
package fox.spiteful.forbidden.blocks;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Config;
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
import fox.spiteful.forbidden.items.ForbiddenItems;
|
||||
import fox.spiteful.forbidden.tiles.TileEntityWrathCage;
|
||||
import java.util.Random;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockContainer;
|
||||
import net.minecraft.block.material.Material;
|
||||
@@ -20,7 +15,15 @@ import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.MovingObjectPosition;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Config;
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
import fox.spiteful.forbidden.items.ForbiddenItems;
|
||||
import fox.spiteful.forbidden.tiles.TileEntityWrathCage;
|
||||
|
||||
public class BlockWrathCage extends BlockContainer {
|
||||
|
||||
protected BlockWrathCage() {
|
||||
super(Material.iron);
|
||||
this.setCreativeTab(Forbidden.tab);
|
||||
@@ -46,8 +49,8 @@ public class BlockWrathCage extends BlockContainer {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onBlockActivated(
|
||||
World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) {
|
||||
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX,
|
||||
float hitY, float hitZ) {
|
||||
ItemStack held = player.getCurrentEquippedItem();
|
||||
if (held != null && held.getItem() == ForbiddenItems.mobCrystal) {
|
||||
NBTTagCompound nbttagcompound = held.getTagCompound();
|
||||
@@ -97,7 +100,11 @@ public class BlockWrathCage extends BlockContainer {
|
||||
crystal.stackTagCompound.setString("mob", mob);
|
||||
|
||||
EntityItem entityitem = new EntityItem(
|
||||
world, (double) ((float) x + f), (double) ((float) y + f1), (double) ((float) z + f2), crystal);
|
||||
world,
|
||||
(double) ((float) x + f),
|
||||
(double) ((float) y + f1),
|
||||
(double) ((float) z + f2),
|
||||
crystal);
|
||||
|
||||
entityitem.motionX = (double) ((float) world.rand.nextGaussian() * 0.05F);
|
||||
entityitem.motionY = (double) ((float) world.rand.nextGaussian() * 0.05F + 0.2F);
|
||||
|
||||
@@ -1,12 +1,14 @@
|
||||
package fox.spiteful.forbidden.blocks;
|
||||
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import fox.spiteful.forbidden.tiles.TileEntityWrathCage;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import fox.spiteful.forbidden.tiles.TileEntityWrathCage;
|
||||
|
||||
public class ForbiddenBlocks {
|
||||
|
||||
public static Block arcaneCake;
|
||||
public static Block blackFlower;
|
||||
public static Block wrathCage;
|
||||
@@ -34,8 +36,8 @@ public class ForbiddenBlocks {
|
||||
taintLog = GameRegistry.registerBlock(new BlockLogTainted().setBlockName("TaintLog"), "TaintLog");
|
||||
taintPlanks = GameRegistry.registerBlock(new BlockPlanksTainted().setBlockName("TaintPlank"), "TaintPlank");
|
||||
taintLeaves = GameRegistry.registerBlock(new BlockLeavesTainted().setBlockName("TaintLeaves"), "TaintLeaves");
|
||||
taintSapling =
|
||||
GameRegistry.registerBlock(new BlockSaplingTainted().setBlockName("TaintSapling"), "TaintSapling");
|
||||
taintSapling = GameRegistry
|
||||
.registerBlock(new BlockSaplingTainted().setBlockName("TaintSapling"), "TaintSapling");
|
||||
|
||||
taintStone = GameRegistry.registerBlock(new BlockStoneTainted(), ItemBlockStoneTainted.class, "TaintBlock");
|
||||
}
|
||||
|
||||
@@ -5,6 +5,7 @@ import net.minecraft.item.ItemBlock;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
public class ItemBlockStoneTainted extends ItemBlock {
|
||||
|
||||
public ItemBlockStoneTainted(Block block) {
|
||||
super(block);
|
||||
this.setHasSubtypes(true);
|
||||
|
||||
@@ -1,19 +1,20 @@
|
||||
package fox.spiteful.forbidden.client;
|
||||
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
|
||||
import cpw.mods.fml.client.registry.ClientRegistry;
|
||||
import cpw.mods.fml.common.registry.VillagerRegistry;
|
||||
import fox.spiteful.forbidden.CommonProxy;
|
||||
import fox.spiteful.forbidden.Config;
|
||||
import fox.spiteful.forbidden.tiles.TileEntityWrathCage;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
|
||||
public class ClientProxy extends CommonProxy {
|
||||
|
||||
@Override
|
||||
public void registerRenderInfo() {
|
||||
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityWrathCage.class, new TileEntityWrathCageRenderer());
|
||||
VillagerRegistry.instance()
|
||||
.registerVillagerSkin(
|
||||
Config.hereticID, new ResourceLocation("forbidden", "textures/models/heretic.png"));
|
||||
VillagerRegistry.instance().registerVillagerSkin(
|
||||
Config.hereticID,
|
||||
new ResourceLocation("forbidden", "textures/models/heretic.png"));
|
||||
}
|
||||
}
|
||||
@@ -1,17 +1,20 @@
|
||||
package fox.spiteful.forbidden.client;
|
||||
|
||||
import net.minecraft.client.renderer.entity.RenderManager;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.tiles.TileEntityWrathCage;
|
||||
import fox.spiteful.forbidden.tiles.WrathSpawnerLogic;
|
||||
import net.minecraft.client.renderer.entity.RenderManager;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public class TileEntityWrathCageRenderer extends TileEntitySpecialRenderer {
|
||||
|
||||
public void renderTileEntityWrathCage(TileEntityWrathCage wrathCage, double x, double z, double par6, float par8) {
|
||||
if (!wrathCage.getSpawnerLogic().isMobSet()) return;
|
||||
GL11.glPushMatrix();
|
||||
@@ -28,17 +31,17 @@ public class TileEntityWrathCageRenderer extends TileEntitySpecialRenderer {
|
||||
float f1 = 0.4375F;
|
||||
if (spawnLogic.getEntityNameToSpawn().equals("Ghast")) f1 = 0.1F;
|
||||
else if (spawnLogic.getEntityNameToSpawn().equals("Slime")
|
||||
|| spawnLogic.getEntityNameToSpawn().equals("ThaumSlime")) f1 = 0.4F;
|
||||
|| spawnLogic.getEntityNameToSpawn().equals("ThaumSlime"))
|
||||
f1 = 0.4F;
|
||||
else if (spawnLogic.getEntityNameToSpawn().equals("Enderman")) f1 = 0.3F;
|
||||
GL11.glTranslatef(0.0F, 0.4F, 0.0F);
|
||||
if (!spawnLogic
|
||||
.getSpawnerWorld()
|
||||
.isBlockIndirectlyGettingPowered(
|
||||
spawnLogic.getSpawnerX(), spawnLogic.getSpawnerY(), spawnLogic.getSpawnerZ()))
|
||||
if (!spawnLogic.getSpawnerWorld().isBlockIndirectlyGettingPowered(
|
||||
spawnLogic.getSpawnerX(),
|
||||
spawnLogic.getSpawnerY(),
|
||||
spawnLogic.getSpawnerZ()))
|
||||
GL11.glRotatef(
|
||||
(float) (spawnLogic.field_98284_d
|
||||
+ (spawnLogic.field_98287_c - spawnLogic.field_98284_d) * (double) par7)
|
||||
* 10.0F,
|
||||
+ (spawnLogic.field_98287_c - spawnLogic.field_98284_d) * (double) par7) * 10.0F,
|
||||
0.0F,
|
||||
1.0F,
|
||||
0.0F);
|
||||
|
||||
@@ -1,5 +1,22 @@
|
||||
package fox.spiteful.forbidden.compat;
|
||||
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
|
||||
import org.apache.logging.log4j.Level;
|
||||
|
||||
import thaumcraft.api.ItemApi;
|
||||
import thaumcraft.api.ThaumcraftApi;
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.api.aspects.AspectList;
|
||||
import thaumcraft.api.crafting.IArcaneRecipe;
|
||||
import thaumcraft.api.crafting.InfusionRecipe;
|
||||
import thaumcraft.api.potions.PotionFluxTaint;
|
||||
import thaumcraft.api.research.ResearchPage;
|
||||
import thaumcraft.common.config.ConfigItems;
|
||||
import WayofTime.alchemicalWizardry.api.alchemy.AlchemicalPotionCreationHandler;
|
||||
import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.AltarRecipeRegistry;
|
||||
import WayofTime.alchemicalWizardry.api.bindingRegistry.BindingRegistry;
|
||||
@@ -11,23 +28,9 @@ import fox.spiteful.forbidden.DarkResearchItem;
|
||||
import fox.spiteful.forbidden.LogHandler;
|
||||
import fox.spiteful.forbidden.items.ForbiddenItems;
|
||||
import fox.spiteful.forbidden.potions.DarkPotions;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
import org.apache.logging.log4j.Level;
|
||||
import thaumcraft.api.ItemApi;
|
||||
import thaumcraft.api.ThaumcraftApi;
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.api.aspects.AspectList;
|
||||
import thaumcraft.api.crafting.IArcaneRecipe;
|
||||
import thaumcraft.api.crafting.InfusionRecipe;
|
||||
import thaumcraft.api.potions.PotionFluxTaint;
|
||||
import thaumcraft.api.research.ResearchPage;
|
||||
import thaumcraft.common.config.ConfigItems;
|
||||
|
||||
public class BloodMagic {
|
||||
|
||||
public static void stab() {
|
||||
try {
|
||||
|
||||
@@ -47,20 +50,17 @@ public class BloodMagic {
|
||||
Item kamiOrb = Compat.getItem("AWWayofTime", "transcendentBloodOrb");
|
||||
|
||||
(new DarkResearchItem(
|
||||
"BLOODMAGIC",
|
||||
"FORBIDDEN",
|
||||
"[BM]",
|
||||
new AspectList(),
|
||||
-1,
|
||||
-1,
|
||||
0,
|
||||
new ResourceLocation("alchemicalwizardry", "textures/items/SacrificialDagger.png")))
|
||||
.setPages(new ResearchPage[] {new ResearchPage("forbidden.research_page.BLOODMAGIC.1")})
|
||||
.setParents(new String[] {"SCHOOLS"})
|
||||
.setRound()
|
||||
.setStub()
|
||||
.setAutoUnlock()
|
||||
.registerResearchItem();
|
||||
"BLOODMAGIC",
|
||||
"FORBIDDEN",
|
||||
"[BM]",
|
||||
new AspectList(),
|
||||
-1,
|
||||
-1,
|
||||
0,
|
||||
new ResourceLocation("alchemicalwizardry", "textures/items/SacrificialDagger.png")))
|
||||
.setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.BLOODMAGIC.1") })
|
||||
.setParents(new String[] { "SCHOOLS" }).setRound().setStub().setAutoUnlock()
|
||||
.registerResearchItem();
|
||||
|
||||
if (Config.crossWand) {
|
||||
|
||||
@@ -77,82 +77,50 @@ public class BloodMagic {
|
||||
"ROD_blood",
|
||||
new ItemStack(ForbiddenItems.wandCore, 1, 6),
|
||||
2,
|
||||
(new AspectList())
|
||||
.add(Aspect.LIFE, 32)
|
||||
.add(Aspect.MAGIC, 12)
|
||||
.add(Aspect.WATER, 16),
|
||||
(new AspectList()).add(Aspect.LIFE, 32).add(Aspect.MAGIC, 12).add(Aspect.WATER, 16),
|
||||
new ItemStack(masterOrb),
|
||||
new ItemStack[] {
|
||||
new ItemStack(magicales),
|
||||
new ItemStack(imbuedSlate),
|
||||
new ItemStack(imbuedSlate),
|
||||
new ItemStack(tennebrae),
|
||||
new ItemStack(sanctus),
|
||||
new ItemStack(aquasalus),
|
||||
new ItemStack(incendium),
|
||||
new ItemStack(terrae),
|
||||
new ItemStack(aether)
|
||||
});
|
||||
new ItemStack[] { new ItemStack(magicales), new ItemStack(imbuedSlate),
|
||||
new ItemStack(imbuedSlate), new ItemStack(tennebrae), new ItemStack(sanctus),
|
||||
new ItemStack(aquasalus), new ItemStack(incendium), new ItemStack(terrae),
|
||||
new ItemStack(aether) });
|
||||
(new DarkResearchItem(
|
||||
"ROD_blood",
|
||||
"FORBIDDEN",
|
||||
"[BM]",
|
||||
(new AspectList())
|
||||
.add(Aspect.LIFE, 5)
|
||||
.add(Aspect.WATER, 4)
|
||||
.add(Aspect.WEAPON, 3),
|
||||
-1,
|
||||
-3,
|
||||
3,
|
||||
new ItemStack(ForbiddenItems.wandCore, 1, 3)))
|
||||
.setPages(new ResearchPage[] {
|
||||
new ResearchPage("forbidden.research_page.ROD_blood.1"),
|
||||
new ResearchPage(blood_recipe),
|
||||
new ResearchPage("forbidden.research_page.ROD_blood.2")
|
||||
})
|
||||
.setParents(new String[] {"ROD_silverwood", "INFUSION", "BLOODMAGIC"})
|
||||
.setConcealed()
|
||||
.registerResearchItem();
|
||||
"ROD_blood",
|
||||
"FORBIDDEN",
|
||||
"[BM]",
|
||||
(new AspectList()).add(Aspect.LIFE, 5).add(Aspect.WATER, 4).add(Aspect.WEAPON, 3),
|
||||
-1,
|
||||
-3,
|
||||
3,
|
||||
new ItemStack(ForbiddenItems.wandCore, 1, 3)))
|
||||
.setPages(
|
||||
new ResearchPage[] { new ResearchPage("forbidden.research_page.ROD_blood.1"),
|
||||
new ResearchPage(blood_recipe),
|
||||
new ResearchPage("forbidden.research_page.ROD_blood.2") })
|
||||
.setParents(new String[] { "ROD_silverwood", "INFUSION", "BLOODMAGIC" }).setConcealed()
|
||||
.registerResearchItem();
|
||||
ThaumcraftApi.addWarpToResearch("ROD_blood", 2);
|
||||
|
||||
IArcaneRecipe blood_staff = ThaumcraftApi.addArcaneCraftingRecipe(
|
||||
"ROD_blood_staff",
|
||||
new ItemStack(ForbiddenItems.wandCore, 1, 9),
|
||||
(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, 3),
|
||||
Character.valueOf('D'),
|
||||
new ItemStack(demonShard)
|
||||
});
|
||||
(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, 3), Character.valueOf('D'),
|
||||
new ItemStack(demonShard) });
|
||||
(new DarkResearchItem(
|
||||
"ROD_blood_staff",
|
||||
"FORBIDDEN",
|
||||
"[BM]",
|
||||
(new AspectList())
|
||||
.add(Aspect.LIFE, 8)
|
||||
.add(Aspect.WATER, 7)
|
||||
.add(Aspect.WEAPON, 6),
|
||||
-3,
|
||||
-2,
|
||||
2,
|
||||
new ItemStack(ForbiddenItems.wandCore, 1, 9)))
|
||||
.setPages(new ResearchPage[] {
|
||||
new ResearchPage("forbidden.research_page.ROD_blood_staff.1"), new ResearchPage(blood_staff)
|
||||
})
|
||||
.setParents(new String[] {"ROD_silverwood_staff", "ROD_blood"})
|
||||
.setSpecial()
|
||||
.setConcealed()
|
||||
.registerResearchItem();
|
||||
"ROD_blood_staff",
|
||||
"FORBIDDEN",
|
||||
"[BM]",
|
||||
(new AspectList()).add(Aspect.LIFE, 8).add(Aspect.WATER, 7).add(Aspect.WEAPON, 6),
|
||||
-3,
|
||||
-2,
|
||||
2,
|
||||
new ItemStack(ForbiddenItems.wandCore, 1, 9))).setPages(
|
||||
new ResearchPage[] { new ResearchPage("forbidden.research_page.ROD_blood_staff.1"),
|
||||
new ResearchPage(blood_staff) })
|
||||
.setParents(new String[] { "ROD_silverwood_staff", "ROD_blood" }).setSpecial()
|
||||
.setConcealed().registerResearchItem();
|
||||
|
||||
InfusionRecipe alchemical_recipe = ThaumcraftApi.addInfusionCraftingRecipe(
|
||||
"CAP_alchemical",
|
||||
@@ -160,92 +128,68 @@ public class BloodMagic {
|
||||
3,
|
||||
(new AspectList()).add(Aspect.LIFE, 12).add(Aspect.WATER, 6),
|
||||
ItemApi.getItem("itemWandCap", 1),
|
||||
new ItemStack[] {new ItemStack(magicales), new ItemStack(magicales), new ItemStack(magicales)});
|
||||
new ItemStack[] { new ItemStack(magicales), new ItemStack(magicales),
|
||||
new ItemStack(magicales) });
|
||||
(new DarkResearchItem(
|
||||
"CAP_alchemical",
|
||||
"FORBIDDEN",
|
||||
"[BM]",
|
||||
(new AspectList())
|
||||
.add(Aspect.LIFE, 4)
|
||||
.add(Aspect.TOOL, 1)
|
||||
.add(Aspect.WATER, 3),
|
||||
-3,
|
||||
-3,
|
||||
2,
|
||||
new ItemStack(ForbiddenItems.wandCap, 1, 0)))
|
||||
.setPages(new ResearchPage[] {
|
||||
new ResearchPage("forbidden.research_page.CAP_alchemical.1"),
|
||||
new ResearchPage(alchemical_recipe)
|
||||
})
|
||||
.setParents(new String[] {"ROD_blood", "CAP_gold"})
|
||||
.setSecondary()
|
||||
.setConcealed()
|
||||
.registerResearchItem();
|
||||
"CAP_alchemical",
|
||||
"FORBIDDEN",
|
||||
"[BM]",
|
||||
(new AspectList()).add(Aspect.LIFE, 4).add(Aspect.TOOL, 1).add(Aspect.WATER, 3),
|
||||
-3,
|
||||
-3,
|
||||
2,
|
||||
new ItemStack(ForbiddenItems.wandCap, 1, 0))).setPages(
|
||||
new ResearchPage[] { new ResearchPage("forbidden.research_page.CAP_alchemical.1"),
|
||||
new ResearchPage(alchemical_recipe) })
|
||||
.setParents(new String[] { "ROD_blood", "CAP_gold" }).setSecondary().setConcealed()
|
||||
.registerResearchItem();
|
||||
}
|
||||
|
||||
IArcaneRecipe bloodwell_recipe = ThaumcraftApi.addShapelessArcaneCraftingRecipe(
|
||||
"BLOODWELL",
|
||||
new ItemStack(ForbiddenItems.bloodwell, 1, 0),
|
||||
(new AspectList()).add(Aspect.WATER, 10).add(Aspect.EARTH, 10),
|
||||
new Object[] {
|
||||
new ItemStack(Items.feather, 1, 0),
|
||||
new ItemStack(bloodBucket, 1, 0),
|
||||
new ItemStack(Items.glass_bottle, 1, 0),
|
||||
new ItemStack(crapOrb, 1, 0)
|
||||
});
|
||||
new Object[] { new ItemStack(Items.feather, 1, 0), new ItemStack(bloodBucket, 1, 0),
|
||||
new ItemStack(Items.glass_bottle, 1, 0), new ItemStack(crapOrb, 1, 0) });
|
||||
(new DarkResearchItem(
|
||||
"BLOODWELL",
|
||||
"FORBIDDEN",
|
||||
"[BM]",
|
||||
(new AspectList())
|
||||
.add(Aspect.LIFE, 5)
|
||||
.add(Aspect.MIND, 4)
|
||||
.add(Aspect.SENSES, 3),
|
||||
1,
|
||||
-1,
|
||||
1,
|
||||
new ItemStack(ForbiddenItems.bloodwell, 1, 0)))
|
||||
.setPages(new ResearchPage[] {
|
||||
new ResearchPage("forbidden.research_page.BLOODWELL.1"), new ResearchPage(bloodwell_recipe)
|
||||
})
|
||||
.setParents(new String[] {"BLOODMAGIC"})
|
||||
.registerResearchItem();
|
||||
"BLOODWELL",
|
||||
"FORBIDDEN",
|
||||
"[BM]",
|
||||
(new AspectList()).add(Aspect.LIFE, 5).add(Aspect.MIND, 4).add(Aspect.SENSES, 3),
|
||||
1,
|
||||
-1,
|
||||
1,
|
||||
new ItemStack(ForbiddenItems.bloodwell, 1, 0)))
|
||||
.setPages(
|
||||
new ResearchPage[] { new ResearchPage("forbidden.research_page.BLOODWELL.1"),
|
||||
new ResearchPage(bloodwell_recipe) })
|
||||
.setParents(new String[] { "BLOODMAGIC" }).registerResearchItem();
|
||||
|
||||
InfusionRecipe blood_rapier = ThaumcraftApi.addInfusionCraftingRecipe(
|
||||
"BLOODRAPIER",
|
||||
new ItemStack(ForbiddenItems.bloodRapier, 1, 0),
|
||||
8,
|
||||
(new AspectList())
|
||||
.add(Aspect.LIFE, 18)
|
||||
.add(Aspect.HUNGER, 32)
|
||||
.add(Aspect.WEAPON, 8),
|
||||
(new AspectList()).add(Aspect.LIFE, 18).add(Aspect.HUNGER, 32).add(Aspect.WEAPON, 8),
|
||||
ItemApi.getItem("itemSwordVoid", 0),
|
||||
new ItemStack[] {
|
||||
new ItemStack(ConfigItems.itemResource, 1, 12),
|
||||
new ItemStack(ForbiddenItems.deadlyShards, 1, 0),
|
||||
new ItemStack(ForbiddenItems.gluttonyShard, 1, 0),
|
||||
new ItemStack(Items.feather),
|
||||
new ItemStack(ConfigItems.itemResource, 1, 6)
|
||||
});
|
||||
new ItemStack[] { new ItemStack(ConfigItems.itemResource, 1, 12),
|
||||
new ItemStack(ForbiddenItems.deadlyShards, 1, 0),
|
||||
new ItemStack(ForbiddenItems.gluttonyShard, 1, 0), new ItemStack(Items.feather),
|
||||
new ItemStack(ConfigItems.itemResource, 1, 6) });
|
||||
(new DarkResearchItem(
|
||||
"BLOODRAPIER",
|
||||
"FORBIDDEN",
|
||||
"[BM]",
|
||||
(new AspectList())
|
||||
.add(Aspect.LIFE, 16)
|
||||
.add(Aspect.HUNGER, 12)
|
||||
.add(Aspect.WEAPON, 12)
|
||||
.add(Aspect.MAGIC, 12),
|
||||
1,
|
||||
-2,
|
||||
3,
|
||||
new ItemStack(ForbiddenItems.bloodRapier, 1, 0)))
|
||||
.setPages(new ResearchPage[] {
|
||||
new ResearchPage("forbidden.research_page.BLOODRAPIER.1"), new ResearchPage(blood_rapier)
|
||||
})
|
||||
.setParents(new String[] {"BLOODMAGIC", "INFUSION", "VOIDMETAL"})
|
||||
.setConcealed()
|
||||
.registerResearchItem();
|
||||
"BLOODRAPIER",
|
||||
"FORBIDDEN",
|
||||
"[BM]",
|
||||
(new AspectList()).add(Aspect.LIFE, 16).add(Aspect.HUNGER, 12).add(Aspect.WEAPON, 12)
|
||||
.add(Aspect.MAGIC, 12),
|
||||
1,
|
||||
-2,
|
||||
3,
|
||||
new ItemStack(ForbiddenItems.bloodRapier, 1, 0)))
|
||||
.setPages(
|
||||
new ResearchPage[] { new ResearchPage("forbidden.research_page.BLOODRAPIER.1"),
|
||||
new ResearchPage(blood_rapier) })
|
||||
.setParents(new String[] { "BLOODMAGIC", "INFUSION", "VOIDMETAL" }).setConcealed()
|
||||
.registerResearchItem();
|
||||
ThaumcraftApi.addWarpToResearch("BLOODRAPIER", 2);
|
||||
ThaumcraftApi.addWarpToItem(new ItemStack(ForbiddenItems.bloodRapier), 2);
|
||||
|
||||
@@ -253,53 +197,41 @@ public class BloodMagic {
|
||||
"ELDRITCHORB",
|
||||
new ItemStack(ForbiddenItems.bloodOrb, 1, 0),
|
||||
2,
|
||||
(new AspectList())
|
||||
.add(Aspect.LIFE, 64)
|
||||
.add(Aspect.ELDRITCH, 48)
|
||||
.add(Aspect.DARKNESS, 32)
|
||||
(new AspectList()).add(Aspect.LIFE, 64).add(Aspect.ELDRITCH, 48).add(Aspect.DARKNESS, 32)
|
||||
.add(Aspect.VOID, 64),
|
||||
new ItemStack(kamiOrb),
|
||||
new ItemStack[] {
|
||||
new ItemStack(ConfigItems.itemEldritchObject, 1, 3),
|
||||
new ItemStack(ConfigItems.itemEldritchObject, 1, 0),
|
||||
new ItemStack(ConfigItems.itemShard, 1, 6),
|
||||
new ItemStack(ConfigItems.itemResource, 1, 16),
|
||||
new ItemStack(ConfigItems.itemResource, 1, 16),
|
||||
new ItemStack(Items.nether_star),
|
||||
new ItemStack(ConfigItems.itemResource, 1, 16),
|
||||
new ItemStack(ConfigItems.itemResource, 1, 16),
|
||||
new ItemStack(ConfigItems.itemShard, 1, 6),
|
||||
new ItemStack(ConfigItems.itemEldritchObject, 1, 0)
|
||||
});
|
||||
new ItemStack[] { new ItemStack(ConfigItems.itemEldritchObject, 1, 3),
|
||||
new ItemStack(ConfigItems.itemEldritchObject, 1, 0),
|
||||
new ItemStack(ConfigItems.itemShard, 1, 6), new ItemStack(ConfigItems.itemResource, 1, 16),
|
||||
new ItemStack(ConfigItems.itemResource, 1, 16), new ItemStack(Items.nether_star),
|
||||
new ItemStack(ConfigItems.itemResource, 1, 16),
|
||||
new ItemStack(ConfigItems.itemResource, 1, 16), new ItemStack(ConfigItems.itemShard, 1, 6),
|
||||
new ItemStack(ConfigItems.itemEldritchObject, 1, 0) });
|
||||
(new DarkResearchItem(
|
||||
"ELDRITCHORB",
|
||||
"FORBIDDEN",
|
||||
"[BM]",
|
||||
(new AspectList())
|
||||
.add(Aspect.LIFE, 24)
|
||||
.add(Aspect.VOID, 32)
|
||||
.add(Aspect.CRYSTAL, 24)
|
||||
.add(Aspect.ELDRITCH, 12),
|
||||
1,
|
||||
-3,
|
||||
4,
|
||||
new ItemStack(ForbiddenItems.bloodOrb, 1, 0)))
|
||||
.setPages(new ResearchPage[] {
|
||||
new ResearchPage("forbidden.research_page.ELDRITCHORB.1"), new ResearchPage(eldritch_orb)
|
||||
})
|
||||
.setParents(new String[] {"BLOODMAGIC", "INFUSION", "PRIMPEARL", "VOIDMETAL"})
|
||||
.setConcealed()
|
||||
.setSpecial()
|
||||
.registerResearchItem();
|
||||
"ELDRITCHORB",
|
||||
"FORBIDDEN",
|
||||
"[BM]",
|
||||
(new AspectList()).add(Aspect.LIFE, 24).add(Aspect.VOID, 32).add(Aspect.CRYSTAL, 24)
|
||||
.add(Aspect.ELDRITCH, 12),
|
||||
1,
|
||||
-3,
|
||||
4,
|
||||
new ItemStack(ForbiddenItems.bloodOrb, 1, 0)))
|
||||
.setPages(
|
||||
new ResearchPage[] { new ResearchPage("forbidden.research_page.ELDRITCHORB.1"),
|
||||
new ResearchPage(eldritch_orb) })
|
||||
.setParents(new String[] { "BLOODMAGIC", "INFUSION", "PRIMPEARL", "VOIDMETAL" })
|
||||
.setConcealed().setSpecial().registerResearchItem();
|
||||
ThaumcraftApi.addWarpToResearch("ELDRITCHORB", 3);
|
||||
ThaumcraftApi.addWarpToItem(new ItemStack(ForbiddenItems.bloodOrb), 5);
|
||||
|
||||
BindingRegistry.registerRecipe(
|
||||
new ItemStack(ForbiddenItems.boundwell, 1, 0), new ItemStack(ForbiddenItems.crystalwell, 1, 0));
|
||||
AlchemicalPotionCreationHandler.addPotion(
|
||||
new ItemStack(ConfigItems.itemResource, 1, 11), PotionFluxTaint.instance.getId(), 450);
|
||||
AlchemicalPotionCreationHandler.addPotion(
|
||||
new ItemStack(ForbiddenItems.resource, 1, 3), DarkPotions.bloodSeal.getId(), 1200);
|
||||
new ItemStack(ForbiddenItems.boundwell, 1, 0),
|
||||
new ItemStack(ForbiddenItems.crystalwell, 1, 0));
|
||||
AlchemicalPotionCreationHandler
|
||||
.addPotion(new ItemStack(ConfigItems.itemResource, 1, 11), PotionFluxTaint.instance.getId(), 450);
|
||||
AlchemicalPotionCreationHandler
|
||||
.addPotion(new ItemStack(ForbiddenItems.resource, 1, 3), DarkPotions.bloodSeal.getId(), 1200);
|
||||
|
||||
Rituals.registerRitual("SpiteSanity", 1, 20000, new RitualSanity(), "Plea of Delayed Insanity");
|
||||
|
||||
@@ -315,64 +247,36 @@ public class BloodMagic {
|
||||
list = (new AspectList()).add(Aspect.LIFE, 16).add(Aspect.MAGIC, 8).add(Aspect.CRYSTAL, 4);
|
||||
ThaumcraftApi.registerObjectTag(new ItemStack(masterOrb, 1, OreDictionary.WILDCARD_VALUE), list);
|
||||
|
||||
list = (new AspectList())
|
||||
.add(Aspect.LIFE, 16)
|
||||
.add(DarkAspects.NETHER, 8)
|
||||
.add(Aspect.CRYSTAL, 4)
|
||||
.add(Aspect.FIRE, 1)
|
||||
.add(Aspect.WATER, 1)
|
||||
.add(Aspect.AIR, 1)
|
||||
.add(Aspect.EARTH, 1)
|
||||
.add(Aspect.LIGHT, 1)
|
||||
.add(Aspect.DARKNESS, 1);
|
||||
list = (new AspectList()).add(Aspect.LIFE, 16).add(DarkAspects.NETHER, 8).add(Aspect.CRYSTAL, 4)
|
||||
.add(Aspect.FIRE, 1).add(Aspect.WATER, 1).add(Aspect.AIR, 1).add(Aspect.EARTH, 1)
|
||||
.add(Aspect.LIGHT, 1).add(Aspect.DARKNESS, 1);
|
||||
ThaumcraftApi.registerObjectTag(new ItemStack(demonShard, 1, OreDictionary.WILDCARD_VALUE), list);
|
||||
|
||||
list = (new AspectList())
|
||||
.add(Aspect.LIFE, 32)
|
||||
.add(DarkAspects.NETHER, 4)
|
||||
.add(Aspect.MAGIC, 8)
|
||||
list = (new AspectList()).add(Aspect.LIFE, 32).add(DarkAspects.NETHER, 4).add(Aspect.MAGIC, 8)
|
||||
.add(Aspect.CRYSTAL, 4);
|
||||
aspectBloodItem("archmageBloodOrb", OreDictionary.WILDCARD_VALUE, list);
|
||||
|
||||
list = (new AspectList())
|
||||
.add(Aspect.LIFE, 32)
|
||||
.add(DarkAspects.NETHER, 16)
|
||||
.add(Aspect.MAGIC, 16)
|
||||
list = (new AspectList()).add(Aspect.LIFE, 32).add(DarkAspects.NETHER, 16).add(Aspect.MAGIC, 16)
|
||||
.add(Aspect.CRYSTAL, 16);
|
||||
ThaumcraftApi.registerObjectTag(new ItemStack(kamiOrb, 1, OreDictionary.WILDCARD_VALUE), list);
|
||||
|
||||
list = (new AspectList())
|
||||
.add(Aspect.ELDRITCH, 5)
|
||||
.add(Aspect.WEAPON, 5)
|
||||
.add(DarkAspects.WRATH, 5)
|
||||
list = (new AspectList()).add(Aspect.ELDRITCH, 5).add(Aspect.WEAPON, 5).add(DarkAspects.WRATH, 5)
|
||||
.add(Aspect.POISON, 1);
|
||||
aspectBloodItem("energySword", OreDictionary.WILDCARD_VALUE, list);
|
||||
|
||||
list = (new AspectList())
|
||||
.add(Aspect.ELDRITCH, 5)
|
||||
.add(Aspect.WEAPON, 6)
|
||||
.add(DarkAspects.WRATH, 6)
|
||||
list = (new AspectList()).add(Aspect.ELDRITCH, 5).add(Aspect.WEAPON, 6).add(DarkAspects.WRATH, 6)
|
||||
.add(Aspect.POISON, 1);
|
||||
aspectBloodItem("energyBlaster", OreDictionary.WILDCARD_VALUE, list);
|
||||
|
||||
list = (new AspectList())
|
||||
.add(Aspect.ELDRITCH, 6)
|
||||
.add(Aspect.MINE, 5)
|
||||
.add(DarkAspects.WRATH, 4)
|
||||
list = (new AspectList()).add(Aspect.ELDRITCH, 6).add(Aspect.MINE, 5).add(DarkAspects.WRATH, 4)
|
||||
.add(Aspect.TRAP, 4);
|
||||
aspectBloodItem("boundPickaxe", OreDictionary.WILDCARD_VALUE, list);
|
||||
|
||||
list = (new AspectList())
|
||||
.add(Aspect.ELDRITCH, 4)
|
||||
.add(Aspect.TOOL, 5)
|
||||
.add(DarkAspects.WRATH, 2)
|
||||
list = (new AspectList()).add(Aspect.ELDRITCH, 4).add(Aspect.TOOL, 5).add(DarkAspects.WRATH, 2)
|
||||
.add(Aspect.TRAP, 2);
|
||||
aspectBloodItem("boundShovel", OreDictionary.WILDCARD_VALUE, list);
|
||||
|
||||
list = (new AspectList())
|
||||
.add(Aspect.ELDRITCH, 6)
|
||||
.add(Aspect.TOOL, 5)
|
||||
.add(DarkAspects.WRATH, 4)
|
||||
list = (new AspectList()).add(Aspect.ELDRITCH, 6).add(Aspect.TOOL, 5).add(DarkAspects.WRATH, 4)
|
||||
.add(Aspect.TRAP, 4);
|
||||
aspectBloodItem("boundAxe", OreDictionary.WILDCARD_VALUE, list);
|
||||
|
||||
|
||||
@@ -1,16 +1,12 @@
|
||||
package fox.spiteful.forbidden.compat;
|
||||
|
||||
import com.pahimar.ee3.api.exchange.EnergyValueRegistryProxy;
|
||||
import cpw.mods.fml.common.Loader;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import fox.spiteful.forbidden.*;
|
||||
import fox.spiteful.forbidden.blocks.ForbiddenBlocks;
|
||||
import fox.spiteful.forbidden.items.ForbiddenItems;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
|
||||
import org.apache.logging.log4j.Level;
|
||||
|
||||
import thaumcraft.api.ItemApi;
|
||||
import thaumcraft.api.ThaumcraftApi;
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
@@ -21,7 +17,16 @@ import thaumcraft.api.research.ResearchPage;
|
||||
import thaumcraft.common.config.ConfigBlocks;
|
||||
import thaumcraft.common.config.ConfigItems;
|
||||
|
||||
import com.pahimar.ee3.api.exchange.EnergyValueRegistryProxy;
|
||||
|
||||
import cpw.mods.fml.common.Loader;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import fox.spiteful.forbidden.*;
|
||||
import fox.spiteful.forbidden.blocks.ForbiddenBlocks;
|
||||
import fox.spiteful.forbidden.items.ForbiddenItems;
|
||||
|
||||
public class Compat {
|
||||
|
||||
public static boolean tt = false;
|
||||
public static boolean kami = false;
|
||||
public static boolean natura = false;
|
||||
@@ -42,7 +47,7 @@ public class Compat {
|
||||
botan = Config.botan && Loader.isModLoaded("Botania");
|
||||
special = Config.wrathCage && Config.special && Loader.isModLoaded("SpecialMobs");
|
||||
twilight = Config.wrathCage && Config.twilight && Loader.isModLoaded("TwilightForest");
|
||||
ee3 = (Config.emc /* || Config.eewand*/) && Loader.isModLoaded("EE3");
|
||||
ee3 = (Config.emc /* || Config.eewand */) && Loader.isModLoaded("EE3");
|
||||
}
|
||||
|
||||
public static void compatify() {
|
||||
@@ -52,25 +57,17 @@ public class Compat {
|
||||
if (tt) {
|
||||
if (!kami) {
|
||||
try {
|
||||
kami = Class.forName("thaumic.tinkerer.common.core.handler.ConfigHandler")
|
||||
.getField("enableKami")
|
||||
kami = Class.forName("thaumic.tinkerer.common.core.handler.ConfigHandler").getField("enableKami")
|
||||
.getBoolean(null);
|
||||
} catch (Exception e) {
|
||||
}
|
||||
} catch (Exception e) {}
|
||||
}
|
||||
|
||||
if (kami) {
|
||||
try {
|
||||
Item kamiResource = getItem("ThaumicTinkerer", "kamiResource");
|
||||
list = new AspectList()
|
||||
.add(DarkAspects.NETHER, 2)
|
||||
.add(Aspect.MAGIC, 1)
|
||||
.add(Aspect.CRYSTAL, 1);
|
||||
list = new AspectList().add(DarkAspects.NETHER, 2).add(Aspect.MAGIC, 1).add(Aspect.CRYSTAL, 1);
|
||||
ThaumcraftApi.registerObjectTag(new ItemStack(kamiResource, 1, 6), list);
|
||||
list = new AspectList()
|
||||
.add(Aspect.ELDRITCH, 2)
|
||||
.add(Aspect.MAGIC, 1)
|
||||
.add(Aspect.CRYSTAL, 1);
|
||||
list = new AspectList().add(Aspect.ELDRITCH, 2).add(Aspect.MAGIC, 1).add(Aspect.CRYSTAL, 1);
|
||||
ThaumcraftApi.registerObjectTag(new ItemStack(kamiResource, 1, 7), list);
|
||||
|
||||
} catch (Exception e) {
|
||||
@@ -82,27 +79,15 @@ public class Compat {
|
||||
|
||||
if (natura) {
|
||||
try {
|
||||
list = (new AspectList())
|
||||
.add(Aspect.BEAST, 2)
|
||||
.add(DarkAspects.NETHER, 4)
|
||||
.add(DarkAspects.SLOTH, 2);
|
||||
list = (new AspectList()).add(Aspect.BEAST, 2).add(DarkAspects.NETHER, 4).add(DarkAspects.SLOTH, 2);
|
||||
ThaumcraftApi.registerEntityTag("Natura.Imp", list);
|
||||
list = (new AspectList())
|
||||
.add(Aspect.BEAST, 3)
|
||||
.add(Aspect.FIRE, 3)
|
||||
.add(DarkAspects.NETHER, 2);
|
||||
list = (new AspectList()).add(Aspect.BEAST, 3).add(Aspect.FIRE, 3).add(DarkAspects.NETHER, 2);
|
||||
ThaumcraftApi.registerEntityTag("Natura.HeatscarSpider", list);
|
||||
ThaumcraftApi.registerEntityTag("Natura.FlameSpider", list);
|
||||
list = (new AspectList())
|
||||
.add(Aspect.BEAST, 1)
|
||||
.add(Aspect.FIRE, 2)
|
||||
.add(DarkAspects.NETHER, 1);
|
||||
list = (new AspectList()).add(Aspect.BEAST, 1).add(Aspect.FIRE, 2).add(DarkAspects.NETHER, 1);
|
||||
ThaumcraftApi.registerEntityTag("Natura.BabyHeatscarSpider", list);
|
||||
ThaumcraftApi.registerEntityTag("Natura.FlameSpiderBaby", list);
|
||||
list = (new AspectList())
|
||||
.add(Aspect.BEAST, 2)
|
||||
.add(Aspect.FIRE, 4)
|
||||
.add(DarkAspects.NETHER, 2)
|
||||
list = (new AspectList()).add(Aspect.BEAST, 2).add(Aspect.FIRE, 4).add(DarkAspects.NETHER, 2)
|
||||
.add(Aspect.ENTROPY, 4);
|
||||
ThaumcraftApi.registerEntityTag("Natura.NitroCreeper", list);
|
||||
|
||||
@@ -132,15 +117,9 @@ public class Compat {
|
||||
|
||||
i = GameRegistry.findItemStack("Natura", "rawImphide", 1);
|
||||
if (i != null) {
|
||||
list = (new AspectList())
|
||||
.add(Aspect.FLESH, 4)
|
||||
.add(Aspect.HUNGER, 1)
|
||||
.add(DarkAspects.NETHER, 1);
|
||||
list = (new AspectList()).add(Aspect.FLESH, 4).add(Aspect.HUNGER, 1).add(DarkAspects.NETHER, 1);
|
||||
ThaumcraftApi.registerObjectTag(new ItemStack(i.getItem(), 1, 0), list);
|
||||
list = (new AspectList())
|
||||
.add(Aspect.FLESH, 4)
|
||||
.add(Aspect.POISON, 2)
|
||||
.add(Aspect.FIRE, 2)
|
||||
list = (new AspectList()).add(Aspect.FLESH, 4).add(Aspect.POISON, 2).add(Aspect.FIRE, 2)
|
||||
.add(DarkAspects.NETHER, 1);
|
||||
ThaumcraftApi.registerObjectTag(new ItemStack(i.getItem(), 1, 1), list);
|
||||
}
|
||||
@@ -170,43 +149,26 @@ public class Compat {
|
||||
"ROD_witchwood",
|
||||
new ItemStack(ForbiddenItems.wandCore, 1, 4),
|
||||
5,
|
||||
(new AspectList())
|
||||
.add(Aspect.MAGIC, 16)
|
||||
.add(Aspect.EARTH, 9)
|
||||
.add(Aspect.WATER, 9)
|
||||
.add(Aspect.FIRE, 9)
|
||||
.add(Aspect.AIR, 9),
|
||||
(new AspectList()).add(Aspect.MAGIC, 16).add(Aspect.EARTH, 9).add(Aspect.WATER, 9)
|
||||
.add(Aspect.FIRE, 9).add(Aspect.AIR, 9),
|
||||
new ItemStack(witchwood),
|
||||
new ItemStack[] {
|
||||
new ItemStack(essence, 1, 0),
|
||||
new ItemStack(amOre, 1, 3),
|
||||
new ItemStack(essence, 1, 1),
|
||||
new ItemStack(essence, 1, 2),
|
||||
new ItemStack(essence, 1, 3),
|
||||
new ItemStack(essence, 1, 4),
|
||||
new ItemStack(amOre, 1, 6),
|
||||
new ItemStack(amOre, 1, 7),
|
||||
new ItemStack(amOre, 1, 2)
|
||||
});
|
||||
new ItemStack[] { new ItemStack(essence, 1, 0), new ItemStack(amOre, 1, 3),
|
||||
new ItemStack(essence, 1, 1), new ItemStack(essence, 1, 2),
|
||||
new ItemStack(essence, 1, 3), new ItemStack(essence, 1, 4), new ItemStack(amOre, 1, 6),
|
||||
new ItemStack(amOre, 1, 7), new ItemStack(amOre, 1, 2) });
|
||||
(new DarkResearchItem(
|
||||
"ROD_witchwood",
|
||||
"FORBIDDEN",
|
||||
"[AM2]",
|
||||
(new AspectList())
|
||||
.add(Aspect.MAGIC, 6)
|
||||
.add(Aspect.TREE, 5)
|
||||
.add(Aspect.MIND, 4),
|
||||
-3,
|
||||
1,
|
||||
3,
|
||||
new ItemStack(ForbiddenItems.wandCore, 1, 4)))
|
||||
.setPages(new ResearchPage[] {
|
||||
new ResearchPage("forbidden.research_page.ROD_witchwood.1"),
|
||||
new ResearchPage(witchwood_recipe)
|
||||
})
|
||||
.setParents(new String[] {"SCHOOLS", "ROD_silverwood", "INFUSION"})
|
||||
.setConcealed()
|
||||
.registerResearchItem();
|
||||
"ROD_witchwood",
|
||||
"FORBIDDEN",
|
||||
"[AM2]",
|
||||
(new AspectList()).add(Aspect.MAGIC, 6).add(Aspect.TREE, 5).add(Aspect.MIND, 4),
|
||||
-3,
|
||||
1,
|
||||
3,
|
||||
new ItemStack(ForbiddenItems.wandCore, 1, 4))).setPages(
|
||||
new ResearchPage[] { new ResearchPage("forbidden.research_page.ROD_witchwood.1"),
|
||||
new ResearchPage(witchwood_recipe) })
|
||||
.setParents(new String[] { "SCHOOLS", "ROD_silverwood", "INFUSION" }).setConcealed()
|
||||
.registerResearchItem();
|
||||
ThaumcraftApi.addWarpToResearch("ROD_witchwood", 2);
|
||||
|
||||
InfusionRecipe vinteum_recipe = ThaumcraftApi.addInfusionCraftingRecipe(
|
||||
@@ -215,68 +177,44 @@ public class Compat {
|
||||
5,
|
||||
(new AspectList()).add(Aspect.ENERGY, 12).add(Aspect.MAGIC, 6),
|
||||
ItemApi.getItem("itemWandCap", 6),
|
||||
new ItemStack[] {
|
||||
new ItemStack(amOre, 1, 0), new ItemStack(amOre, 1, 0), new ItemStack(amOre, 1, 0)
|
||||
});
|
||||
new ItemStack[] { new ItemStack(amOre, 1, 0), new ItemStack(amOre, 1, 0),
|
||||
new ItemStack(amOre, 1, 0) });
|
||||
(new DarkResearchItem(
|
||||
"CAP_vinteum",
|
||||
"FORBIDDEN",
|
||||
"[AM2]",
|
||||
(new AspectList())
|
||||
.add(Aspect.MAGIC, 4)
|
||||
.add(Aspect.TOOL, 1)
|
||||
.add(Aspect.ENERGY, 2),
|
||||
-4,
|
||||
-1,
|
||||
1,
|
||||
new ItemStack(ForbiddenItems.wandCap, 1, 1)))
|
||||
.setPages(new ResearchPage[] {
|
||||
new ResearchPage("forbidden.research_page.CAP_vinteum.1"), new ResearchPage(vinteum_recipe)
|
||||
})
|
||||
.setParents(new String[] {"ROD_witchwood", "CAP_thaumium"})
|
||||
.setSecondary()
|
||||
.setConcealed()
|
||||
.registerResearchItem();
|
||||
"CAP_vinteum",
|
||||
"FORBIDDEN",
|
||||
"[AM2]",
|
||||
(new AspectList()).add(Aspect.MAGIC, 4).add(Aspect.TOOL, 1).add(Aspect.ENERGY, 2),
|
||||
-4,
|
||||
-1,
|
||||
1,
|
||||
new ItemStack(ForbiddenItems.wandCap, 1, 1)))
|
||||
.setPages(
|
||||
new ResearchPage[] { new ResearchPage("forbidden.research_page.CAP_vinteum.1"),
|
||||
new ResearchPage(vinteum_recipe) })
|
||||
.setParents(new String[] { "ROD_witchwood", "CAP_thaumium" }).setSecondary()
|
||||
.setConcealed().registerResearchItem();
|
||||
|
||||
IArcaneRecipe witchwood_staff = ThaumcraftApi.addArcaneCraftingRecipe(
|
||||
"ROD_witchwood_staff",
|
||||
new ItemStack(ForbiddenItems.wandCore, 1, 10),
|
||||
(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, 4),
|
||||
Character.valueOf('D'),
|
||||
new ItemStack(essence, 1, 10)
|
||||
});
|
||||
(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, 4), Character.valueOf('D'),
|
||||
new ItemStack(essence, 1, 10) });
|
||||
(new DarkResearchItem(
|
||||
"ROD_witchwood_staff",
|
||||
"FORBIDDEN",
|
||||
"[AM2]",
|
||||
(new AspectList())
|
||||
.add(Aspect.MAGIC, 8)
|
||||
.add(Aspect.MIND, 7)
|
||||
.add(Aspect.TOOL, 6),
|
||||
-3,
|
||||
-1,
|
||||
2,
|
||||
new ItemStack(ForbiddenItems.wandCore, 1, 10)))
|
||||
.setPages(new ResearchPage[] {
|
||||
new ResearchPage("forbidden.research_page.ROD_witchwood_staff.1"),
|
||||
new ResearchPage(witchwood_staff)
|
||||
})
|
||||
.setParents(new String[] {"ROD_silverwood_staff", "ROD_witchwood"})
|
||||
.setSpecial()
|
||||
.setConcealed()
|
||||
.registerResearchItem();
|
||||
"ROD_witchwood_staff",
|
||||
"FORBIDDEN",
|
||||
"[AM2]",
|
||||
(new AspectList()).add(Aspect.MAGIC, 8).add(Aspect.MIND, 7).add(Aspect.TOOL, 6),
|
||||
-3,
|
||||
-1,
|
||||
2,
|
||||
new ItemStack(ForbiddenItems.wandCore, 1, 10))).setPages(
|
||||
new ResearchPage[] { new ResearchPage("forbidden.research_page.ROD_witchwood_staff.1"),
|
||||
new ResearchPage(witchwood_staff) })
|
||||
.setParents(new String[] { "ROD_silverwood_staff", "ROD_witchwood" }).setSpecial()
|
||||
.setConcealed().registerResearchItem();
|
||||
} catch (Exception e) {
|
||||
LogHandler.log(Level.INFO, e, "Forbidden Magic was slain by a Hecate.");
|
||||
am2 = false;
|
||||
@@ -296,8 +234,8 @@ public class Compat {
|
||||
if (Config.emc) {
|
||||
try {
|
||||
for (int x = 0; x < 6; x++) {
|
||||
EnergyValueRegistryProxy.addPreAssignedEnergyValue(
|
||||
new ItemStack(ConfigItems.itemShard, 1, x), 256);
|
||||
EnergyValueRegistryProxy
|
||||
.addPreAssignedEnergyValue(new ItemStack(ConfigItems.itemShard, 1, x), 256);
|
||||
}
|
||||
// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ConfigItems.itemShard, 1, 6),
|
||||
// 354);
|
||||
@@ -307,28 +245,28 @@ public class Compat {
|
||||
// 459);
|
||||
// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ConfigItems.itemResource, 1, 2),
|
||||
// 272);
|
||||
EnergyValueRegistryProxy.addPreAssignedEnergyValue(
|
||||
new ItemStack(ConfigItems.itemResource, 1, 3), 64);
|
||||
EnergyValueRegistryProxy.addPreAssignedEnergyValue(
|
||||
new ItemStack(ConfigItems.itemResource, 1, 4), 32);
|
||||
EnergyValueRegistryProxy.addPreAssignedEnergyValue(
|
||||
new ItemStack(ConfigItems.itemResource, 1, 6), 32);
|
||||
EnergyValueRegistryProxy.addPreAssignedEnergyValue(
|
||||
new ItemStack(ConfigItems.itemResource, 1, 7), 112);
|
||||
EnergyValueRegistryProxy.addPreAssignedEnergyValue(
|
||||
new ItemStack(ConfigItems.itemResource, 1, 8), 2056);
|
||||
EnergyValueRegistryProxy.addPreAssignedEnergyValue(
|
||||
new ItemStack(ConfigItems.itemResource, 1, 9), 5120);
|
||||
EnergyValueRegistryProxy.addPreAssignedEnergyValue(
|
||||
new ItemStack(ConfigItems.itemResource, 1, 11), 32);
|
||||
EnergyValueRegistryProxy.addPreAssignedEnergyValue(
|
||||
new ItemStack(ConfigItems.itemResource, 1, 12), 32);
|
||||
EnergyValueRegistryProxy
|
||||
.addPreAssignedEnergyValue(new ItemStack(ConfigItems.itemResource, 1, 3), 64);
|
||||
EnergyValueRegistryProxy
|
||||
.addPreAssignedEnergyValue(new ItemStack(ConfigItems.itemResource, 1, 4), 32);
|
||||
EnergyValueRegistryProxy
|
||||
.addPreAssignedEnergyValue(new ItemStack(ConfigItems.itemResource, 1, 6), 32);
|
||||
EnergyValueRegistryProxy
|
||||
.addPreAssignedEnergyValue(new ItemStack(ConfigItems.itemResource, 1, 7), 112);
|
||||
EnergyValueRegistryProxy
|
||||
.addPreAssignedEnergyValue(new ItemStack(ConfigItems.itemResource, 1, 8), 2056);
|
||||
EnergyValueRegistryProxy
|
||||
.addPreAssignedEnergyValue(new ItemStack(ConfigItems.itemResource, 1, 9), 5120);
|
||||
EnergyValueRegistryProxy
|
||||
.addPreAssignedEnergyValue(new ItemStack(ConfigItems.itemResource, 1, 11), 32);
|
||||
EnergyValueRegistryProxy
|
||||
.addPreAssignedEnergyValue(new ItemStack(ConfigItems.itemResource, 1, 12), 32);
|
||||
// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ConfigItems.itemResource, 1,
|
||||
// 14), 354);
|
||||
// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ConfigItems.itemResource, 1,
|
||||
// 15), 5986);
|
||||
EnergyValueRegistryProxy.addPreAssignedEnergyValue(
|
||||
new ItemStack(ConfigItems.itemResource, 1, 18), 227.556F);
|
||||
EnergyValueRegistryProxy
|
||||
.addPreAssignedEnergyValue(new ItemStack(ConfigItems.itemResource, 1, 18), 227.556F);
|
||||
EnergyValueRegistryProxy.addPreAssignedEnergyValue(ConfigItems.itemZombieBrain, 1024);
|
||||
EnergyValueRegistryProxy.addPreAssignedEnergyValue(ConfigItems.itemWispEssence, 1024);
|
||||
EnergyValueRegistryProxy.addPreAssignedEnergyValue(ConfigItems.itemManaBean, 32);
|
||||
@@ -344,61 +282,61 @@ public class Compat {
|
||||
EnergyValueRegistryProxy.addPreAssignedEnergyValue(ConfigItems.itemHelmetCultistRobe, 1536);
|
||||
EnergyValueRegistryProxy.addPreAssignedEnergyValue(ConfigItems.itemLegsCultistRobe, 2048);
|
||||
|
||||
EnergyValueRegistryProxy.addPreAssignedEnergyValue(
|
||||
new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 0), 64);
|
||||
EnergyValueRegistryProxy.addPreAssignedEnergyValue(
|
||||
new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 2), 392);
|
||||
EnergyValueRegistryProxy.addPreAssignedEnergyValue(
|
||||
new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 3), 392);
|
||||
EnergyValueRegistryProxy.addPreAssignedEnergyValue(
|
||||
new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 6), 264);
|
||||
EnergyValueRegistryProxy.addPreAssignedEnergyValue(
|
||||
new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 7), 264);
|
||||
EnergyValueRegistryProxy.addPreAssignedEnergyValue(
|
||||
new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 11), 1);
|
||||
EnergyValueRegistryProxy.addPreAssignedEnergyValue(
|
||||
new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 12), 1);
|
||||
EnergyValueRegistryProxy.addPreAssignedEnergyValue(
|
||||
new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 14), 1);
|
||||
EnergyValueRegistryProxy.addPreAssignedEnergyValue(
|
||||
new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 15), 1);
|
||||
EnergyValueRegistryProxy.addPreAssignedEnergyValue(
|
||||
new ItemStack(ConfigBlocks.blockCustomPlant, 1, 0), 64);
|
||||
EnergyValueRegistryProxy.addPreAssignedEnergyValue(
|
||||
new ItemStack(ConfigBlocks.blockCustomPlant, 1, 1), 256);
|
||||
EnergyValueRegistryProxy.addPreAssignedEnergyValue(
|
||||
new ItemStack(ConfigBlocks.blockCustomPlant, 1, 2), 64);
|
||||
EnergyValueRegistryProxy.addPreAssignedEnergyValue(
|
||||
new ItemStack(ConfigBlocks.blockCustomPlant, 1, 3), 768);
|
||||
EnergyValueRegistryProxy.addPreAssignedEnergyValue(
|
||||
new ItemStack(ConfigBlocks.blockCustomPlant, 1, 5), 16);
|
||||
EnergyValueRegistryProxy.addPreAssignedEnergyValue(
|
||||
new ItemStack(ConfigBlocks.blockMetalDevice, 1, 0), 1792);
|
||||
EnergyValueRegistryProxy.addPreAssignedEnergyValue(
|
||||
new ItemStack(ConfigBlocks.blockTable, 1, 0), 28);
|
||||
EnergyValueRegistryProxy.addPreAssignedEnergyValue(
|
||||
new ItemStack(ConfigBlocks.blockTable, 1, 15), 28);
|
||||
EnergyValueRegistryProxy.addPreAssignedEnergyValue(
|
||||
new ItemStack(ConfigBlocks.blockEldritch, 1, 4), 4);
|
||||
EnergyValueRegistryProxy
|
||||
.addPreAssignedEnergyValue(new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 0), 64);
|
||||
EnergyValueRegistryProxy
|
||||
.addPreAssignedEnergyValue(new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 2), 392);
|
||||
EnergyValueRegistryProxy
|
||||
.addPreAssignedEnergyValue(new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 3), 392);
|
||||
EnergyValueRegistryProxy
|
||||
.addPreAssignedEnergyValue(new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 6), 264);
|
||||
EnergyValueRegistryProxy
|
||||
.addPreAssignedEnergyValue(new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 7), 264);
|
||||
EnergyValueRegistryProxy
|
||||
.addPreAssignedEnergyValue(new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 11), 1);
|
||||
EnergyValueRegistryProxy
|
||||
.addPreAssignedEnergyValue(new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 12), 1);
|
||||
EnergyValueRegistryProxy
|
||||
.addPreAssignedEnergyValue(new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 14), 1);
|
||||
EnergyValueRegistryProxy
|
||||
.addPreAssignedEnergyValue(new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 15), 1);
|
||||
EnergyValueRegistryProxy
|
||||
.addPreAssignedEnergyValue(new ItemStack(ConfigBlocks.blockCustomPlant, 1, 0), 64);
|
||||
EnergyValueRegistryProxy
|
||||
.addPreAssignedEnergyValue(new ItemStack(ConfigBlocks.blockCustomPlant, 1, 1), 256);
|
||||
EnergyValueRegistryProxy
|
||||
.addPreAssignedEnergyValue(new ItemStack(ConfigBlocks.blockCustomPlant, 1, 2), 64);
|
||||
EnergyValueRegistryProxy
|
||||
.addPreAssignedEnergyValue(new ItemStack(ConfigBlocks.blockCustomPlant, 1, 3), 768);
|
||||
EnergyValueRegistryProxy
|
||||
.addPreAssignedEnergyValue(new ItemStack(ConfigBlocks.blockCustomPlant, 1, 5), 16);
|
||||
EnergyValueRegistryProxy
|
||||
.addPreAssignedEnergyValue(new ItemStack(ConfigBlocks.blockMetalDevice, 1, 0), 1792);
|
||||
EnergyValueRegistryProxy
|
||||
.addPreAssignedEnergyValue(new ItemStack(ConfigBlocks.blockTable, 1, 0), 28);
|
||||
EnergyValueRegistryProxy
|
||||
.addPreAssignedEnergyValue(new ItemStack(ConfigBlocks.blockTable, 1, 15), 28);
|
||||
EnergyValueRegistryProxy
|
||||
.addPreAssignedEnergyValue(new ItemStack(ConfigBlocks.blockEldritch, 1, 4), 4);
|
||||
for (int x = 0; x < 7; x++) {
|
||||
EnergyValueRegistryProxy.addPreAssignedEnergyValue(
|
||||
new ItemStack(ConfigBlocks.blockCrystal, 1, x), 1536);
|
||||
EnergyValueRegistryProxy
|
||||
.addPreAssignedEnergyValue(new ItemStack(ConfigBlocks.blockCrystal, 1, x), 1536);
|
||||
}
|
||||
EnergyValueRegistryProxy.addPreAssignedEnergyValue(
|
||||
new ItemStack(ConfigBlocks.blockMagicalLog, 1, 1), 64);
|
||||
EnergyValueRegistryProxy.addPreAssignedEnergyValue(
|
||||
new ItemStack(ConfigBlocks.blockMagicalLeaves, 1, 0), 1);
|
||||
EnergyValueRegistryProxy.addPreAssignedEnergyValue(
|
||||
new ItemStack(ConfigBlocks.blockMagicalLeaves, 1, 1), 1);
|
||||
EnergyValueRegistryProxy
|
||||
.addPreAssignedEnergyValue(new ItemStack(ConfigBlocks.blockMagicalLog, 1, 1), 64);
|
||||
EnergyValueRegistryProxy
|
||||
.addPreAssignedEnergyValue(new ItemStack(ConfigBlocks.blockMagicalLeaves, 1, 0), 1);
|
||||
EnergyValueRegistryProxy
|
||||
.addPreAssignedEnergyValue(new ItemStack(ConfigBlocks.blockMagicalLeaves, 1, 1), 1);
|
||||
|
||||
EnergyValueRegistryProxy.addPreAssignedEnergyValue(ForbiddenBlocks.starBlock, 221184);
|
||||
|
||||
for (int x = 0; x < 7; x++) {
|
||||
EnergyValueRegistryProxy.addPreAssignedEnergyValue(
|
||||
new ItemStack(ForbiddenItems.deadlyShards, 1, x), 256);
|
||||
EnergyValueRegistryProxy
|
||||
.addPreAssignedEnergyValue(new ItemStack(ForbiddenItems.deadlyShards, 1, x), 256);
|
||||
}
|
||||
EnergyValueRegistryProxy.addPreAssignedEnergyValue(
|
||||
new ItemStack(ForbiddenItems.gluttonyShard, 1), 256);
|
||||
EnergyValueRegistryProxy
|
||||
.addPreAssignedEnergyValue(new ItemStack(ForbiddenItems.gluttonyShard, 1), 256);
|
||||
} catch (Throwable e) {
|
||||
LogHandler.log(Level.INFO, e, "Forbidden Magic appears to be having trouble with EE3, eh?");
|
||||
ee3 = false;
|
||||
@@ -547,6 +485,7 @@ public class Compat {
|
||||
}
|
||||
|
||||
public static class ItemNotFoundException extends Exception {
|
||||
|
||||
public ItemNotFoundException(String mod, String item) {
|
||||
super("Unable to find item " + item + " in mod " + mod + "! Are you using the correct version of the mod?");
|
||||
}
|
||||
|
||||
@@ -3,9 +3,11 @@ package fox.spiteful.forbidden.compat;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.IIcon;
|
||||
|
||||
import vazkii.botania.api.subtile.signature.BasicSignature;
|
||||
|
||||
public class DarkSignature extends BasicSignature {
|
||||
|
||||
IIcon icon;
|
||||
|
||||
public DarkSignature(String name) {
|
||||
|
||||
@@ -1,5 +1,27 @@
|
||||
package fox.spiteful.forbidden.compat;
|
||||
|
||||
import java.lang.reflect.Field;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.crafting.CraftingManager;
|
||||
import net.minecraft.item.crafting.IRecipe;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
import net.minecraftforge.oredict.ShapedOreRecipe;
|
||||
|
||||
import org.apache.logging.log4j.Level;
|
||||
|
||||
import thaumcraft.api.ThaumcraftApi;
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.api.aspects.AspectList;
|
||||
import thaumcraft.api.crafting.IArcaneRecipe;
|
||||
import thaumcraft.api.crafting.InfusionRecipe;
|
||||
import thaumcraft.api.research.ResearchPage;
|
||||
import thaumcraft.common.config.ConfigItems;
|
||||
import vazkii.botania.api.BotaniaAPI;
|
||||
import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.AltarRecipeRegistry;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import fox.spiteful.forbidden.Config;
|
||||
@@ -10,27 +32,9 @@ import fox.spiteful.forbidden.tiles.SubTileBloodthorn;
|
||||
import fox.spiteful.forbidden.tiles.SubTileEuclidaisy;
|
||||
import fox.spiteful.forbidden.tiles.SubTileTainthistle;
|
||||
import fox.spiteful.forbidden.tiles.SubTileWhisperweed;
|
||||
import java.lang.reflect.Field;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.crafting.CraftingManager;
|
||||
import net.minecraft.item.crafting.IRecipe;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
import net.minecraftforge.oredict.ShapedOreRecipe;
|
||||
import org.apache.logging.log4j.Level;
|
||||
import thaumcraft.api.ThaumcraftApi;
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.api.aspects.AspectList;
|
||||
import thaumcraft.api.crafting.IArcaneRecipe;
|
||||
import thaumcraft.api.crafting.InfusionRecipe;
|
||||
import thaumcraft.api.research.ResearchPage;
|
||||
import thaumcraft.common.config.ConfigItems;
|
||||
import vazkii.botania.api.BotaniaAPI;
|
||||
|
||||
public class ForbiddenBotany {
|
||||
|
||||
public static void flowerPowerHippymancy() {
|
||||
try {
|
||||
Item rune = Compat.getItem("Botania", "rune");
|
||||
@@ -49,31 +53,29 @@ public class ForbiddenBotany {
|
||||
e.printStackTrace();
|
||||
LogHandler.log(Level.INFO, "Somebody's using an outdated version of Botania.");
|
||||
|
||||
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, 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)
|
||||
});
|
||||
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) });
|
||||
}
|
||||
|
||||
OreDictionary.registerOre("nuggetManasteel", new ItemStack(ForbiddenItems.resource, 1, 2));
|
||||
OreDictionary.registerOre("nuggetElvenElementium", new ItemStack(ForbiddenItems.resource, 1, 4));
|
||||
|
||||
(new DarkResearchItem("BOTANY", "FORBIDDEN", "[B]", new AspectList(), -3, 3, 0, new ItemStack(lexicon)))
|
||||
.setPages(new ResearchPage[] {new ResearchPage("forbidden.research_page.BOTANY.1")})
|
||||
.setParents(new String[] {"SCHOOLS"})
|
||||
.setRound()
|
||||
.setStub()
|
||||
.setAutoUnlock()
|
||||
.registerResearchItem();
|
||||
.setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.BOTANY.1") })
|
||||
.setParents(new String[] { "SCHOOLS" }).setRound().setStub().setAutoUnlock().registerResearchItem();
|
||||
|
||||
if (Config.crossWand) {
|
||||
|
||||
@@ -81,44 +83,26 @@ public class ForbiddenBotany {
|
||||
"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 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)
|
||||
});
|
||||
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) });
|
||||
(new DarkResearchItem(
|
||||
"ROD_livingwood",
|
||||
"FORBIDDEN",
|
||||
"[B]",
|
||||
(new AspectList())
|
||||
.add(Aspect.TREE, 8)
|
||||
.add(Aspect.MAGIC, 4)
|
||||
.add(Aspect.PLANT, 6),
|
||||
-1,
|
||||
3,
|
||||
3,
|
||||
new ItemStack(ForbiddenItems.wandCore, 1, 7)))
|
||||
.setPages(new ResearchPage[] {
|
||||
new ResearchPage("forbidden.research_page.ROD_livingwood.1"),
|
||||
new ResearchPage(livingwood_rod)
|
||||
})
|
||||
.setParents(new String[] {"BOTANY", "ROD_silverwood", "INFUSION"})
|
||||
.setConcealed()
|
||||
.registerResearchItem();
|
||||
"ROD_livingwood",
|
||||
"FORBIDDEN",
|
||||
"[B]",
|
||||
(new AspectList()).add(Aspect.TREE, 8).add(Aspect.MAGIC, 4).add(Aspect.PLANT, 6),
|
||||
-1,
|
||||
3,
|
||||
3,
|
||||
new ItemStack(ForbiddenItems.wandCore, 1, 7))).setPages(
|
||||
new ResearchPage[] { new ResearchPage("forbidden.research_page.ROD_livingwood.1"),
|
||||
new ResearchPage(livingwood_rod) })
|
||||
.setParents(new String[] { "BOTANY", "ROD_silverwood", "INFUSION" }).setConcealed()
|
||||
.registerResearchItem();
|
||||
ThaumcraftApi.addWarpToResearch("ROD_livingwood", 2);
|
||||
BotaniaAPI.registerManaInfusionRecipe(
|
||||
new ItemStack(ForbiddenItems.wandCore, 1, 7),
|
||||
@@ -128,179 +112,112 @@ public class ForbiddenBotany {
|
||||
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'), "nuggetManasteel"});
|
||||
(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'), "nuggetManasteel" });
|
||||
(new DarkResearchItem(
|
||||
"CAP_manasteel",
|
||||
"FORBIDDEN",
|
||||
"[B]",
|
||||
(new AspectList())
|
||||
.add(Aspect.AURA, 6)
|
||||
.add(Aspect.MAGIC, 4)
|
||||
.add(Aspect.METAL, 4),
|
||||
1,
|
||||
2,
|
||||
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();
|
||||
"CAP_manasteel",
|
||||
"FORBIDDEN",
|
||||
"[B]",
|
||||
(new AspectList()).add(Aspect.AURA, 6).add(Aspect.MAGIC, 4).add(Aspect.METAL, 4),
|
||||
1,
|
||||
2,
|
||||
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);
|
||||
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 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)
|
||||
});
|
||||
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)
|
||||
});
|
||||
(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,
|
||||
3,
|
||||
2,
|
||||
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();
|
||||
"ROD_dreamwood_staff",
|
||||
"FORBIDDEN",
|
||||
"[B]",
|
||||
(new AspectList()).add(Aspect.TREE, 16).add(Aspect.MAGIC, 8).add(Aspect.ELDRITCH, 6),
|
||||
1,
|
||||
3,
|
||||
2,
|
||||
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'), "nuggetElvenElementium"});
|
||||
(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'), "nuggetElvenElementium" });
|
||||
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)
|
||||
(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 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),
|
||||
3,
|
||||
3,
|
||||
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();
|
||||
"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),
|
||||
3,
|
||||
3,
|
||||
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();
|
||||
|
||||
IRecipe terrasteel_cap = new ShapedOreRecipe(
|
||||
new ItemStack(ForbiddenItems.wandCap, 1, 2),
|
||||
new Object[] {"NNN", "N N", Character.valueOf('N'), "nuggetTerrasteel"});
|
||||
new Object[] { "NNN", "N N", Character.valueOf('N'), "nuggetTerrasteel" });
|
||||
CraftingManager.getInstance().getRecipeList().add(terrasteel_cap);
|
||||
(new DarkResearchItem(
|
||||
"CAP_terrasteel",
|
||||
"FORBIDDEN",
|
||||
"[B]",
|
||||
(new AspectList()).add(Aspect.ENERGY, 1).add(Aspect.METAL, 1),
|
||||
3,
|
||||
2,
|
||||
1,
|
||||
new ItemStack(ForbiddenItems.wandCap, 1, 2)))
|
||||
.setPages(new ResearchPage[] {
|
||||
new ResearchPage("forbidden.research_page.CAP_terrasteel.1"),
|
||||
new ResearchPage(terrasteel_cap)
|
||||
})
|
||||
.setParents(new String[] {"CAP_manasteel"})
|
||||
.setConcealed()
|
||||
.setSecondary()
|
||||
.registerResearchItem();
|
||||
"CAP_terrasteel",
|
||||
"FORBIDDEN",
|
||||
"[B]",
|
||||
(new AspectList()).add(Aspect.ENERGY, 1).add(Aspect.METAL, 1),
|
||||
3,
|
||||
2,
|
||||
1,
|
||||
new ItemStack(ForbiddenItems.wandCap, 1, 2))).setPages(
|
||||
new ResearchPage[] { new ResearchPage("forbidden.research_page.CAP_terrasteel.1"),
|
||||
new ResearchPage(terrasteel_cap) })
|
||||
.setParents(new String[] { "CAP_manasteel" }).setConcealed().setSecondary()
|
||||
.registerResearchItem();
|
||||
}
|
||||
|
||||
BotaniaAPI.registerSubTile("euclidaisy", SubTileEuclidaisy.class);
|
||||
@@ -318,38 +235,24 @@ public class ForbiddenBotany {
|
||||
"EUCLIDAISY",
|
||||
euclidaisy,
|
||||
8,
|
||||
(new AspectList())
|
||||
.add(Aspect.AURA, 8)
|
||||
.add(Aspect.ELDRITCH, 10)
|
||||
.add(Aspect.MAGIC, 8),
|
||||
(new AspectList()).add(Aspect.AURA, 8).add(Aspect.ELDRITCH, 10).add(Aspect.MAGIC, 8),
|
||||
new ItemStack(flower, 1, 6),
|
||||
new ItemStack[] {
|
||||
new ItemStack(ConfigItems.itemResource, 1, 14),
|
||||
new ItemStack(resource, 1, 1),
|
||||
new ItemStack(resource, 1, 6),
|
||||
new ItemStack(petal, 1, 6),
|
||||
new ItemStack(petal, 1, 6),
|
||||
new ItemStack(rune, 1, 12),
|
||||
new ItemStack(rune, 1, 11)
|
||||
});
|
||||
new ItemStack[] { new ItemStack(ConfigItems.itemResource, 1, 14), new ItemStack(resource, 1, 1),
|
||||
new ItemStack(resource, 1, 6), new ItemStack(petal, 1, 6), new ItemStack(petal, 1, 6),
|
||||
new ItemStack(rune, 1, 12), new ItemStack(rune, 1, 11) });
|
||||
(new DarkResearchItem(
|
||||
"EUCLIDAISY",
|
||||
"FORBIDDEN",
|
||||
"[B]",
|
||||
(new AspectList())
|
||||
.add(Aspect.PLANT, 8)
|
||||
.add(Aspect.MAGIC, 4)
|
||||
.add(Aspect.AURA, 12),
|
||||
-3,
|
||||
5,
|
||||
2,
|
||||
euclidaisy))
|
||||
.setPages(new ResearchPage[] {
|
||||
new ResearchPage("forbidden.research_page.EUCLIDAISY.1"), new ResearchPage(euclid)
|
||||
})
|
||||
.setParents(new String[] {"BOTANY", "INFUSION"})
|
||||
.setConcealed()
|
||||
.registerResearchItem();
|
||||
"EUCLIDAISY",
|
||||
"FORBIDDEN",
|
||||
"[B]",
|
||||
(new AspectList()).add(Aspect.PLANT, 8).add(Aspect.MAGIC, 4).add(Aspect.AURA, 12),
|
||||
-3,
|
||||
5,
|
||||
2,
|
||||
euclidaisy))
|
||||
.setPages(
|
||||
new ResearchPage[] { new ResearchPage("forbidden.research_page.EUCLIDAISY.1"),
|
||||
new ResearchPage(euclid) })
|
||||
.setParents(new String[] { "BOTANY", "INFUSION" }).setConcealed().registerResearchItem();
|
||||
|
||||
BotaniaAPI.registerSubTile("whisperweed", SubTileWhisperweed.class);
|
||||
BotaniaAPI.registerSubTileSignature(SubTileWhisperweed.class, new DarkSignature("whisperweed"));
|
||||
@@ -365,41 +268,25 @@ public class ForbiddenBotany {
|
||||
IArcaneRecipe whispercraft = ThaumcraftApi.addShapelessArcaneCraftingRecipe(
|
||||
"WHISPERWEED",
|
||||
whisperweed,
|
||||
(new AspectList())
|
||||
.add(Aspect.FIRE, 10)
|
||||
.add(Aspect.WATER, 10)
|
||||
.add(Aspect.EARTH, 10)
|
||||
.add(Aspect.AIR, 10)
|
||||
.add(Aspect.ORDER, 10)
|
||||
.add(Aspect.ENTROPY, 10),
|
||||
new ItemStack[] {
|
||||
new ItemStack(Blocks.tallgrass, 1, 1),
|
||||
new ItemStack(resource, 1, 2),
|
||||
new ItemStack(resource, 1, 6),
|
||||
new ItemStack(ConfigItems.itemResource, 1, 9),
|
||||
new ItemStack(petal, 1, 7),
|
||||
new ItemStack(petal, 1, 10),
|
||||
new ItemStack(rune, 1, 14),
|
||||
new ItemStack(ConfigItems.itemResource, 1, 6)
|
||||
});
|
||||
(new AspectList()).add(Aspect.FIRE, 10).add(Aspect.WATER, 10).add(Aspect.EARTH, 10)
|
||||
.add(Aspect.AIR, 10).add(Aspect.ORDER, 10).add(Aspect.ENTROPY, 10),
|
||||
new ItemStack[] { new ItemStack(Blocks.tallgrass, 1, 1), new ItemStack(resource, 1, 2),
|
||||
new ItemStack(resource, 1, 6), new ItemStack(ConfigItems.itemResource, 1, 9),
|
||||
new ItemStack(petal, 1, 7), new ItemStack(petal, 1, 10), new ItemStack(rune, 1, 14),
|
||||
new ItemStack(ConfigItems.itemResource, 1, 6) });
|
||||
(new DarkResearchItem(
|
||||
"WHISPERWEED",
|
||||
"FORBIDDEN",
|
||||
"[B]",
|
||||
(new AspectList())
|
||||
.add(Aspect.PLANT, 8)
|
||||
.add(Aspect.MIND, 10)
|
||||
.add(Aspect.SENSES, 4),
|
||||
-4,
|
||||
5,
|
||||
1,
|
||||
whisperweed))
|
||||
.setPages(new ResearchPage[] {
|
||||
new ResearchPage("forbidden.research_page.WHISPERWEED.1"), new ResearchPage(whispercraft)
|
||||
})
|
||||
.setParents(new String[] {"BOTANY"})
|
||||
.setConcealed()
|
||||
.registerResearchItem();
|
||||
"WHISPERWEED",
|
||||
"FORBIDDEN",
|
||||
"[B]",
|
||||
(new AspectList()).add(Aspect.PLANT, 8).add(Aspect.MIND, 10).add(Aspect.SENSES, 4),
|
||||
-4,
|
||||
5,
|
||||
1,
|
||||
whisperweed))
|
||||
.setPages(
|
||||
new ResearchPage[] { new ResearchPage("forbidden.research_page.WHISPERWEED.1"),
|
||||
new ResearchPage(whispercraft) })
|
||||
.setParents(new String[] { "BOTANY" }).setConcealed().registerResearchItem();
|
||||
|
||||
BotaniaAPI.registerSubTile("tainthistle", SubTileTainthistle.class);
|
||||
BotaniaAPI.registerSubTileSignature(SubTileTainthistle.class, new DarkSignature("tainthistle"));
|
||||
@@ -416,37 +303,24 @@ public class ForbiddenBotany {
|
||||
"TAINTHISTLE",
|
||||
tainthistle,
|
||||
4,
|
||||
(new AspectList())
|
||||
.add(Aspect.TAINT, 8)
|
||||
.add(Aspect.HUNGER, 4)
|
||||
.add(Aspect.AIR, 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(petal, 1, 10),
|
||||
new ItemStack(petal, 1, 10),
|
||||
new ItemStack(rune, 1, 10),
|
||||
new ItemStack(rune, 1, 8)
|
||||
});
|
||||
new ItemStack[] { new ItemStack(petal, 1, 10), new ItemStack(petal, 1, 10),
|
||||
new ItemStack(petal, 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),
|
||||
-2,
|
||||
5,
|
||||
2,
|
||||
tainthistle))
|
||||
.setPages(new ResearchPage[] {
|
||||
new ResearchPage("forbidden.research_page.TAINTHISTLE.1"), new ResearchPage(thistlecraft)
|
||||
})
|
||||
.setParents(new String[] {"BOTANY", "INFUSION"})
|
||||
.setConcealed()
|
||||
.registerResearchItem();
|
||||
"TAINTHISTLE",
|
||||
"FORBIDDEN",
|
||||
"[B]",
|
||||
(new AspectList()).add(Aspect.PLANT, 8).add(Aspect.TAINT, 10).add(Aspect.MAGIC, 4),
|
||||
-2,
|
||||
5,
|
||||
2,
|
||||
tainthistle))
|
||||
.setPages(
|
||||
new ResearchPage[] { new ResearchPage("forbidden.research_page.TAINTHISTLE.1"),
|
||||
new ResearchPage(thistlecraft) })
|
||||
.setParents(new String[] { "BOTANY", "INFUSION" }).setConcealed().registerResearchItem();
|
||||
|
||||
if (Compat.bm) {
|
||||
BotaniaAPI.registerSubTile("bloodthorn", SubTileBloodthorn.class);
|
||||
@@ -454,20 +328,21 @@ public class ForbiddenBotany {
|
||||
BotaniaAPI.addSubTileToCreativeMenu("bloodthorn");
|
||||
|
||||
SubTileBloodthorn.lexicon = new ForbiddenLexicon("bloodthorn", BotaniaAPI.categoryFunctionalFlowers) {
|
||||
|
||||
@Override
|
||||
public String getSubtitle() {
|
||||
return "[Forbidden Magic x Blood Magic x Botania]";
|
||||
}
|
||||
};
|
||||
|
||||
SubTileBloodthorn.lexicon.addPage(
|
||||
BotaniaAPI.internalHandler.textPage("forbidden.lexicon.bloodthorn.0"));
|
||||
SubTileBloodthorn.lexicon
|
||||
.addPage(BotaniaAPI.internalHandler.textPage("forbidden.lexicon.bloodthorn.0"));
|
||||
|
||||
ItemStack bloodthorn = getFlower("bloodthorn");
|
||||
SubTileBloodthorn.lexicon.setIcon(bloodthorn);
|
||||
try {
|
||||
AltarRecipeRegistry.registerAltarRecipe(
|
||||
bloodthorn, new ItemStack(flower, 1, 14), 4, 15000, 25, 50, false);
|
||||
AltarRecipeRegistry
|
||||
.registerAltarRecipe(bloodthorn, new ItemStack(flower, 1, 14), 4, 15000, 25, 50, false);
|
||||
} catch (Throwable e) {
|
||||
LogHandler.log(Level.INFO, e, "Forbidden Magic tried to do some Blood Magic, but bled out.");
|
||||
}
|
||||
|
||||
@@ -1,20 +1,23 @@
|
||||
package fox.spiteful.forbidden.compat;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.potion.PotionEffect;
|
||||
import net.minecraft.util.AxisAlignedBB;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import thaumcraft.common.Thaumcraft;
|
||||
import thaumcraft.common.lib.potions.PotionWarpWard;
|
||||
import WayofTime.alchemicalWizardry.api.alchemy.energy.ReagentRegistry;
|
||||
import WayofTime.alchemicalWizardry.api.rituals.IMasterRitualStone;
|
||||
import WayofTime.alchemicalWizardry.api.rituals.RitualComponent;
|
||||
import WayofTime.alchemicalWizardry.api.rituals.RitualEffect;
|
||||
import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.potion.PotionEffect;
|
||||
import net.minecraft.util.AxisAlignedBB;
|
||||
import net.minecraft.world.World;
|
||||
import thaumcraft.common.Thaumcraft;
|
||||
import thaumcraft.common.lib.potions.PotionWarpWard;
|
||||
|
||||
public class RitualSanity extends RitualEffect {
|
||||
|
||||
public static final int crystallosDrain = 4;
|
||||
|
||||
@Override
|
||||
@@ -35,8 +38,8 @@ public class RitualSanity extends RitualEffect {
|
||||
|
||||
boolean crazy = world.getWorldTime() % (timeDelay * 4) == 0;
|
||||
|
||||
boolean hasCrystallos =
|
||||
this.canDrainReagent(ritualStone, ReagentRegistry.crystallosReagent, crystallosDrain, false);
|
||||
boolean hasCrystallos = this
|
||||
.canDrainReagent(ritualStone, ReagentRegistry.crystallosReagent, crystallosDrain, false);
|
||||
|
||||
int range = 15 * (hasCrystallos ? 3 : 1);
|
||||
int vertRange = 15 * (hasCrystallos ? 3 : 1);
|
||||
@@ -46,8 +49,8 @@ public class RitualSanity extends RitualEffect {
|
||||
float posZ = z + 0.5f;
|
||||
List<EntityPlayer> list = world.getEntitiesWithinAABB(
|
||||
EntityPlayer.class,
|
||||
AxisAlignedBB.getBoundingBox(
|
||||
posX - 0.5f, posY - 0.5f, posZ - 0.5f, posX + 0.5f, posY + 0.5f, posZ + 0.5f)
|
||||
AxisAlignedBB
|
||||
.getBoundingBox(posX - 0.5f, posY - 0.5f, posZ - 0.5f, posX + 0.5f, posY + 0.5f, posZ + 0.5f)
|
||||
.expand(range, vertRange, range));
|
||||
int entityCount = 0;
|
||||
|
||||
@@ -70,10 +73,8 @@ public class RitualSanity extends RitualEffect {
|
||||
ward.getCurativeItems().clear();
|
||||
player.addPotionEffect(ward);
|
||||
entityCount++;
|
||||
if (crazy && world.rand.nextInt(35) <= 3)
|
||||
Thaumcraft.proxy
|
||||
.getPlayerKnowledge()
|
||||
.addWarpTemp(player.getDisplayName(), 1 + world.rand.nextInt(3));
|
||||
if (crazy && world.rand.nextInt(35) <= 3) Thaumcraft.proxy.getPlayerKnowledge()
|
||||
.addWarpTemp(player.getDisplayName(), 1 + world.rand.nextInt(3));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,13 +1,16 @@
|
||||
package fox.spiteful.forbidden.enchantments;
|
||||
|
||||
import fox.spiteful.forbidden.Config;
|
||||
import fox.spiteful.forbidden.compat.Compat;
|
||||
import java.lang.reflect.Method;
|
||||
|
||||
import net.minecraft.enchantment.Enchantment;
|
||||
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.api.aspects.AspectList;
|
||||
import fox.spiteful.forbidden.Config;
|
||||
import fox.spiteful.forbidden.compat.Compat;
|
||||
|
||||
public class DarkEnchantments {
|
||||
|
||||
public static Enchantment cluster;
|
||||
public static Enchantment wrath;
|
||||
public static Enchantment greedy;
|
||||
@@ -51,33 +54,22 @@ public class DarkEnchantments {
|
||||
cluster,
|
||||
"forbidden:textures/misc/lucrative.png",
|
||||
false,
|
||||
(new AspectList())
|
||||
.add(Aspect.FIRE, 5)
|
||||
.add(Aspect.EARTH, 5)
|
||||
.add(Aspect.ORDER, 5),
|
||||
(new AspectList()).add(Aspect.FIRE, 5).add(Aspect.EARTH, 5).add(Aspect.ORDER, 5),
|
||||
"CLUSTER");
|
||||
reg.invoke(
|
||||
null,
|
||||
greedy,
|
||||
"forbidden:textures/misc/greedy.png",
|
||||
false,
|
||||
(new AspectList())
|
||||
.add(Aspect.ENTROPY, 50)
|
||||
.add(Aspect.EARTH, 30)
|
||||
.add(Aspect.ORDER, 20),
|
||||
(new AspectList()).add(Aspect.ENTROPY, 50).add(Aspect.EARTH, 30).add(Aspect.ORDER, 20),
|
||||
"GREEDY");
|
||||
reg.invoke(
|
||||
null,
|
||||
educational,
|
||||
"forbidden:textures/misc/educational.png",
|
||||
false,
|
||||
new AspectList()
|
||||
.add(Aspect.AIR, 10)
|
||||
.add(Aspect.FIRE, 10)
|
||||
.add(Aspect.WATER, 10)
|
||||
.add(Aspect.EARTH, 10)
|
||||
.add(Aspect.ORDER, 15)
|
||||
.add(Aspect.ENTROPY, 15),
|
||||
new AspectList().add(Aspect.AIR, 10).add(Aspect.FIRE, 10).add(Aspect.WATER, 10)
|
||||
.add(Aspect.EARTH, 10).add(Aspect.ORDER, 15).add(Aspect.ENTROPY, 15),
|
||||
"EDUCATIONAL");
|
||||
reg.invoke(
|
||||
null,
|
||||
@@ -91,10 +83,7 @@ public class DarkEnchantments {
|
||||
corrupting,
|
||||
"forbidden:textures/misc/corrupting.png",
|
||||
false,
|
||||
(new AspectList())
|
||||
.add(Aspect.ENTROPY, 20)
|
||||
.add(Aspect.FIRE, 15)
|
||||
.add(Aspect.EARTH, 10),
|
||||
(new AspectList()).add(Aspect.ENTROPY, 20).add(Aspect.FIRE, 15).add(Aspect.EARTH, 10),
|
||||
"CORRUPTING");
|
||||
reg.invoke(
|
||||
null,
|
||||
|
||||
@@ -1,11 +1,13 @@
|
||||
package fox.spiteful.forbidden.enchantments;
|
||||
|
||||
import fox.spiteful.forbidden.items.tools.ItemMorphPickaxe;
|
||||
import net.minecraft.enchantment.Enchantment;
|
||||
import net.minecraft.enchantment.EnumEnchantmentType;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import fox.spiteful.forbidden.items.tools.ItemMorphPickaxe;
|
||||
|
||||
public class EnchantmentCluster extends Enchantment {
|
||||
|
||||
public EnchantmentCluster(int id) {
|
||||
super(id, 1, EnumEnchantmentType.digger);
|
||||
setName("cluster");
|
||||
|
||||
@@ -5,9 +5,11 @@ import net.minecraft.enchantment.EnumEnchantmentType;
|
||||
import net.minecraft.item.ItemPickaxe;
|
||||
import net.minecraft.item.ItemSpade;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import thaumcraft.common.items.equipment.ItemPrimalCrusher;
|
||||
|
||||
public class EnchantmentConsuming extends Enchantment {
|
||||
|
||||
public EnchantmentConsuming(int id) {
|
||||
super(id, 5, EnumEnchantmentType.digger);
|
||||
setName("consuming");
|
||||
@@ -25,9 +27,9 @@ public class EnchantmentConsuming extends Enchantment {
|
||||
|
||||
@Override
|
||||
public boolean canApply(ItemStack item) {
|
||||
if (item.getItem() instanceof ItemPickaxe
|
||||
|| item.getItem() instanceof ItemSpade
|
||||
|| item.getItem() instanceof ItemPrimalCrusher) return true;
|
||||
if (item.getItem() instanceof ItemPickaxe || item.getItem() instanceof ItemSpade
|
||||
|| item.getItem() instanceof ItemPrimalCrusher)
|
||||
return true;
|
||||
else return false;
|
||||
}
|
||||
|
||||
|
||||
@@ -4,9 +4,11 @@ import net.minecraft.enchantment.Enchantment;
|
||||
import net.minecraft.enchantment.EnumEnchantmentType;
|
||||
import net.minecraft.item.ItemPickaxe;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import thaumcraft.common.items.equipment.ItemPrimalCrusher;
|
||||
|
||||
public class EnchantmentCorrupting extends Enchantment {
|
||||
|
||||
public EnchantmentCorrupting(int id) {
|
||||
super(id, 1, EnumEnchantmentType.digger);
|
||||
setName("corrupting");
|
||||
|
||||
@@ -5,6 +5,7 @@ import net.minecraft.enchantment.EnumEnchantmentType;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
public class EnchantmentEducational extends Enchantment {
|
||||
|
||||
public EnchantmentEducational(int id) {
|
||||
super(id, 5, EnumEnchantmentType.weapon);
|
||||
setName("educational");
|
||||
@@ -17,8 +18,7 @@ public class EnchantmentEducational extends Enchantment {
|
||||
|
||||
@Override
|
||||
public boolean canApplyTogether(Enchantment ench) {
|
||||
return super.canApplyTogether(ench)
|
||||
&& ench.effectId != Enchantment.looting.effectId
|
||||
return super.canApplyTogether(ench) && ench.effectId != Enchantment.looting.effectId
|
||||
&& ench.effectId != DarkEnchantments.greedy.effectId;
|
||||
}
|
||||
|
||||
|
||||
@@ -5,6 +5,7 @@ import net.minecraft.enchantment.EnumEnchantmentType;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
public class EnchantmentGreedy extends Enchantment {
|
||||
|
||||
public EnchantmentGreedy(int id) {
|
||||
super(id, 1, EnumEnchantmentType.weapon);
|
||||
setName("greedy");
|
||||
@@ -27,8 +28,7 @@ public class EnchantmentGreedy extends Enchantment {
|
||||
|
||||
@Override
|
||||
public boolean canApplyTogether(Enchantment ench) {
|
||||
return super.canApplyTogether(ench)
|
||||
&& ench.effectId != Enchantment.looting.effectId
|
||||
return super.canApplyTogether(ench) && ench.effectId != Enchantment.looting.effectId
|
||||
&& ench.effectId != DarkEnchantments.educational.effectId;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,12 +1,14 @@
|
||||
package fox.spiteful.forbidden.enchantments;
|
||||
|
||||
import fox.spiteful.forbidden.items.tools.ItemMorphPickaxe;
|
||||
import fox.spiteful.forbidden.items.tools.ItemMorphShovel;
|
||||
import net.minecraft.enchantment.Enchantment;
|
||||
import net.minecraft.enchantment.EnumEnchantmentType;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import fox.spiteful.forbidden.items.tools.ItemMorphPickaxe;
|
||||
import fox.spiteful.forbidden.items.tools.ItemMorphShovel;
|
||||
|
||||
public class EnchantmentImpact extends Enchantment {
|
||||
|
||||
public EnchantmentImpact(int id) {
|
||||
super(id, 1, EnumEnchantmentType.digger);
|
||||
setName("impact");
|
||||
|
||||
@@ -1,14 +1,16 @@
|
||||
package fox.spiteful.forbidden.enchantments;
|
||||
|
||||
import net.minecraft.enchantment.Enchantment;
|
||||
import net.minecraft.enchantment.EnumEnchantmentType;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import fox.spiteful.forbidden.items.tools.ItemMorphAxe;
|
||||
import fox.spiteful.forbidden.items.tools.ItemMorphPickaxe;
|
||||
import fox.spiteful.forbidden.items.tools.ItemMorphShovel;
|
||||
import fox.spiteful.forbidden.items.tools.ItemMorphSword;
|
||||
import net.minecraft.enchantment.Enchantment;
|
||||
import net.minecraft.enchantment.EnumEnchantmentType;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
public class EnchantmentVoid extends Enchantment {
|
||||
|
||||
public EnchantmentVoid(int id) {
|
||||
super(id, 1, EnumEnchantmentType.digger);
|
||||
setName("voidtouched");
|
||||
@@ -31,8 +33,7 @@ public class EnchantmentVoid extends Enchantment {
|
||||
|
||||
@Override
|
||||
public boolean canApply(ItemStack item) {
|
||||
return (item.getItem() instanceof ItemMorphPickaxe
|
||||
|| item.getItem() instanceof ItemMorphAxe
|
||||
return (item.getItem() instanceof ItemMorphPickaxe || item.getItem() instanceof ItemMorphAxe
|
||||
|| item.getItem() instanceof ItemMorphSword
|
||||
|| item.getItem() instanceof ItemMorphShovel);
|
||||
}
|
||||
|
||||
@@ -9,6 +9,7 @@ import net.minecraft.item.ItemAxe;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
public class EnchantmentWrath extends Enchantment {
|
||||
|
||||
public EnchantmentWrath(int id) {
|
||||
super(id, 1, EnumEnchantmentType.weapon);
|
||||
setName("wrath");
|
||||
|
||||
@@ -1,19 +1,14 @@
|
||||
package fox.spiteful.forbidden.items;
|
||||
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import fox.spiteful.forbidden.Config;
|
||||
import fox.spiteful.forbidden.compat.Compat;
|
||||
import fox.spiteful.forbidden.items.baubles.*;
|
||||
import fox.spiteful.forbidden.items.scribes.*;
|
||||
import fox.spiteful.forbidden.items.tools.*;
|
||||
import fox.spiteful.forbidden.items.wands.*;
|
||||
import java.util.Arrays;
|
||||
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.Item.ToolMaterial;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
|
||||
import thaumcraft.api.ThaumcraftApi;
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.api.aspects.AspectList;
|
||||
@@ -21,8 +16,16 @@ import thaumcraft.api.wands.FocusUpgradeType;
|
||||
import thaumcraft.api.wands.StaffRod;
|
||||
import thaumcraft.api.wands.WandCap;
|
||||
import thaumcraft.api.wands.WandRod;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import fox.spiteful.forbidden.Config;
|
||||
import fox.spiteful.forbidden.compat.Compat;
|
||||
import fox.spiteful.forbidden.items.baubles.*;
|
||||
import fox.spiteful.forbidden.items.scribes.*;
|
||||
import fox.spiteful.forbidden.items.tools.*;
|
||||
import fox.spiteful.forbidden.items.wands.*;
|
||||
|
||||
public class ForbiddenItems {
|
||||
|
||||
public static Item deadlyShards;
|
||||
public static Item gluttonyShard;
|
||||
public static Item skullAxe;
|
||||
@@ -228,7 +231,7 @@ public class ForbiddenItems {
|
||||
WAND_CAP_ALCHEMICAL = new DarkWandCap(
|
||||
"alchemical",
|
||||
0.9F,
|
||||
Arrays.asList(new Aspect[] {Aspect.WATER}),
|
||||
Arrays.asList(new Aspect[] { Aspect.WATER }),
|
||||
0.8F,
|
||||
new ItemStack(wandCap, 1, 0),
|
||||
7,
|
||||
@@ -308,8 +311,8 @@ public class ForbiddenItems {
|
||||
GameRegistry.registerItem(blinkFocus, "BlinkFocus");
|
||||
}
|
||||
|
||||
public static FocusUpgradeType getUpgrade(
|
||||
int id, ResourceLocation icon, String name, String text, AspectList aspects) {
|
||||
public static FocusUpgradeType getUpgrade(int id, ResourceLocation icon, String name, String text,
|
||||
AspectList aspects) {
|
||||
if (id >= FocusUpgradeType.types.length) {
|
||||
FocusUpgradeType[] temp = new FocusUpgradeType[id + 1];
|
||||
System.arraycopy(FocusUpgradeType.types, 0, temp, 0, FocusUpgradeType.types.length);
|
||||
|
||||
@@ -1,9 +1,5 @@
|
||||
package fox.spiteful.forbidden.items;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
import fox.spiteful.forbidden.blocks.ForbiddenBlocks;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.Entity;
|
||||
@@ -13,23 +9,20 @@ import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
import fox.spiteful.forbidden.blocks.ForbiddenBlocks;
|
||||
|
||||
public class ItemArcaneCake extends Item {
|
||||
|
||||
public ItemArcaneCake() {
|
||||
this.setCreativeTab(Forbidden.tab);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onItemUse(
|
||||
ItemStack stack,
|
||||
EntityPlayer player,
|
||||
World yWorld,
|
||||
int z,
|
||||
int par5,
|
||||
int par6,
|
||||
int par7,
|
||||
float par8,
|
||||
float par9,
|
||||
float par10) {
|
||||
public boolean onItemUse(ItemStack stack, EntityPlayer player, World yWorld, int z, int par5, int par6, int par7,
|
||||
float par8, float par9, float par10) {
|
||||
Block block = yWorld.getBlock(z, par5, par6);
|
||||
|
||||
if (block == Blocks.snow_layer && (yWorld.getBlockMetadata(z, par5, par6) & 7) < 1) {
|
||||
|
||||
@@ -1,10 +1,7 @@
|
||||
package fox.spiteful.forbidden.items;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Config;
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.Item;
|
||||
@@ -12,8 +9,14 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.util.MathHelper;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Config;
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
|
||||
public class ItemDeadlyShard extends Item {
|
||||
public static final String[] vices = new String[] {"wrath", "envy", "taint", "pride", "lust", "sloth", "greed"};
|
||||
|
||||
public static final String[] vices = new String[] { "wrath", "envy", "taint", "pride", "lust", "sloth", "greed" };
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public IIcon[] icons;
|
||||
|
||||
@@ -1,14 +1,7 @@
|
||||
package fox.spiteful.forbidden.items;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.AltarRecipeRegistry;
|
||||
import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
|
||||
import WayofTime.alchemicalWizardry.api.items.interfaces.IBloodOrb;
|
||||
import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
import fox.spiteful.forbidden.compat.Compat;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.EnumRarity;
|
||||
@@ -18,9 +11,19 @@ import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.util.DamageSource;
|
||||
import net.minecraft.util.StatCollector;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import thaumcraft.api.IWarpingGear;
|
||||
import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.AltarRecipeRegistry;
|
||||
import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
|
||||
import WayofTime.alchemicalWizardry.api.items.interfaces.IBloodOrb;
|
||||
import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
import fox.spiteful.forbidden.compat.Compat;
|
||||
|
||||
public class ItemDivineOrb extends Item implements IBloodOrb, IBindable, IWarpingGear {
|
||||
|
||||
public ItemDivineOrb() {
|
||||
setMaxStackSize(1);
|
||||
setCreativeTab(Forbidden.tab);
|
||||
@@ -38,8 +41,9 @@ public class ItemDivineOrb extends Item implements IBloodOrb, IBindable, IWarpin
|
||||
list.add(StatCollector.translateToLocal("tooltip.divineorb"));
|
||||
|
||||
if (!(stack.stackTagCompound == null)) {
|
||||
list.add(StatCollector.translateToLocal("tooltip.currentowner") + " "
|
||||
+ stack.stackTagCompound.getString("ownerName"));
|
||||
list.add(
|
||||
StatCollector.translateToLocal("tooltip.currentowner") + " "
|
||||
+ stack.stackTagCompound.getString("ownerName"));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,8 +1,5 @@
|
||||
package fox.spiteful.forbidden.items;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
@@ -14,9 +11,13 @@ import net.minecraft.util.ChatComponentText;
|
||||
import net.minecraft.util.EnumChatFormatting;
|
||||
import net.minecraft.util.StatCollector;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import thaumcraft.api.potions.PotionFluxTaint;
|
||||
import thaumcraft.common.Thaumcraft;
|
||||
import thaumcraft.common.lib.potions.PotionThaumarhia;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
|
||||
public class ItemFruitTainted extends ItemFood {
|
||||
|
||||
@@ -31,8 +32,9 @@ public class ItemFruitTainted extends ItemFood {
|
||||
player.addPotionEffect(getEffect(PotionFluxTaint.instance.id, 600, false));
|
||||
player.addPotionEffect(getEffect(Potion.hunger.id, 600, false));
|
||||
if (world.rand.nextFloat() < 0.4F) {
|
||||
player.addChatMessage(new ChatComponentText(
|
||||
EnumChatFormatting.DARK_PURPLE + StatCollector.translateToLocal("warp.text.15")));
|
||||
player.addChatMessage(
|
||||
new ChatComponentText(
|
||||
EnumChatFormatting.DARK_PURPLE + StatCollector.translateToLocal("warp.text.15")));
|
||||
player.addPotionEffect(getEffect(PotionThaumarhia.instance.id, 600, true));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,13 +1,15 @@
|
||||
package fox.spiteful.forbidden.items;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.item.ItemFood;
|
||||
import net.minecraft.util.IIcon;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
|
||||
public class ItemGluttonyShard extends ItemFood {
|
||||
|
||||
IIcon icon;
|
||||
|
||||
public ItemGluttonyShard() {
|
||||
|
||||
@@ -1,10 +1,7 @@
|
||||
package fox.spiteful.forbidden.items;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Config;
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
@@ -13,7 +10,12 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.util.StatCollector;
|
||||
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Config;
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
|
||||
public class ItemMobCrystal extends Item {
|
||||
|
||||
@@ -95,12 +97,8 @@ public class ItemMobCrystal extends Item {
|
||||
if (nbttagcompound.hasKey("mob")) {
|
||||
String string = nbttagcompound.getString("mob");
|
||||
|
||||
if (string != null)
|
||||
return (""
|
||||
+ StatCollector.translateToLocal("item.MobCrystal.name")
|
||||
.replace(
|
||||
"%s", StatCollector.translateToLocal("entity." + string + ".name")))
|
||||
.trim();
|
||||
if (string != null) return ("" + StatCollector.translateToLocal("item.MobCrystal.name")
|
||||
.replace("%s", StatCollector.translateToLocal("entity." + string + ".name"))).trim();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,9 +1,7 @@
|
||||
package fox.spiteful.forbidden.items;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
@@ -13,7 +11,12 @@ import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.IIcon;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
|
||||
public class ItemResource extends Item {
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public IIcon[] icons;
|
||||
|
||||
|
||||
@@ -1,10 +1,11 @@
|
||||
package fox.spiteful.forbidden.items;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.item.Item;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.item.Item;
|
||||
|
||||
public class ItemTaintCoal extends Item {
|
||||
|
||||
|
||||
@@ -1,13 +1,7 @@
|
||||
package fox.spiteful.forbidden.items.baubles;
|
||||
|
||||
import baubles.api.BaubleType;
|
||||
import baubles.api.IBauble;
|
||||
import cpw.mods.fml.common.Optional;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
import fox.spiteful.forbidden.compat.Compat;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.client.gui.GuiScreen;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
@@ -17,11 +11,20 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.util.StatCollector;
|
||||
|
||||
import thaumcraft.api.IRunicArmor;
|
||||
import vazkii.botania.api.item.ICosmeticAttachable;
|
||||
import baubles.api.BaubleType;
|
||||
import baubles.api.IBauble;
|
||||
import cpw.mods.fml.common.Optional;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
import fox.spiteful.forbidden.compat.Compat;
|
||||
|
||||
@Optional.Interface(iface = "vazkii.botania.api.item.ICosmeticAttachable", modid = "Botania")
|
||||
public class ItemRingNutrition extends Item implements IRunicArmor, IBauble, ICosmeticAttachable {
|
||||
|
||||
IIcon icon;
|
||||
|
||||
public ItemRingNutrition() {
|
||||
@@ -89,10 +92,9 @@ public class ItemRingNutrition extends Item implements IRunicArmor, IBauble, ICo
|
||||
@Override
|
||||
public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) {
|
||||
|
||||
if (Compat.botan && GuiScreen.isShiftKeyDown() && getCosmeticItem(stack) != null)
|
||||
list.add(String.format(
|
||||
StatCollector.translateToLocal("botaniamisc.hasCosmetic"),
|
||||
getCosmeticItem(stack).getDisplayName())
|
||||
.replaceAll("&", "\u00a7"));
|
||||
if (Compat.botan && GuiScreen.isShiftKeyDown() && getCosmeticItem(stack) != null) list.add(
|
||||
String.format(
|
||||
StatCollector.translateToLocal("botaniamisc.hasCosmetic"),
|
||||
getCosmeticItem(stack).getDisplayName()).replaceAll("&", "\u00a7"));
|
||||
}
|
||||
}
|
||||
@@ -1,14 +1,9 @@
|
||||
package fox.spiteful.forbidden.items.baubles;
|
||||
|
||||
import baubles.api.BaublesApi;
|
||||
import cpw.mods.fml.common.Optional;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
import fox.spiteful.forbidden.compat.Compat;
|
||||
import java.text.DecimalFormat;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.client.gui.GuiScreen;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
@@ -23,9 +18,16 @@ import net.minecraft.util.ChatComponentText;
|
||||
import net.minecraft.util.EnumChatFormatting;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.util.StatCollector;
|
||||
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.common.items.baubles.ItemAmuletVis;
|
||||
import vazkii.botania.api.item.ICosmeticAttachable;
|
||||
import baubles.api.BaublesApi;
|
||||
import cpw.mods.fml.common.Optional;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
import fox.spiteful.forbidden.compat.Compat;
|
||||
|
||||
@Optional.Interface(iface = "vazkii.botania.api.item.ICosmeticAttachable", modid = "Botania")
|
||||
public class ItemSubCollar extends ItemAmuletVis implements ICosmeticAttachable {
|
||||
@@ -73,29 +75,31 @@ public class ItemSubCollar extends ItemAmuletVis implements ICosmeticAttachable
|
||||
@Override
|
||||
public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) {
|
||||
|
||||
list.add(EnumChatFormatting.GOLD + StatCollector.translateToLocal("item.capacity.text") + " "
|
||||
+ this.getMaxVis(stack) / 100);
|
||||
list.add(
|
||||
EnumChatFormatting.GOLD + StatCollector.translateToLocal("item.capacity.text")
|
||||
+ " "
|
||||
+ this.getMaxVis(stack) / 100);
|
||||
if (stack.hasTagCompound()) {
|
||||
Iterator count = Aspect.getPrimalAspects().iterator();
|
||||
|
||||
while (count.hasNext()) {
|
||||
Aspect aspect = (Aspect) count.next();
|
||||
if (stack.stackTagCompound.hasKey(aspect.getTag())) {
|
||||
String amount = this.myFormatter.format(
|
||||
(double) ((float) stack.stackTagCompound.getInteger(aspect.getTag()) / 100.0F));
|
||||
list.add("\u00a7" + aspect.getChatcolor() + aspect.getName() + EnumChatFormatting.RESET + " x "
|
||||
+ amount);
|
||||
String amount = this.myFormatter
|
||||
.format((double) ((float) stack.stackTagCompound.getInteger(aspect.getTag()) / 100.0F));
|
||||
list.add(
|
||||
"\u00a7" + aspect
|
||||
.getChatcolor() + aspect.getName() + EnumChatFormatting.RESET + " x " + amount);
|
||||
}
|
||||
}
|
||||
if (stack.stackTagCompound.hasKey("owner"))
|
||||
list.add(StatCollector.translateToLocal("tooltip.collar.owner") + " "
|
||||
+ stack.stackTagCompound.getString("owner"));
|
||||
if (stack.stackTagCompound.hasKey("owner")) list.add(
|
||||
StatCollector.translateToLocal("tooltip.collar.owner") + " "
|
||||
+ stack.stackTagCompound.getString("owner"));
|
||||
|
||||
if (Compat.botan && GuiScreen.isShiftKeyDown() && getCosmeticItem(stack) != null)
|
||||
list.add(String.format(
|
||||
StatCollector.translateToLocal("botaniamisc.hasCosmetic"),
|
||||
getCosmeticItem(stack).getDisplayName())
|
||||
.replaceAll("&", "\u00a7"));
|
||||
if (Compat.botan && GuiScreen.isShiftKeyDown() && getCosmeticItem(stack) != null) list.add(
|
||||
String.format(
|
||||
StatCollector.translateToLocal("botaniamisc.hasCosmetic"),
|
||||
getCosmeticItem(stack).getDisplayName()).replaceAll("&", "\u00a7"));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -118,16 +122,19 @@ public class ItemSubCollar extends ItemAmuletVis implements ICosmeticAttachable
|
||||
itemstack.stackTagCompound.setString("owner", player.getDisplayName());
|
||||
baubles.setInventorySlotContents(0, itemstack.copy());
|
||||
itemstack.stackSize = 0;
|
||||
sub.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("message.collar.placescollar")
|
||||
.replace("%s", player.getDisplayName())));
|
||||
sub.addChatMessage(
|
||||
new ChatComponentText(
|
||||
StatCollector.translateToLocal("message.collar.placescollar")
|
||||
.replace("%s", player.getDisplayName())));
|
||||
player.addChatMessage(
|
||||
new ChatComponentText(StatCollector.translateToLocal("message.collar.youplacecollar")
|
||||
.replace("%s", sub.getDisplayName())));
|
||||
new ChatComponentText(
|
||||
StatCollector.translateToLocal("message.collar.youplacecollar")
|
||||
.replace("%s", sub.getDisplayName())));
|
||||
return true;
|
||||
} else
|
||||
player.addChatMessage(
|
||||
new ChatComponentText(StatCollector.translateToLocal("message.collar.alreadywearing")
|
||||
.replace("%s", sub.getDisplayName())));
|
||||
} else player.addChatMessage(
|
||||
new ChatComponentText(
|
||||
StatCollector.translateToLocal("message.collar.alreadywearing")
|
||||
.replace("%s", sub.getDisplayName())));
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -1,12 +1,7 @@
|
||||
package fox.spiteful.forbidden.items.scribes;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
|
||||
import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
import fox.spiteful.forbidden.compat.Compat;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
@@ -15,7 +10,14 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.util.StatCollector;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import thaumcraft.api.IScribeTools;
|
||||
import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
|
||||
import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
import fox.spiteful.forbidden.compat.Compat;
|
||||
|
||||
public class ItemBloodwell extends Item implements IScribeTools, IBindable {
|
||||
|
||||
@@ -69,8 +71,9 @@ public class ItemBloodwell extends Item implements IScribeTools, IBindable {
|
||||
public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean z) {
|
||||
if (stack.hasTagCompound()) {
|
||||
list.add("");
|
||||
list.add(StatCollector.translateToLocal("tooltip.currentowner") + " "
|
||||
+ stack.stackTagCompound.getString("ownerName"));
|
||||
list.add(
|
||||
StatCollector.translateToLocal("tooltip.currentowner") + " "
|
||||
+ stack.stackTagCompound.getString("ownerName"));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,12 +1,8 @@
|
||||
package fox.spiteful.forbidden.items.scribes;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
|
||||
import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
@@ -15,14 +11,21 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.util.StatCollector;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import thaumcraft.api.IScribeTools;
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.common.Thaumcraft;
|
||||
import thaumcraft.common.lib.network.PacketHandler;
|
||||
import thaumcraft.common.lib.network.playerdata.PacketAspectPool;
|
||||
import thaumcraft.common.lib.research.ResearchManager;
|
||||
import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
|
||||
import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
|
||||
public class ItemBoundwell extends Item implements IScribeTools, IBindable {
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public IIcon icon;
|
||||
|
||||
@@ -61,14 +64,14 @@ public class ItemBoundwell extends Item implements IScribeTools, IBindable {
|
||||
}
|
||||
Aspect aspect;
|
||||
short amount;
|
||||
for (Iterator count = Aspect.getPrimalAspects().iterator();
|
||||
count.hasNext();
|
||||
PacketHandler.INSTANCE.sendTo(
|
||||
for (Iterator count = Aspect.getPrimalAspects().iterator(); count.hasNext(); PacketHandler.INSTANCE
|
||||
.sendTo(
|
||||
new PacketAspectPool(
|
||||
aspect.getTag(),
|
||||
Short.valueOf(amount),
|
||||
Short.valueOf(Thaumcraft.proxy.playerKnowledge.getAspectPoolFor(
|
||||
player.getCommandSenderName(), aspect))),
|
||||
Short.valueOf(
|
||||
Thaumcraft.proxy.playerKnowledge
|
||||
.getAspectPoolFor(player.getCommandSenderName(), aspect))),
|
||||
(EntityPlayerMP) player)) {
|
||||
aspect = (Aspect) count.next();
|
||||
amount = (short) (world.rand.nextInt(4) + 4);
|
||||
@@ -84,8 +87,9 @@ public class ItemBoundwell extends Item implements IScribeTools, IBindable {
|
||||
public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean z) {
|
||||
if (stack.hasTagCompound()) {
|
||||
list.add("");
|
||||
list.add(StatCollector.translateToLocal("tooltip.currentowner") + " "
|
||||
+ stack.stackTagCompound.getString("ownerName"));
|
||||
list.add(
|
||||
StatCollector.translateToLocal("tooltip.currentowner") + " "
|
||||
+ stack.stackTagCompound.getString("ownerName"));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,9 +1,7 @@
|
||||
package fox.spiteful.forbidden.items.scribes;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
import java.util.Iterator;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
@@ -12,6 +10,7 @@ import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import thaumcraft.api.IScribeTools;
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.common.Thaumcraft;
|
||||
@@ -20,6 +19,9 @@ import thaumcraft.common.config.ConfigItems;
|
||||
import thaumcraft.common.lib.network.PacketHandler;
|
||||
import thaumcraft.common.lib.network.playerdata.PacketAspectPool;
|
||||
import thaumcraft.common.lib.research.ResearchManager;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
|
||||
public class ItemCrystalwell extends Item implements IScribeTools {
|
||||
|
||||
@@ -53,14 +55,14 @@ public class ItemCrystalwell extends Item implements IScribeTools {
|
||||
if (!world.isRemote) {
|
||||
Aspect aspect;
|
||||
short amount;
|
||||
for (Iterator count = Aspect.getPrimalAspects().iterator();
|
||||
count.hasNext();
|
||||
PacketHandler.INSTANCE.sendTo(
|
||||
for (Iterator count = Aspect.getPrimalAspects().iterator(); count.hasNext(); PacketHandler.INSTANCE
|
||||
.sendTo(
|
||||
new PacketAspectPool(
|
||||
aspect.getTag(),
|
||||
Short.valueOf(amount),
|
||||
Short.valueOf(Thaumcraft.proxy.playerKnowledge.getAspectPoolFor(
|
||||
player.getCommandSenderName(), aspect))),
|
||||
Short.valueOf(
|
||||
Thaumcraft.proxy.playerKnowledge
|
||||
.getAspectPoolFor(player.getCommandSenderName(), aspect))),
|
||||
(EntityPlayerMP) player)) {
|
||||
aspect = (Aspect) count.next();
|
||||
amount = (short) (world.rand.nextInt(4) + 4);
|
||||
@@ -86,8 +88,9 @@ public class ItemCrystalwell extends Item implements IScribeTools {
|
||||
new PacketAspectPool(
|
||||
aspect.getTag(),
|
||||
amount,
|
||||
Short.valueOf(Thaumcraft.proxy.playerKnowledge.getAspectPoolFor(
|
||||
player.getCommandSenderName(), aspect))),
|
||||
Short.valueOf(
|
||||
Thaumcraft.proxy.playerKnowledge
|
||||
.getAspectPoolFor(player.getCommandSenderName(), aspect))),
|
||||
(EntityPlayerMP) player);
|
||||
ResearchManager.scheduleSave(player);
|
||||
stack.setItemDamage(stack.getItemDamage() + 1);
|
||||
|
||||
@@ -1,14 +1,15 @@
|
||||
package fox.spiteful.forbidden.items.scribes;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.item.EnumRarity;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.IIcon;
|
||||
|
||||
import thaumcraft.api.IScribeTools;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
|
||||
public class ItemPrimewell extends Item implements IScribeTools {
|
||||
|
||||
|
||||
@@ -1,10 +1,5 @@
|
||||
package fox.spiteful.forbidden.items.tools;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.compat.Compat;
|
||||
import fox.spiteful.forbidden.potions.DarkPotions;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
@@ -16,9 +11,15 @@ import net.minecraft.potion.PotionEffect;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.util.EnumHelper;
|
||||
|
||||
import thaumcraft.api.IRepairable;
|
||||
import thaumcraft.api.IWarpingGear;
|
||||
import thaumcraft.common.config.ConfigItems;
|
||||
import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.compat.Compat;
|
||||
import fox.spiteful.forbidden.potions.DarkPotions;
|
||||
|
||||
public class ItemBloodRapier extends ItemSword implements IRepairable, IWarpingGear {
|
||||
|
||||
@@ -49,8 +50,7 @@ public class ItemBloodRapier extends ItemSword implements IRepairable, IWarpingG
|
||||
@Override
|
||||
public void onUpdate(ItemStack stack, World world, Entity entity, int wat, boolean fuckObfuscation) {
|
||||
super.onUpdate(stack, world, entity, wat, fuckObfuscation);
|
||||
if (stack.isItemDamaged()
|
||||
&& entity != null
|
||||
if (stack.isItemDamaged() && entity != null
|
||||
&& entity.ticksExisted % 20 == 0
|
||||
&& entity instanceof EntityLivingBase) {
|
||||
stack.damageItem(-1, (EntityLivingBase) entity);
|
||||
@@ -76,8 +76,7 @@ public class ItemBloodRapier extends ItemSword implements IRepairable, IWarpingG
|
||||
|
||||
@Override
|
||||
public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) {
|
||||
return par2ItemStack.isItemEqual(new ItemStack(ConfigItems.itemResource, 1, 15))
|
||||
? true
|
||||
return par2ItemStack.isItemEqual(new ItemStack(ConfigItems.itemResource, 1, 15)) ? true
|
||||
: super.getIsRepairable(par1ItemStack, par2ItemStack);
|
||||
}
|
||||
|
||||
|
||||
@@ -1,9 +1,5 @@
|
||||
package fox.spiteful.forbidden.items.tools;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Config;
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
@@ -13,7 +9,12 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.ItemSword;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import thaumcraft.api.IRepairable;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Config;
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
|
||||
public class ItemDiabolistFork extends ItemSword implements IRepairable {
|
||||
|
||||
|
||||
@@ -1,10 +1,5 @@
|
||||
package fox.spiteful.forbidden.items.tools;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
import fox.spiteful.forbidden.enchantments.DarkEnchantments;
|
||||
import fox.spiteful.forbidden.items.ForbiddenItems;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.enchantment.EnchantmentHelper;
|
||||
import net.minecraft.entity.Entity;
|
||||
@@ -17,10 +12,17 @@ import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.nbt.NBTTagList;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import thaumcraft.api.IRepairable;
|
||||
import thaumcraft.api.IWarpingGear;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
import fox.spiteful.forbidden.enchantments.DarkEnchantments;
|
||||
import fox.spiteful.forbidden.items.ForbiddenItems;
|
||||
|
||||
public class ItemMorphAxe extends ItemAxe implements IRepairable, IWarpingGear {
|
||||
|
||||
public IIcon[] icon;
|
||||
|
||||
public ItemMorphAxe(ToolMaterial enumtoolmaterial) {
|
||||
@@ -46,15 +48,13 @@ public class ItemMorphAxe extends ItemAxe implements IRepairable, IWarpingGear {
|
||||
}
|
||||
|
||||
public boolean getIsRepairable(ItemStack stack, ItemStack stack2) {
|
||||
return stack2.isItemEqual(new ItemStack(ForbiddenItems.deadlyShards, 1, 1))
|
||||
? true
|
||||
return stack2.isItemEqual(new ItemStack(ForbiddenItems.deadlyShards, 1, 1)) ? true
|
||||
: super.getIsRepairable(stack, stack2);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer player) {
|
||||
if (player.isSneaking()
|
||||
&& itemstack.hasTagCompound()
|
||||
if (player.isSneaking() && itemstack.hasTagCompound()
|
||||
&& getMaxDamage(itemstack) - itemstack.getItemDamage() > 5) {
|
||||
NBTTagCompound tags = itemstack.getTagCompound();
|
||||
byte phase = tags.getByte("phase");
|
||||
@@ -65,8 +65,7 @@ public class ItemMorphAxe extends ItemAxe implements IRepairable, IWarpingGear {
|
||||
|
||||
if (tags.hasKey("display")) {
|
||||
String name = tags.getCompoundTag("display").getString("Name");
|
||||
if (name != null && !name.equals(""))
|
||||
tags.getCompoundTag("display").setString("Name" + phase, name);
|
||||
if (name != null && !name.equals("")) tags.getCompoundTag("display").setString("Name" + phase, name);
|
||||
else tags.getCompoundTag("display").removeTag("Name" + phase);
|
||||
}
|
||||
if (++phase > 2) phase = 0;
|
||||
@@ -78,8 +77,7 @@ public class ItemMorphAxe extends ItemAxe implements IRepairable, IWarpingGear {
|
||||
|
||||
if (tags.hasKey("display")) {
|
||||
String name = tags.getCompoundTag("display").getString("Name" + phase);
|
||||
if (name != null && !name.equals(""))
|
||||
tags.getCompoundTag("display").setString("Name", name);
|
||||
if (name != null && !name.equals("")) tags.getCompoundTag("display").setString("Name", name);
|
||||
else tags.getCompoundTag("display").removeTag("Name");
|
||||
}
|
||||
|
||||
|
||||
@@ -1,10 +1,5 @@
|
||||
package fox.spiteful.forbidden.items.tools;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
import fox.spiteful.forbidden.enchantments.DarkEnchantments;
|
||||
import fox.spiteful.forbidden.items.ForbiddenItems;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.enchantment.EnchantmentHelper;
|
||||
@@ -20,11 +15,18 @@ import net.minecraft.util.IIcon;
|
||||
import net.minecraft.util.MovingObjectPosition;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.ForgeHooks;
|
||||
|
||||
import thaumcraft.api.IRepairable;
|
||||
import thaumcraft.api.IWarpingGear;
|
||||
import thaumcraft.common.lib.utils.BlockUtils;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
import fox.spiteful.forbidden.enchantments.DarkEnchantments;
|
||||
import fox.spiteful.forbidden.items.ForbiddenItems;
|
||||
|
||||
public class ItemMorphPickaxe extends ItemPickaxe implements IRepairable, IWarpingGear {
|
||||
|
||||
public IIcon[] icon;
|
||||
int side;
|
||||
|
||||
@@ -55,15 +57,13 @@ public class ItemMorphPickaxe extends ItemPickaxe implements IRepairable, IWarpi
|
||||
|
||||
@Override
|
||||
public boolean getIsRepairable(ItemStack stack, ItemStack stack2) {
|
||||
return stack2.isItemEqual(new ItemStack(ForbiddenItems.deadlyShards, 1, 1))
|
||||
? true
|
||||
return stack2.isItemEqual(new ItemStack(ForbiddenItems.deadlyShards, 1, 1)) ? true
|
||||
: super.getIsRepairable(stack, stack2);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer player) {
|
||||
if (player.isSneaking()
|
||||
&& itemstack.hasTagCompound()
|
||||
if (player.isSneaking() && itemstack.hasTagCompound()
|
||||
&& getMaxDamage(itemstack) - itemstack.getItemDamage() > 5) {
|
||||
NBTTagCompound tags = itemstack.getTagCompound();
|
||||
byte phase = tags.getByte("phase");
|
||||
@@ -74,8 +74,7 @@ public class ItemMorphPickaxe extends ItemPickaxe implements IRepairable, IWarpi
|
||||
|
||||
if (tags.hasKey("display")) {
|
||||
String name = tags.getCompoundTag("display").getString("Name");
|
||||
if (name != null && !name.equals(""))
|
||||
tags.getCompoundTag("display").setString("Name" + phase, name);
|
||||
if (name != null && !name.equals("")) tags.getCompoundTag("display").setString("Name" + phase, name);
|
||||
else tags.getCompoundTag("display").removeTag("Name" + phase);
|
||||
}
|
||||
if (++phase > 2) phase = 0;
|
||||
@@ -87,8 +86,7 @@ public class ItemMorphPickaxe extends ItemPickaxe implements IRepairable, IWarpi
|
||||
|
||||
if (tags.hasKey("display")) {
|
||||
String name = tags.getCompoundTag("display").getString("Name" + phase);
|
||||
if (name != null && !name.equals(""))
|
||||
tags.getCompoundTag("display").setString("Name", name);
|
||||
if (name != null && !name.equals("")) tags.getCompoundTag("display").setString("Name", name);
|
||||
else tags.getCompoundTag("display").removeTag("Name");
|
||||
}
|
||||
|
||||
@@ -153,8 +151,8 @@ public class ItemMorphPickaxe extends ItemPickaxe implements IRepairable, IWarpi
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onBlockDestroyed(
|
||||
ItemStack stack, World world, Block block, int x, int y, int z, EntityLivingBase player) {
|
||||
public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int x, int y, int z,
|
||||
EntityLivingBase player) {
|
||||
if (EnchantmentHelper.getEnchantmentLevel(DarkEnchantments.impact.effectId, stack) <= 0)
|
||||
return super.onBlockDestroyed(stack, world, block, x, y, z, player);
|
||||
if (!player.worldObj.isRemote) {
|
||||
|
||||
@@ -1,10 +1,5 @@
|
||||
package fox.spiteful.forbidden.items.tools;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
import fox.spiteful.forbidden.enchantments.DarkEnchantments;
|
||||
import fox.spiteful.forbidden.items.ForbiddenItems;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.enchantment.EnchantmentHelper;
|
||||
@@ -20,11 +15,18 @@ import net.minecraft.util.IIcon;
|
||||
import net.minecraft.util.MovingObjectPosition;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.ForgeHooks;
|
||||
|
||||
import thaumcraft.api.IRepairable;
|
||||
import thaumcraft.api.IWarpingGear;
|
||||
import thaumcraft.common.lib.utils.BlockUtils;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
import fox.spiteful.forbidden.enchantments.DarkEnchantments;
|
||||
import fox.spiteful.forbidden.items.ForbiddenItems;
|
||||
|
||||
public class ItemMorphShovel extends ItemSpade implements IRepairable, IWarpingGear {
|
||||
|
||||
public IIcon[] icon;
|
||||
int side;
|
||||
|
||||
@@ -51,15 +53,13 @@ public class ItemMorphShovel extends ItemSpade implements IRepairable, IWarpingG
|
||||
}
|
||||
|
||||
public boolean getIsRepairable(ItemStack stack, ItemStack stack2) {
|
||||
return stack2.isItemEqual(new ItemStack(ForbiddenItems.deadlyShards, 1, 1))
|
||||
? true
|
||||
return stack2.isItemEqual(new ItemStack(ForbiddenItems.deadlyShards, 1, 1)) ? true
|
||||
: super.getIsRepairable(stack, stack2);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer player) {
|
||||
if (player.isSneaking()
|
||||
&& itemstack.hasTagCompound()
|
||||
if (player.isSneaking() && itemstack.hasTagCompound()
|
||||
&& getMaxDamage(itemstack) - itemstack.getItemDamage() > 5) {
|
||||
NBTTagCompound tags = itemstack.getTagCompound();
|
||||
byte phase = tags.getByte("phase");
|
||||
@@ -70,8 +70,7 @@ public class ItemMorphShovel extends ItemSpade implements IRepairable, IWarpingG
|
||||
|
||||
if (tags.hasKey("display")) {
|
||||
String name = tags.getCompoundTag("display").getString("Name");
|
||||
if (name != null && !name.equals(""))
|
||||
tags.getCompoundTag("display").setString("Name" + phase, name);
|
||||
if (name != null && !name.equals("")) tags.getCompoundTag("display").setString("Name" + phase, name);
|
||||
else tags.getCompoundTag("display").removeTag("Name" + phase);
|
||||
}
|
||||
if (++phase > 2) phase = 0;
|
||||
@@ -83,8 +82,7 @@ public class ItemMorphShovel extends ItemSpade implements IRepairable, IWarpingG
|
||||
|
||||
if (tags.hasKey("display")) {
|
||||
String name = tags.getCompoundTag("display").getString("Name" + phase);
|
||||
if (name != null && !name.equals(""))
|
||||
tags.getCompoundTag("display").setString("Name", name);
|
||||
if (name != null && !name.equals("")) tags.getCompoundTag("display").setString("Name", name);
|
||||
else tags.getCompoundTag("display").removeTag("Name");
|
||||
}
|
||||
|
||||
@@ -148,8 +146,8 @@ public class ItemMorphShovel extends ItemSpade implements IRepairable, IWarpingG
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onBlockDestroyed(
|
||||
ItemStack stack, World world, Block block, int x, int y, int z, EntityLivingBase player) {
|
||||
public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int x, int y, int z,
|
||||
EntityLivingBase player) {
|
||||
if (EnchantmentHelper.getEnchantmentLevel(DarkEnchantments.impact.effectId, stack) <= 0)
|
||||
return super.onBlockDestroyed(stack, world, block, x, y, z, player);
|
||||
if (!player.worldObj.isRemote) {
|
||||
|
||||
@@ -1,10 +1,5 @@
|
||||
package fox.spiteful.forbidden.items.tools;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
import fox.spiteful.forbidden.enchantments.DarkEnchantments;
|
||||
import fox.spiteful.forbidden.items.ForbiddenItems;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.enchantment.EnchantmentHelper;
|
||||
import net.minecraft.entity.Entity;
|
||||
@@ -17,10 +12,17 @@ import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.nbt.NBTTagList;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import thaumcraft.api.IRepairable;
|
||||
import thaumcraft.api.IWarpingGear;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
import fox.spiteful.forbidden.enchantments.DarkEnchantments;
|
||||
import fox.spiteful.forbidden.items.ForbiddenItems;
|
||||
|
||||
public class ItemMorphSword extends ItemSword implements IRepairable, IWarpingGear {
|
||||
|
||||
public IIcon[] icon;
|
||||
|
||||
public ItemMorphSword(ToolMaterial enumtoolmaterial) {
|
||||
@@ -47,15 +49,13 @@ public class ItemMorphSword extends ItemSword implements IRepairable, IWarpingGe
|
||||
|
||||
@Override
|
||||
public boolean getIsRepairable(ItemStack stack, ItemStack stack2) {
|
||||
return stack2.isItemEqual(new ItemStack(ForbiddenItems.deadlyShards, 1, 1))
|
||||
? true
|
||||
return stack2.isItemEqual(new ItemStack(ForbiddenItems.deadlyShards, 1, 1)) ? true
|
||||
: super.getIsRepairable(stack, stack2);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer player) {
|
||||
if (player.isSneaking()
|
||||
&& itemstack.hasTagCompound()
|
||||
if (player.isSneaking() && itemstack.hasTagCompound()
|
||||
&& getMaxDamage(itemstack) - itemstack.getItemDamage() > 5) {
|
||||
NBTTagCompound tags = itemstack.getTagCompound();
|
||||
byte phase = tags.getByte("phase");
|
||||
@@ -66,8 +66,7 @@ public class ItemMorphSword extends ItemSword implements IRepairable, IWarpingGe
|
||||
|
||||
if (tags.hasKey("display")) {
|
||||
String name = tags.getCompoundTag("display").getString("Name");
|
||||
if (name != null && !name.equals(""))
|
||||
tags.getCompoundTag("display").setString("Name" + phase, name);
|
||||
if (name != null && !name.equals("")) tags.getCompoundTag("display").setString("Name" + phase, name);
|
||||
else tags.getCompoundTag("display").removeTag("Name" + phase);
|
||||
}
|
||||
if (++phase > 2) phase = 0;
|
||||
@@ -79,8 +78,7 @@ public class ItemMorphSword extends ItemSword implements IRepairable, IWarpingGe
|
||||
|
||||
if (tags.hasKey("display")) {
|
||||
String name = tags.getCompoundTag("display").getString("Name" + phase);
|
||||
if (name != null && !name.equals(""))
|
||||
tags.getCompoundTag("display").setString("Name", name);
|
||||
if (name != null && !name.equals("")) tags.getCompoundTag("display").setString("Name", name);
|
||||
else tags.getCompoundTag("display").removeTag("Name");
|
||||
}
|
||||
|
||||
|
||||
@@ -1,10 +1,5 @@
|
||||
package fox.spiteful.forbidden.items.tools;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Config;
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
import fox.spiteful.forbidden.items.ForbiddenItems;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
@@ -23,6 +18,12 @@ import net.minecraft.util.DamageSource;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Config;
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
import fox.spiteful.forbidden.items.ForbiddenItems;
|
||||
|
||||
public class ItemRidingCrop extends ItemSword {
|
||||
|
||||
public IIcon icon;
|
||||
@@ -48,8 +49,7 @@ public class ItemRidingCrop extends ItemSword {
|
||||
victim.addPotionEffect(new PotionEffect(Potion.digSpeed.id, 200, 1));
|
||||
victim.addPotionEffect(new PotionEffect(Potion.damageBoost.id, 200, 1));
|
||||
}
|
||||
if (!player.worldObj.isRemote
|
||||
&& !Config.noLust
|
||||
if (!player.worldObj.isRemote && !Config.noLust
|
||||
&& player.worldObj.provider.dimensionId == -1
|
||||
&& player.worldObj.rand.nextInt(15) == 1) {
|
||||
EntityItem ent = victim.entityDropItem(new ItemStack(ForbiddenItems.deadlyShards, 1, 4), 1.0F);
|
||||
|
||||
@@ -1,18 +1,20 @@
|
||||
package fox.spiteful.forbidden.items.tools;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Config;
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.item.EnumRarity;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.ItemSword;
|
||||
import net.minecraft.util.IIcon;
|
||||
|
||||
import thaumcraft.api.IRepairable;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Config;
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
|
||||
public class ItemSkullAxe extends ItemSword implements IRepairable {
|
||||
|
||||
public IIcon icon;
|
||||
|
||||
public ItemSkullAxe(ToolMaterial enumtoolmaterial) {
|
||||
|
||||
@@ -1,17 +1,19 @@
|
||||
package fox.spiteful.forbidden.items.tools;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Config;
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.item.EnumRarity;
|
||||
import net.minecraft.item.ItemPickaxe;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.IIcon;
|
||||
|
||||
import thaumcraft.api.IRepairable;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Config;
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
|
||||
public class ItemTaintPickaxe extends ItemPickaxe implements IRepairable {
|
||||
|
||||
public IIcon icon;
|
||||
|
||||
public ItemTaintPickaxe(ToolMaterial enumtoolmaterial) {
|
||||
@@ -37,8 +39,7 @@ public class ItemTaintPickaxe extends ItemPickaxe implements IRepairable {
|
||||
|
||||
@Override
|
||||
public boolean getIsRepairable(ItemStack stack, ItemStack stack2) {
|
||||
return stack2.isItemEqual(new ItemStack(Config.thaumcraftResource.getItem(), 1, 2))
|
||||
? true
|
||||
return stack2.isItemEqual(new ItemStack(Config.thaumcraftResource.getItem(), 1, 2)) ? true
|
||||
: super.getIsRepairable(stack, stack2);
|
||||
}
|
||||
}
|
||||
@@ -1,10 +1,5 @@
|
||||
package fox.spiteful.forbidden.items.tools;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Config;
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
import fox.spiteful.forbidden.blocks.ForbiddenBlocks;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
@@ -14,11 +9,18 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.ForgeHooks;
|
||||
|
||||
import thaumcraft.api.IRepairable;
|
||||
import thaumcraft.common.Thaumcraft;
|
||||
import thaumcraft.common.config.ConfigBlocks;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Config;
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
import fox.spiteful.forbidden.blocks.ForbiddenBlocks;
|
||||
|
||||
public class ItemTaintShovel extends ItemSpade implements IRepairable {
|
||||
|
||||
public IIcon icon;
|
||||
|
||||
public ItemTaintShovel(ToolMaterial enumtoolmaterial) {
|
||||
@@ -42,16 +44,14 @@ public class ItemTaintShovel extends ItemSpade implements IRepairable {
|
||||
}
|
||||
|
||||
public boolean getIsRepairable(ItemStack stack, ItemStack stack2) {
|
||||
return stack2.isItemEqual(new ItemStack(Config.thaumcraftResource.getItem(), 1, 2))
|
||||
? true
|
||||
return stack2.isItemEqual(new ItemStack(Config.thaumcraftResource.getItem(), 1, 2)) ? true
|
||||
: super.getIsRepairable(stack, stack2);
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getDigSpeed(ItemStack stack, Block block, int meta) {
|
||||
if (ForgeHooks.isToolEffective(stack, block, meta)
|
||||
|| (block.getMaterial() == Config.taintMaterial
|
||||
&& block != ForbiddenBlocks.taintLog
|
||||
|| (block.getMaterial() == Config.taintMaterial && block != ForbiddenBlocks.taintLog
|
||||
&& block != ForbiddenBlocks.taintPlanks
|
||||
&& block != ForbiddenBlocks.taintStone)) {
|
||||
return efficiencyOnProperMaterial;
|
||||
@@ -61,17 +61,8 @@ public class ItemTaintShovel extends ItemSpade implements IRepairable {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onItemUse(
|
||||
ItemStack itemstack,
|
||||
EntityPlayer player,
|
||||
World world,
|
||||
int x,
|
||||
int y,
|
||||
int z,
|
||||
int side,
|
||||
float par8,
|
||||
float par9,
|
||||
float par10) {
|
||||
public boolean onItemUse(ItemStack itemstack, EntityPlayer player, World world, int x, int y, int z, int side,
|
||||
float par8, float par9, float par10) {
|
||||
int purified = 0;
|
||||
for (int ex = x - 5; ex < x + 6; ex++) {
|
||||
for (int wy = y - 4; wy < y + 5; wy++) {
|
||||
@@ -85,7 +76,13 @@ public class ItemTaintShovel extends ItemSpade implements IRepairable {
|
||||
float d2 = ((float) wy + world.rand.nextFloat());
|
||||
float d0 = ((float) zee + world.rand.nextFloat());
|
||||
Thaumcraft.proxy.nodeBolt(
|
||||
world, (float) player.posX, (float) player.posY, (float) player.posZ, d1, d2, d0);
|
||||
world,
|
||||
(float) player.posX,
|
||||
(float) player.posY,
|
||||
(float) player.posZ,
|
||||
d1,
|
||||
d2,
|
||||
d0);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,14 +1,15 @@
|
||||
package fox.spiteful.forbidden.items.wands;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
|
||||
import fox.spiteful.forbidden.Config;
|
||||
import fox.spiteful.forbidden.compat.Compat;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.DamageSource;
|
||||
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.api.wands.IWandRodOnUpdate;
|
||||
import thaumcraft.common.items.wands.ItemWandCasting;
|
||||
import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
|
||||
import fox.spiteful.forbidden.Config;
|
||||
import fox.spiteful.forbidden.compat.Compat;
|
||||
|
||||
public class BloodStaffUpdate implements IWandRodOnUpdate {
|
||||
|
||||
@@ -22,10 +23,8 @@ public class BloodStaffUpdate implements IWandRodOnUpdate {
|
||||
SoulNetworkHandler.checkAndSetItemOwner(itemstack, player);
|
||||
|
||||
int cost;
|
||||
if (((ItemWandCasting) itemstack.getItem())
|
||||
.getCap(itemstack)
|
||||
.getTag()
|
||||
.equals("alchemical")) cost = Config.bloodvis - 1;
|
||||
if (((ItemWandCasting) itemstack.getItem()).getCap(itemstack).getTag().equals("alchemical"))
|
||||
cost = Config.bloodvis - 1;
|
||||
else cost = Config.bloodvis;
|
||||
|
||||
cost = Math.max(0, cost);
|
||||
|
||||
@@ -1,13 +1,14 @@
|
||||
package fox.spiteful.forbidden.items.wands;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
|
||||
import fox.spiteful.forbidden.Config;
|
||||
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;
|
||||
import thaumcraft.common.items.wands.ItemWandCasting;
|
||||
import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
|
||||
import fox.spiteful.forbidden.Config;
|
||||
import fox.spiteful.forbidden.compat.Compat;
|
||||
|
||||
public class BloodWandUpdate implements IWandRodOnUpdate {
|
||||
|
||||
@@ -19,10 +20,8 @@ public class BloodWandUpdate implements IWandRodOnUpdate {
|
||||
SoulNetworkHandler.checkAndSetItemOwner(itemstack, player);
|
||||
|
||||
int cost;
|
||||
if (((ItemWandCasting) itemstack.getItem())
|
||||
.getCap(itemstack)
|
||||
.getTag()
|
||||
.equals("alchemical")) cost = Config.bloodvis - 1;
|
||||
if (((ItemWandCasting) itemstack.getItem()).getCap(itemstack).getTag().equals("alchemical"))
|
||||
cost = Config.bloodvis - 1;
|
||||
else cost = Config.bloodvis;
|
||||
|
||||
cost = Math.max(0, cost);
|
||||
|
||||
@@ -2,6 +2,7 @@ package fox.spiteful.forbidden.items.wands;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.api.wands.IWandRodOnUpdate;
|
||||
import thaumcraft.common.items.wands.ItemWandCasting;
|
||||
@@ -14,13 +15,12 @@ public class CreativeWandUpdate implements IWandRodOnUpdate {
|
||||
for (int x = 0; x < primals.length; x++) {
|
||||
if (((ItemWandCasting) itemstack.getItem()).getVis(itemstack, primals[x])
|
||||
< ((ItemWandCasting) itemstack.getItem()).getMaxVis(itemstack)) {
|
||||
((ItemWandCasting) itemstack.getItem())
|
||||
.addVis(
|
||||
itemstack,
|
||||
primals[x],
|
||||
((ItemWandCasting) itemstack.getItem()).getMaxVis(itemstack)
|
||||
- ((ItemWandCasting) itemstack.getItem()).getVis(itemstack, primals[x]),
|
||||
true);
|
||||
((ItemWandCasting) itemstack.getItem()).addVis(
|
||||
itemstack,
|
||||
primals[x],
|
||||
((ItemWandCasting) itemstack.getItem()).getMaxVis(itemstack)
|
||||
- ((ItemWandCasting) itemstack.getItem()).getVis(itemstack, primals[x]),
|
||||
true);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,32 +1,29 @@
|
||||
package fox.spiteful.forbidden.items.wands;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.api.wands.WandCap;
|
||||
|
||||
/**
|
||||
* This class is used to keep the material information for the various caps. It
|
||||
* is also used to generate the wand recipes ingame.
|
||||
* 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 DarkWandCap extends WandCap {
|
||||
|
||||
public DarkWandCap(String tag, float discount, ItemStack item, int craftCost, ResourceLocation skin) {
|
||||
super(tag, discount, item, craftCost);
|
||||
setTexture(skin);
|
||||
}
|
||||
|
||||
public DarkWandCap(
|
||||
String tag,
|
||||
float discount,
|
||||
List<Aspect> specialAspects,
|
||||
float discountSpecial,
|
||||
ItemStack item,
|
||||
int craftCost,
|
||||
ResourceLocation skin) {
|
||||
public DarkWandCap(String tag, float discount, List<Aspect> specialAspects, float discountSpecial, ItemStack item,
|
||||
int craftCost, ResourceLocation skin) {
|
||||
super(tag, discount, specialAspects, discountSpecial, item, craftCost);
|
||||
setTexture(skin);
|
||||
}
|
||||
|
||||
@@ -3,13 +3,14 @@ package fox.spiteful.forbidden.items.wands;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.potion.Potion;
|
||||
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.api.wands.IWandRodOnUpdate;
|
||||
import thaumcraft.common.items.wands.ItemWandCasting;
|
||||
|
||||
public class InfernalWandUpdate implements IWandRodOnUpdate {
|
||||
|
||||
Aspect primals[] = {Aspect.ORDER, Aspect.ENTROPY, Aspect.AIR, Aspect.EARTH, Aspect.WATER};
|
||||
Aspect primals[] = { Aspect.ORDER, Aspect.ENTROPY, Aspect.AIR, Aspect.EARTH, Aspect.WATER };
|
||||
|
||||
public void onUpdate(ItemStack itemstack, EntityPlayer player) {
|
||||
if (player.ticksExisted % 100 == 0) {
|
||||
|
||||
@@ -1,12 +1,7 @@
|
||||
package fox.spiteful.forbidden.items.wands;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Config;
|
||||
import fox.spiteful.forbidden.DarkAspects;
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
import fox.spiteful.forbidden.items.ForbiddenItems;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.monster.IMob;
|
||||
@@ -14,12 +9,19 @@ import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.*;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.api.aspects.AspectList;
|
||||
import thaumcraft.api.wands.FocusUpgradeType;
|
||||
import thaumcraft.api.wands.ItemFocusBasic;
|
||||
import thaumcraft.common.items.wands.ItemWandCasting;
|
||||
import thaumcraft.common.lib.utils.BlockUtils;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Config;
|
||||
import fox.spiteful.forbidden.DarkAspects;
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
import fox.spiteful.forbidden.items.ForbiddenItems;
|
||||
|
||||
public class ItemFocusBlink extends ItemFocusBasic {
|
||||
|
||||
@@ -47,8 +49,8 @@ public class ItemFocusBlink extends ItemFocusBasic {
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack onFocusRightClick(
|
||||
ItemStack itemstack, World world, EntityPlayer player, MovingObjectPosition wut) {
|
||||
public ItemStack onFocusRightClick(ItemStack itemstack, World world, EntityPlayer player,
|
||||
MovingObjectPosition wut) {
|
||||
MovingObjectPosition mop = BlockUtils.getTargetBlock(
|
||||
world,
|
||||
(player.prevPosX + (player.posX - player.prevPosX)),
|
||||
@@ -84,7 +86,12 @@ public class ItemFocusBlink extends ItemFocusBasic {
|
||||
break;
|
||||
}
|
||||
world.playAuxSFXAtEntity(
|
||||
(EntityPlayer) null, 1009, (int) player.posX, (int) player.posY, (int) player.posZ, 0);
|
||||
(EntityPlayer) null,
|
||||
1009,
|
||||
(int) player.posX,
|
||||
(int) player.posY,
|
||||
(int) player.posZ,
|
||||
0);
|
||||
for (int k = 0; k < 8; ++k) {
|
||||
world.spawnParticle(
|
||||
"smoke",
|
||||
@@ -100,7 +107,12 @@ public class ItemFocusBlink extends ItemFocusBasic {
|
||||
List<EntityLivingBase> entities = world.getEntitiesWithinAABB(
|
||||
EntityLivingBase.class,
|
||||
AxisAlignedBB.getBoundingBox(
|
||||
ex - range, wy - range, zee - range, ex + range, wy + range, zee + range));
|
||||
ex - range,
|
||||
wy - range,
|
||||
zee - range,
|
||||
ex + range,
|
||||
wy + range,
|
||||
zee + range));
|
||||
for (EntityLivingBase entity : entities) {
|
||||
if (entity == player) continue;
|
||||
for (int k = 0; k < 8; ++k) {
|
||||
@@ -115,14 +127,20 @@ public class ItemFocusBlink extends ItemFocusBasic {
|
||||
}
|
||||
int potency = wand.getFocusPotency(itemstack);
|
||||
entity.attackEntityFrom(
|
||||
(new EntityDamageSource("fireball", player)).setFireDamage(), 3 + 3 * potency);
|
||||
(new EntityDamageSource("fireball", player)).setFireDamage(),
|
||||
3 + 3 * potency);
|
||||
entity.setFire(3 + 3 * potency);
|
||||
}
|
||||
} else if (this.isUpgradedWith(wand.getFocusItem(itemstack), pandemonium)) {
|
||||
List<EntityLivingBase> entities = world.getEntitiesWithinAABB(
|
||||
EntityLivingBase.class,
|
||||
AxisAlignedBB.getBoundingBox(
|
||||
ex - range, wy - range, zee - range, ex + range, wy + range, zee + range));
|
||||
ex - range,
|
||||
wy - range,
|
||||
zee - range,
|
||||
ex + range,
|
||||
wy + range,
|
||||
zee + range));
|
||||
for (EntityLivingBase entity : entities) {
|
||||
if (!(entity instanceof IMob)) continue;
|
||||
for (int k = 0; k < 8; ++k) {
|
||||
@@ -140,7 +158,12 @@ public class ItemFocusBlink extends ItemFocusBasic {
|
||||
}
|
||||
player.setPositionAndUpdate(ex, wy, zee);
|
||||
world.playAuxSFXAtEntity(
|
||||
(EntityPlayer) null, 1009, (int) player.posX, (int) player.posY, (int) player.posZ, 0);
|
||||
(EntityPlayer) null,
|
||||
1009,
|
||||
(int) player.posX,
|
||||
(int) player.posY,
|
||||
(int) player.posZ,
|
||||
0);
|
||||
for (int k = 0; k < 8; ++k) {
|
||||
world.spawnParticle(
|
||||
"flame",
|
||||
@@ -186,8 +209,7 @@ public class ItemFocusBlink extends ItemFocusBasic {
|
||||
|
||||
@Override
|
||||
public AspectList getVisCost(ItemStack item) {
|
||||
return this.isUpgradedWith(item, hellfire)
|
||||
? fireCost
|
||||
return this.isUpgradedWith(item, hellfire) ? fireCost
|
||||
: this.isUpgradedWith(item, pandemonium) ? switchCost : visCost;
|
||||
}
|
||||
|
||||
@@ -195,19 +217,17 @@ public class ItemFocusBlink extends ItemFocusBasic {
|
||||
public FocusUpgradeType[] getPossibleUpgradesByRank(ItemStack item, int rank) {
|
||||
switch (rank) {
|
||||
case 1:
|
||||
return new FocusUpgradeType[] {FocusUpgradeType.frugal};
|
||||
return new FocusUpgradeType[] { FocusUpgradeType.frugal };
|
||||
case 2:
|
||||
return new FocusUpgradeType[] {hellfire, pandemonium, FocusUpgradeType.frugal};
|
||||
return new FocusUpgradeType[] { hellfire, pandemonium, FocusUpgradeType.frugal };
|
||||
case 3:
|
||||
case 4:
|
||||
case 5:
|
||||
if (this.isUpgradedWith(item, hellfire))
|
||||
return new FocusUpgradeType[] {
|
||||
FocusUpgradeType.potency, FocusUpgradeType.frugal, FocusUpgradeType.enlarge
|
||||
};
|
||||
if (this.isUpgradedWith(item, hellfire)) return new FocusUpgradeType[] { FocusUpgradeType.potency,
|
||||
FocusUpgradeType.frugal, FocusUpgradeType.enlarge };
|
||||
else if (this.isUpgradedWith(item, pandemonium))
|
||||
return new FocusUpgradeType[] {FocusUpgradeType.frugal, FocusUpgradeType.enlarge};
|
||||
else return new FocusUpgradeType[] {FocusUpgradeType.frugal};
|
||||
return new FocusUpgradeType[] { FocusUpgradeType.frugal, FocusUpgradeType.enlarge };
|
||||
else return new FocusUpgradeType[] { FocusUpgradeType.frugal };
|
||||
default:
|
||||
return null;
|
||||
}
|
||||
|
||||
@@ -1,20 +1,21 @@
|
||||
package fox.spiteful.forbidden.items.wands;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.IIcon;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
|
||||
public class ItemWandCaps extends Item {
|
||||
|
||||
public final String[] types = {
|
||||
"alchemical", "vinteum", "terrasteel", "manasteel", "manasteel_inert", "elementium", "elementium_inert"
|
||||
};
|
||||
public final String[] types = { "alchemical", "vinteum", "terrasteel", "manasteel", "manasteel_inert", "elementium",
|
||||
"elementium_inert" };
|
||||
public IIcon[] icon;
|
||||
|
||||
public ItemWandCaps() {
|
||||
|
||||
@@ -1,41 +1,30 @@
|
||||
package fox.spiteful.forbidden.items.wands;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Config;
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
import fox.spiteful.forbidden.compat.Compat;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.IIcon;
|
||||
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.api.aspects.AspectList;
|
||||
import thaumcraft.api.wands.WandCap;
|
||||
import thaumcraft.api.wands.WandRod;
|
||||
import thaumcraft.common.config.ConfigItems;
|
||||
import thaumcraft.common.items.wands.ItemWandCasting;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Config;
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
import fox.spiteful.forbidden.compat.Compat;
|
||||
|
||||
public class ItemWandCores extends Item {
|
||||
|
||||
public final String[] types = {
|
||||
"tainted",
|
||||
"infernal",
|
||||
"soul",
|
||||
"blood",
|
||||
"witchwood",
|
||||
"profane",
|
||||
"blood_inert",
|
||||
"livingwood",
|
||||
"livingwood_inert",
|
||||
"blood_staff",
|
||||
"witchwood_staff",
|
||||
"dreamwood",
|
||||
"dreamwood_inert",
|
||||
"dreamwood_staff"
|
||||
};
|
||||
public final String[] types = { "tainted", "infernal", "soul", "blood", "witchwood", "profane", "blood_inert",
|
||||
"livingwood", "livingwood_inert", "blood_staff", "witchwood_staff", "dreamwood", "dreamwood_inert",
|
||||
"dreamwood_staff" };
|
||||
public IIcon[] icon;
|
||||
|
||||
public ItemWandCores() {
|
||||
@@ -84,16 +73,10 @@ public class ItemWandCores extends Item {
|
||||
wand = new ItemStack(ConfigItems.itemWandCasting, 1, 36);
|
||||
((ItemWandCasting) wand.getItem()).setCap(wand, (WandCap) WandCap.caps.get("iron"));
|
||||
((ItemWandCasting) wand.getItem()).setRod(wand, (WandRod) WandRod.rods.get("profane"));
|
||||
((ItemWandCasting) wand.getItem())
|
||||
.storeAllVis(
|
||||
wand,
|
||||
new AspectList()
|
||||
.add(Aspect.FIRE, 5000)
|
||||
.add(Aspect.WATER, 5000)
|
||||
.add(Aspect.EARTH, 5000)
|
||||
.add(Aspect.AIR, 5000)
|
||||
.add(Aspect.ORDER, 5000)
|
||||
.add(Aspect.ENTROPY, 5000));
|
||||
((ItemWandCasting) wand.getItem()).storeAllVis(
|
||||
wand,
|
||||
new AspectList().add(Aspect.FIRE, 5000).add(Aspect.WATER, 5000).add(Aspect.EARTH, 5000)
|
||||
.add(Aspect.AIR, 5000).add(Aspect.ORDER, 5000).add(Aspect.ENTROPY, 5000));
|
||||
list.add(wand);
|
||||
if (Compat.bm && Config.crossWand) {
|
||||
wand = new ItemStack(ConfigItems.itemWandCasting, 1, 84);
|
||||
|
||||
@@ -1,14 +1,15 @@
|
||||
package fox.spiteful.forbidden.items.wands;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.api.wands.IWandRodOnUpdate;
|
||||
import thaumcraft.common.items.wands.ItemWandCasting;
|
||||
import am2.api.ArsMagicaApi;
|
||||
import am2.api.IExtendedProperties;
|
||||
import fox.spiteful.forbidden.Config;
|
||||
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;
|
||||
import thaumcraft.common.items.wands.ItemWandCasting;
|
||||
|
||||
public class ManaStaffUpdate implements IWandRodOnUpdate {
|
||||
|
||||
@@ -22,10 +23,8 @@ public class ManaStaffUpdate implements IWandRodOnUpdate {
|
||||
IExtendedProperties prop = ArsMagicaApi.instance.getExtendedProperties(player);
|
||||
|
||||
float cost;
|
||||
if (((ItemWandCasting) itemstack.getItem())
|
||||
.getCap(itemstack)
|
||||
.getTag()
|
||||
.equals("vinteum")) cost = 0.5F;
|
||||
if (((ItemWandCasting) itemstack.getItem()).getCap(itemstack).getTag().equals("vinteum"))
|
||||
cost = 0.5F;
|
||||
else cost = 1.0F;
|
||||
|
||||
if (prop == null || prop.getCurrentMana() <= 0) return;
|
||||
@@ -41,8 +40,7 @@ public class ManaStaffUpdate implements IWandRodOnUpdate {
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (Throwable e) {
|
||||
}
|
||||
} catch (Throwable e) {}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,14 +1,15 @@
|
||||
package fox.spiteful.forbidden.items.wands;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.api.wands.IWandRodOnUpdate;
|
||||
import thaumcraft.common.items.wands.ItemWandCasting;
|
||||
import am2.api.ArsMagicaApi;
|
||||
import am2.api.IExtendedProperties;
|
||||
import fox.spiteful.forbidden.Config;
|
||||
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;
|
||||
import thaumcraft.common.items.wands.ItemWandCasting;
|
||||
|
||||
public class ManaWandUpdate implements IWandRodOnUpdate {
|
||||
|
||||
@@ -22,10 +23,8 @@ public class ManaWandUpdate implements IWandRodOnUpdate {
|
||||
IExtendedProperties prop = ArsMagicaApi.instance.getExtendedProperties(player);
|
||||
|
||||
float cost;
|
||||
if (((ItemWandCasting) itemstack.getItem())
|
||||
.getCap(itemstack)
|
||||
.getTag()
|
||||
.equals("vinteum")) cost = 0.8F;
|
||||
if (((ItemWandCasting) itemstack.getItem()).getCap(itemstack).getTag().equals("vinteum"))
|
||||
cost = 0.8F;
|
||||
else cost = 1.4F;
|
||||
|
||||
if (prop == null || prop.getCurrentMana() <= 0) return;
|
||||
@@ -41,8 +40,7 @@ public class ManaWandUpdate implements IWandRodOnUpdate {
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (Throwable e) {
|
||||
}
|
||||
} catch (Throwable e) {}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@ package fox.spiteful.forbidden.items.wands;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.api.wands.IWandRodOnUpdate;
|
||||
import thaumcraft.api.wands.WandRod;
|
||||
|
||||
@@ -2,6 +2,7 @@ package fox.spiteful.forbidden.items.wands;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.api.wands.IWandRodOnUpdate;
|
||||
import thaumcraft.common.items.wands.ItemWandCasting;
|
||||
|
||||
@@ -1,13 +1,14 @@
|
||||
package fox.spiteful.forbidden.items.wands;
|
||||
|
||||
import fox.spiteful.forbidden.Config;
|
||||
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;
|
||||
import thaumcraft.common.items.wands.ItemWandCasting;
|
||||
import vazkii.botania.api.mana.ManaItemHandler;
|
||||
import fox.spiteful.forbidden.Config;
|
||||
import fox.spiteful.forbidden.compat.Compat;
|
||||
|
||||
public class YandereWandUpdate implements IWandRodOnUpdate {
|
||||
|
||||
@@ -17,14 +18,9 @@ public class YandereWandUpdate implements IWandRodOnUpdate {
|
||||
if (Compat.botan && Config.crossWand && player.ticksExisted % 40 == 0 && checkHotbar(itemstack, player)) {
|
||||
try {
|
||||
int cost;
|
||||
if (((ItemWandCasting) itemstack.getItem())
|
||||
.getCap(itemstack)
|
||||
.getTag()
|
||||
.equals("manasteel")
|
||||
|| ((ItemWandCasting) itemstack.getItem())
|
||||
.getCap(itemstack)
|
||||
.getTag()
|
||||
.equals("elementium")) cost = Config.manavis - 2;
|
||||
if (((ItemWandCasting) itemstack.getItem()).getCap(itemstack).getTag().equals("manasteel")
|
||||
|| ((ItemWandCasting) itemstack.getItem()).getCap(itemstack).getTag().equals("elementium"))
|
||||
cost = Config.manavis - 2;
|
||||
else cost = Config.manavis;
|
||||
|
||||
cost = Math.max(0, cost);
|
||||
|
||||
@@ -1,13 +1,16 @@
|
||||
package fox.spiteful.forbidden.potions;
|
||||
|
||||
import fox.spiteful.forbidden.Config;
|
||||
import fox.spiteful.forbidden.compat.Compat;
|
||||
import java.lang.reflect.Field;
|
||||
import java.lang.reflect.Modifier;
|
||||
|
||||
import net.minecraft.potion.Potion;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
|
||||
import fox.spiteful.forbidden.Config;
|
||||
import fox.spiteful.forbidden.compat.Compat;
|
||||
|
||||
public class DarkPotions {
|
||||
|
||||
public static final ResourceLocation icons = new ResourceLocation("forbidden", "textures/misc/potions.png");
|
||||
public static Potion bloodSeal;
|
||||
public static Potion dragonwrack;
|
||||
|
||||
@@ -1,11 +1,13 @@
|
||||
package fox.spiteful.forbidden.potions;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.potion.Potion;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class PotionBloodSeal extends Potion {
|
||||
|
||||
public PotionBloodSeal(int id) {
|
||||
super(id, true, 0xAC1919);
|
||||
this.setPotionName("potion.blood_seal");
|
||||
|
||||
@@ -1,12 +1,9 @@
|
||||
/**
|
||||
* This class based on a class created by <Vazkii>.
|
||||
*
|
||||
* It was distributed as part of the Botania Mod.
|
||||
* Get the Source Code in github:
|
||||
* https://github.com/Vazkii/Botania
|
||||
* It was distributed as part of the Botania Mod. Get the Source Code in github: https://github.com/Vazkii/Botania
|
||||
*
|
||||
* Botania is Open Source and distributed under a
|
||||
* Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License
|
||||
* Botania is Open Source and distributed under a Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License
|
||||
* (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB)
|
||||
*
|
||||
* File Created @ [May 15, 2014, 4:47:41 PM (GMT)]
|
||||
@@ -14,17 +11,20 @@
|
||||
package fox.spiteful.forbidden.tiles;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.potion.Potion;
|
||||
import net.minecraft.potion.PotionEffect;
|
||||
import net.minecraft.util.AxisAlignedBB;
|
||||
import net.minecraft.util.IIcon;
|
||||
|
||||
import vazkii.botania.api.BotaniaAPI;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.api.subtile.SubTileFunctional;
|
||||
|
||||
public class SubTileBloodthorn extends SubTileFunctional {
|
||||
|
||||
public static LexiconEntry lexicon;
|
||||
|
||||
@Override
|
||||
@@ -33,20 +33,17 @@ public class SubTileBloodthorn extends SubTileFunctional {
|
||||
if (redstoneSignal > 0) return;
|
||||
final int range = 6;
|
||||
final int cost = 40;
|
||||
List<EntityLivingBase> entities = supertile
|
||||
.getWorldObj()
|
||||
.getEntitiesWithinAABB(
|
||||
EntityLivingBase.class,
|
||||
AxisAlignedBB.getBoundingBox(
|
||||
supertile.xCoord - range,
|
||||
supertile.yCoord - range,
|
||||
supertile.zCoord - range,
|
||||
supertile.xCoord + range,
|
||||
supertile.yCoord + range,
|
||||
supertile.zCoord + range));
|
||||
List<EntityLivingBase> entities = supertile.getWorldObj().getEntitiesWithinAABB(
|
||||
EntityLivingBase.class,
|
||||
AxisAlignedBB.getBoundingBox(
|
||||
supertile.xCoord - range,
|
||||
supertile.yCoord - range,
|
||||
supertile.zCoord - range,
|
||||
supertile.xCoord + range,
|
||||
supertile.yCoord + range,
|
||||
supertile.zCoord + range));
|
||||
for (EntityLivingBase entity : entities) {
|
||||
if (!(entity instanceof EntityPlayer)
|
||||
&& entity.getActivePotionEffect(Potion.weakness) == null
|
||||
if (!(entity instanceof EntityPlayer) && entity.getActivePotionEffect(Potion.weakness) == null
|
||||
&& mana >= cost
|
||||
&& !entity.worldObj.isRemote) {
|
||||
entity.addPotionEffect(new PotionEffect(Potion.weakness.id, 60, 2));
|
||||
|
||||
@@ -4,6 +4,7 @@ import net.minecraft.entity.item.EntityItem;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.api.aspects.AspectList;
|
||||
import thaumcraft.common.Thaumcraft;
|
||||
@@ -14,6 +15,7 @@ import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.api.subtile.SubTileFunctional;
|
||||
|
||||
public class SubTileEuclidaisy extends SubTileFunctional {
|
||||
|
||||
private static final int cost = 9000;
|
||||
public static LexiconEntry lexicon;
|
||||
|
||||
@@ -34,8 +36,7 @@ public class SubTileEuclidaisy extends SubTileFunctional {
|
||||
if (supertile.getWorldObj().rand.nextInt(10) < 4) aspect = (new AspectList()).add(Aspect.AURA, 2);
|
||||
else {
|
||||
Aspect[] aspects = Aspect.aspects.values().toArray(new Aspect[0]);
|
||||
aspect = (new AspectList())
|
||||
.add(aspects[supertile.getWorldObj().rand.nextInt(aspects.length)], 2);
|
||||
aspect = (new AspectList()).add(aspects[supertile.getWorldObj().rand.nextInt(aspects.length)], 2);
|
||||
}
|
||||
ItemStack ess = new ItemStack(ConfigItems.itemWispEssence);
|
||||
((ItemWispEssence) ess.getItem()).setAspects(ess, aspect);
|
||||
|
||||
@@ -1,11 +1,8 @@
|
||||
/**
|
||||
* This class based on a class created by <Pokefenn>.
|
||||
* It was distributed as part of the Botania Mod.
|
||||
* Get the Source Code in github:
|
||||
* https://github.com/Vazkii/Botania
|
||||
* This class based on a class created by <Pokefenn>. It was distributed as part of the Botania Mod. Get the Source Code
|
||||
* in github: https://github.com/Vazkii/Botania
|
||||
*
|
||||
* Botania is Open Source and distributed under a
|
||||
* Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License
|
||||
* Botania is Open Source and distributed under a Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License
|
||||
* (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB)
|
||||
*
|
||||
*/
|
||||
@@ -14,6 +11,7 @@ package fox.spiteful.forbidden.tiles;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.util.IIcon;
|
||||
|
||||
import thaumcraft.common.Thaumcraft;
|
||||
import thaumcraft.common.config.ConfigBlocks;
|
||||
import vazkii.botania.api.BotaniaAPI;
|
||||
@@ -65,7 +63,11 @@ public class SubTileTainthistle extends SubTileGenerating {
|
||||
|
||||
public void doBurnParticles() {
|
||||
Thaumcraft.proxy.reservoirBubble(
|
||||
supertile.getWorldObj(), supertile.xCoord, supertile.yCoord, supertile.zCoord, 0x4D00FF);
|
||||
supertile.getWorldObj(),
|
||||
supertile.xCoord,
|
||||
supertile.yCoord,
|
||||
supertile.zCoord,
|
||||
0x4D00FF);
|
||||
}
|
||||
|
||||
public boolean isFlux(int x, int y, int z) {
|
||||
@@ -74,15 +76,13 @@ public class SubTileTainthistle extends SubTileGenerating {
|
||||
}
|
||||
|
||||
public void playSound() {
|
||||
supertile
|
||||
.getWorldObj()
|
||||
.playSoundEffect(
|
||||
supertile.xCoord,
|
||||
supertile.yCoord,
|
||||
supertile.zCoord,
|
||||
"random.drink",
|
||||
0.05F,
|
||||
0.5F + (float) Math.random() * 0.5F);
|
||||
supertile.getWorldObj().playSoundEffect(
|
||||
supertile.xCoord,
|
||||
supertile.yCoord,
|
||||
supertile.zCoord,
|
||||
"random.drink",
|
||||
0.05F,
|
||||
0.5F + (float) Math.random() * 0.5F);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -1,10 +1,12 @@
|
||||
package fox.spiteful.forbidden.tiles;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.util.AxisAlignedBB;
|
||||
import net.minecraft.util.IIcon;
|
||||
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.common.Thaumcraft;
|
||||
import thaumcraft.common.lib.network.PacketHandler;
|
||||
@@ -15,6 +17,7 @@ import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.api.subtile.SubTileFunctional;
|
||||
|
||||
public class SubTileWhisperweed extends SubTileFunctional {
|
||||
|
||||
private static final int cost = 6000;
|
||||
private static final int range = 3;
|
||||
public static LexiconEntry lexicon;
|
||||
@@ -26,17 +29,15 @@ public class SubTileWhisperweed extends SubTileFunctional {
|
||||
if (redstoneSignal > 0) return;
|
||||
|
||||
if (!supertile.getWorldObj().isRemote && mana >= cost && this.ticksExisted % 300 == 0) {
|
||||
List<EntityPlayer> players = supertile
|
||||
.getWorldObj()
|
||||
.getEntitiesWithinAABB(
|
||||
EntityPlayer.class,
|
||||
AxisAlignedBB.getBoundingBox(
|
||||
supertile.xCoord - range,
|
||||
supertile.yCoord - range,
|
||||
supertile.zCoord - range,
|
||||
supertile.xCoord + range + 1,
|
||||
supertile.yCoord + range + 1,
|
||||
supertile.zCoord + range + 1));
|
||||
List<EntityPlayer> players = supertile.getWorldObj().getEntitiesWithinAABB(
|
||||
EntityPlayer.class,
|
||||
AxisAlignedBB.getBoundingBox(
|
||||
supertile.xCoord - range,
|
||||
supertile.yCoord - range,
|
||||
supertile.zCoord - range,
|
||||
supertile.xCoord + range + 1,
|
||||
supertile.yCoord + range + 1,
|
||||
supertile.zCoord + range + 1));
|
||||
if (players.size() > 0) {
|
||||
EntityPlayer player = players.get(supertile.getWorldObj().rand.nextInt(players.size()));
|
||||
int amt = 1 + player.worldObj.rand.nextInt(3);
|
||||
@@ -49,17 +50,16 @@ public class SubTileWhisperweed extends SubTileFunctional {
|
||||
Aspect aspect;
|
||||
if (player.worldObj.rand.nextInt(25) > 2)
|
||||
aspect = (Aspect) Aspect.getPrimalAspects().get(player.worldObj.rand.nextInt(6));
|
||||
else
|
||||
aspect = (Aspect) Aspect.getCompoundAspects()
|
||||
.get(player.worldObj.rand.nextInt(
|
||||
Aspect.getCompoundAspects().size()));
|
||||
else aspect = (Aspect) Aspect.getCompoundAspects()
|
||||
.get(player.worldObj.rand.nextInt(Aspect.getCompoundAspects().size()));
|
||||
Thaumcraft.proxy.playerKnowledge.addAspectPool(player.getCommandSenderName(), aspect, (short) 1);
|
||||
PacketHandler.INSTANCE.sendTo(
|
||||
new PacketAspectPool(
|
||||
aspect.getTag(),
|
||||
(short) 1,
|
||||
Short.valueOf(Thaumcraft.proxy.playerKnowledge.getAspectPoolFor(
|
||||
player.getCommandSenderName(), aspect))),
|
||||
Short.valueOf(
|
||||
Thaumcraft.proxy.playerKnowledge
|
||||
.getAspectPoolFor(player.getCommandSenderName(), aspect))),
|
||||
(EntityPlayerMP) player);
|
||||
ResearchManager.scheduleSave(player);
|
||||
}
|
||||
|
||||
@@ -1,20 +1,22 @@
|
||||
package fox.spiteful.forbidden.tiles;
|
||||
|
||||
import fox.spiteful.forbidden.Config;
|
||||
import fox.spiteful.forbidden.DarkAspects;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.network.NetworkManager;
|
||||
import net.minecraft.network.Packet;
|
||||
import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
|
||||
import thaumcraft.api.ThaumcraftApiHelper;
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.api.aspects.AspectList;
|
||||
import thaumcraft.api.aspects.IAspectContainer;
|
||||
import thaumcraft.api.aspects.IEssentiaTransport;
|
||||
import fox.spiteful.forbidden.Config;
|
||||
import fox.spiteful.forbidden.DarkAspects;
|
||||
|
||||
public class TileEntityWrathCage extends TileEntity implements IAspectContainer, IEssentiaTransport {
|
||||
|
||||
private final WrathSpawnerLogic spawnLogic = new WrathSpawnerLogic(this);
|
||||
public int wrath = 0;
|
||||
public int sloth = 0;
|
||||
@@ -84,34 +86,33 @@ public class TileEntityWrathCage extends TileEntity implements IAspectContainer,
|
||||
TileEntity te = ThaumcraftApiHelper.getConnectableTile(worldObj, xCoord, yCoord, zCoord, current);
|
||||
if (te != null) {
|
||||
IEssentiaTransport ic = (IEssentiaTransport) te;
|
||||
if (ic.canOutputTo(current.getOpposite())
|
||||
&& special < 64 // THE DIRECTION HERE MAY BE WRONG SPITEFULFOXY SO CHECK IT
|
||||
if (ic.canOutputTo(current.getOpposite()) && special < 64 // THE DIRECTION HERE MAY BE WRONG
|
||||
// SPITEFULFOXY SO CHECK IT
|
||||
&& ic.getEssentiaType(current.getOpposite()) == aspect
|
||||
&& ic.getEssentiaAmount(current.getOpposite()) > 0
|
||||
&& ic.takeEssentia(aspect, 1, current.getOpposite()) == 1) {
|
||||
special++;
|
||||
worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
|
||||
return;
|
||||
} else if (ic.canOutputTo(current.getOpposite())
|
||||
&& wrath < 64
|
||||
} else if (ic.canOutputTo(current.getOpposite()) && wrath < 64
|
||||
&& special < Config.wrathCost
|
||||
&& ic.getEssentiaType(current.getOpposite()) == DarkAspects.WRATH
|
||||
&& ic.getEssentiaAmount(current.getOpposite()) > 0
|
||||
&& ic.takeEssentia(DarkAspects.WRATH, 1, current.getOpposite()) == 1) {
|
||||
wrath++;
|
||||
worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
|
||||
return;
|
||||
} else if (ic.canOutputTo(current.getOpposite())
|
||||
&& sloth < 64
|
||||
&& special < Config.wrathCost
|
||||
&& wrath < Config.wrathCost
|
||||
&& ic.getEssentiaType(current.getOpposite()) == DarkAspects.SLOTH
|
||||
&& ic.getEssentiaAmount(current.getOpposite()) > 0
|
||||
&& ic.takeEssentia(DarkAspects.SLOTH, 1, current.getOpposite()) == 1) {
|
||||
sloth++;
|
||||
worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
|
||||
return;
|
||||
}
|
||||
wrath++;
|
||||
worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
|
||||
return;
|
||||
} else
|
||||
if (ic.canOutputTo(current.getOpposite()) && sloth < 64
|
||||
&& special < Config.wrathCost
|
||||
&& wrath < Config.wrathCost
|
||||
&& ic.getEssentiaType(current.getOpposite()) == DarkAspects.SLOTH
|
||||
&& ic.getEssentiaAmount(current.getOpposite()) > 0
|
||||
&& ic.takeEssentia(DarkAspects.SLOTH, 1, current.getOpposite()) == 1) {
|
||||
sloth++;
|
||||
worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -149,6 +150,7 @@ public class TileEntityWrathCage extends TileEntity implements IAspectContainer,
|
||||
|
||||
/**
|
||||
* This method is used to determine of a specific aspect can be added to this container.
|
||||
*
|
||||
* @param tag
|
||||
* @return true or false
|
||||
*/
|
||||
@@ -159,6 +161,7 @@ public class TileEntityWrathCage extends TileEntity implements IAspectContainer,
|
||||
|
||||
/**
|
||||
* This method is used to add a certain amount of an aspect to the tile entity.
|
||||
*
|
||||
* @param tag
|
||||
* @param amount
|
||||
* @return the amount of aspect left over that could not be added.
|
||||
@@ -179,6 +182,7 @@ public class TileEntityWrathCage extends TileEntity implements IAspectContainer,
|
||||
|
||||
/**
|
||||
* Removes a certain amount of a specific aspect from the tile entity
|
||||
*
|
||||
* @param tag
|
||||
* @param amount
|
||||
* @return true if that amount of aspect was available and was removed
|
||||
@@ -189,6 +193,7 @@ public class TileEntityWrathCage extends TileEntity implements IAspectContainer,
|
||||
|
||||
/**
|
||||
* Checks if the tile entity contains the listed amount (or more) of the aspect
|
||||
*
|
||||
* @param tag
|
||||
* @param amount
|
||||
* @return
|
||||
@@ -202,6 +207,7 @@ public class TileEntityWrathCage extends TileEntity implements IAspectContainer,
|
||||
|
||||
/**
|
||||
* Returns how much of the aspect this tile entity contains
|
||||
*
|
||||
* @param tag
|
||||
* @return the amount of that aspect found
|
||||
*/
|
||||
@@ -214,10 +220,11 @@ public class TileEntityWrathCage extends TileEntity implements IAspectContainer,
|
||||
|
||||
/**
|
||||
* Checks if the tile entity contains all the listed aspects and their amounts
|
||||
*
|
||||
* @param ot the ObjectTags object that contains the aspects and their amounts.
|
||||
* @return
|
||||
*
|
||||
* Going away in the next major patch
|
||||
* Going away in the next major patch
|
||||
*/
|
||||
@Deprecated
|
||||
public boolean doesContainerContain(AspectList ot) {
|
||||
@@ -226,10 +233,11 @@ public class TileEntityWrathCage extends TileEntity implements IAspectContainer,
|
||||
|
||||
/**
|
||||
* removes a bunch of different aspects and amounts from the tile entity.
|
||||
*
|
||||
* @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
|
||||
*
|
||||
* Going away in the next major patch
|
||||
* Going away in the next major patch
|
||||
*/
|
||||
@Deprecated
|
||||
public boolean takeFromContainer(AspectList ot) {
|
||||
@@ -238,6 +246,7 @@ public class TileEntityWrathCage extends TileEntity implements IAspectContainer,
|
||||
|
||||
/**
|
||||
* Is this tile able to connect to other vis users/sources on the specified side?
|
||||
*
|
||||
* @param face
|
||||
* @return
|
||||
*/
|
||||
@@ -248,6 +257,7 @@ public class TileEntityWrathCage extends TileEntity implements IAspectContainer,
|
||||
|
||||
/**
|
||||
* Is this side used to input essentia?
|
||||
*
|
||||
* @param face
|
||||
* @return
|
||||
*/
|
||||
@@ -257,6 +267,7 @@ public class TileEntityWrathCage extends TileEntity implements IAspectContainer,
|
||||
|
||||
/**
|
||||
* Is this side used to output essentia?
|
||||
*
|
||||
* @param face
|
||||
* @return
|
||||
*/
|
||||
@@ -266,6 +277,7 @@ public class TileEntityWrathCage extends TileEntity implements IAspectContainer,
|
||||
|
||||
/**
|
||||
* Sets the amount of suction this block will apply
|
||||
*
|
||||
* @param suction
|
||||
*/
|
||||
public void setSuction(Aspect aspect, int amount) {}
|
||||
@@ -273,7 +285,7 @@ public class TileEntityWrathCage extends TileEntity implements IAspectContainer,
|
||||
// **
|
||||
// * Returns the amount of suction this block is applying.
|
||||
// * @param loc
|
||||
// * the location from where the suction is being checked
|
||||
// * the location from where the suction is being checked
|
||||
// * @return
|
||||
// */
|
||||
// public AspectList getSuction(ForgeDirection face)
|
||||
@@ -293,10 +305,9 @@ public class TileEntityWrathCage extends TileEntity implements IAspectContainer,
|
||||
|
||||
/**
|
||||
* Returns the type of suction this block is applying.
|
||||
* @param loc
|
||||
* the location from where the suction is being checked
|
||||
* @return
|
||||
* a return type of null indicates the suction is untyped and the first thing available will be drawn
|
||||
*
|
||||
* @param loc the location from where the suction is being checked
|
||||
* @return a return type of null indicates the suction is untyped and the first thing available will be drawn
|
||||
*/
|
||||
public Aspect getSuctionType(ForgeDirection face) {
|
||||
if (Config.wrathCost <= 0) return null;
|
||||
@@ -307,8 +318,8 @@ public class TileEntityWrathCage extends TileEntity implements IAspectContainer,
|
||||
|
||||
/**
|
||||
* Returns the strength of suction this block is applying.
|
||||
* @param loc
|
||||
* the location from where the suction is being checked
|
||||
*
|
||||
* @param loc the location from where the suction is being checked
|
||||
* @return
|
||||
*/
|
||||
public int getSuctionAmount(ForgeDirection face) {
|
||||
@@ -318,6 +329,7 @@ public class TileEntityWrathCage extends TileEntity implements IAspectContainer,
|
||||
|
||||
/**
|
||||
* remove the specified amount of vis from this transport tile
|
||||
*
|
||||
* @param suction
|
||||
* @return how much was actually taken
|
||||
*/
|
||||
@@ -327,6 +339,7 @@ public class TileEntityWrathCage extends TileEntity implements IAspectContainer,
|
||||
|
||||
/**
|
||||
* add the specified amount of vis to this transport tile
|
||||
*
|
||||
* @return how much was actually added
|
||||
*/
|
||||
public int addEssentia(Aspect inp, int amount, ForgeDirection dir) {
|
||||
@@ -344,6 +357,7 @@ public class TileEntityWrathCage extends TileEntity implements IAspectContainer,
|
||||
|
||||
/**
|
||||
* What type of essentia this contains
|
||||
*
|
||||
* @param face
|
||||
* @return
|
||||
*/
|
||||
@@ -353,6 +367,7 @@ public class TileEntityWrathCage extends TileEntity implements IAspectContainer,
|
||||
|
||||
/**
|
||||
* How much essentia this block contains
|
||||
*
|
||||
* @param face
|
||||
* @return
|
||||
*/
|
||||
@@ -364,6 +379,7 @@ public class TileEntityWrathCage extends TileEntity implements IAspectContainer,
|
||||
|
||||
/**
|
||||
* Essentia will not be drawn from this container unless the suction exceeds this amount.
|
||||
*
|
||||
* @return the amount
|
||||
*/
|
||||
public int getMinimumSuction() {
|
||||
@@ -371,8 +387,9 @@ public class TileEntityWrathCage extends TileEntity implements IAspectContainer,
|
||||
}
|
||||
|
||||
/**
|
||||
* Return true if you want the conduit to extend a little further into the block.
|
||||
* Used by jars and alembics that have smaller than normal hitboxes
|
||||
* Return true if you want the conduit to extend a little further into the block. Used by jars and alembics that
|
||||
* have smaller than normal hitboxes
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
public boolean renderExtendedTube() {
|
||||
|
||||
@@ -1,8 +1,5 @@
|
||||
package fox.spiteful.forbidden.tiles;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Config;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.EntityList;
|
||||
import net.minecraft.entity.EntityLiving;
|
||||
@@ -12,10 +9,15 @@ import net.minecraft.init.Blocks;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.util.AxisAlignedBB;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.common.Thaumcraft;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Config;
|
||||
|
||||
public class WrathSpawnerLogic {
|
||||
|
||||
/** The mob spawner we deal with */
|
||||
final TileEntityWrathCage mobSpawnerEntity;
|
||||
|
||||
@@ -76,15 +78,13 @@ public class WrathSpawnerLogic {
|
||||
}
|
||||
|
||||
public void updateSpawnerBlock(int par1) {
|
||||
this.mobSpawnerEntity
|
||||
.getWorldObj()
|
||||
.addBlockEvent(
|
||||
this.mobSpawnerEntity.xCoord,
|
||||
this.mobSpawnerEntity.yCoord,
|
||||
this.mobSpawnerEntity.zCoord,
|
||||
Blocks.mob_spawner,
|
||||
par1,
|
||||
0);
|
||||
this.mobSpawnerEntity.getWorldObj().addBlockEvent(
|
||||
this.mobSpawnerEntity.xCoord,
|
||||
this.mobSpawnerEntity.yCoord,
|
||||
this.mobSpawnerEntity.zCoord,
|
||||
Blocks.mob_spawner,
|
||||
par1,
|
||||
0);
|
||||
}
|
||||
|
||||
public World getSpawnerWorld() {
|
||||
@@ -109,12 +109,9 @@ public class WrathSpawnerLogic {
|
||||
double d0;
|
||||
|
||||
if (this.getSpawnerWorld().isRemote && (fuel > 0 || Config.wrathCost <= 0)) {
|
||||
double d1 = (double)
|
||||
((float) this.getSpawnerX() + this.getSpawnerWorld().rand.nextFloat());
|
||||
double d2 = (double)
|
||||
((float) this.getSpawnerY() + this.getSpawnerWorld().rand.nextFloat());
|
||||
d0 = (double)
|
||||
((float) this.getSpawnerZ() + this.getSpawnerWorld().rand.nextFloat());
|
||||
double d1 = (double) ((float) this.getSpawnerX() + this.getSpawnerWorld().rand.nextFloat());
|
||||
double d2 = (double) ((float) this.getSpawnerY() + this.getSpawnerWorld().rand.nextFloat());
|
||||
d0 = (double) ((float) this.getSpawnerZ() + this.getSpawnerWorld().rand.nextFloat());
|
||||
// this.getSpawnerWorld().spawnParticle("smoke", d1, d2, d0, 0.0D,
|
||||
// 0.0D, 0.0D);
|
||||
// this.getSpawnerWorld().spawnParticle("flame", d1, d2, d0, 0.0D,
|
||||
@@ -126,8 +123,8 @@ public class WrathSpawnerLogic {
|
||||
}
|
||||
|
||||
this.field_98284_d = this.field_98287_c;
|
||||
this.field_98287_c =
|
||||
(this.field_98287_c + (double) (1000.0F / ((float) this.spawnDelay + 200.0F))) % 360.0D;
|
||||
this.field_98287_c = (this.field_98287_c + (double) (1000.0F / ((float) this.spawnDelay + 200.0F)))
|
||||
% 360.0D;
|
||||
} else if (Config.wrathCage) {
|
||||
if (Config.wrathCost > 0 && fuel <= 0) {
|
||||
if (mobSpawnerEntity.special >= Config.wrathCost) {
|
||||
@@ -174,7 +171,8 @@ public class WrathSpawnerLogic {
|
||||
int j = this.getSpawnerWorld()
|
||||
.getEntitiesWithinAABB(
|
||||
entity.getClass(),
|
||||
AxisAlignedBB.getBoundingBox(
|
||||
AxisAlignedBB
|
||||
.getBoundingBox(
|
||||
(double) this.getSpawnerX(),
|
||||
(double) this.getSpawnerY(),
|
||||
(double) this.getSpawnerZ(),
|
||||
@@ -190,18 +188,14 @@ public class WrathSpawnerLogic {
|
||||
}
|
||||
|
||||
d0 = (double) this.getSpawnerX()
|
||||
+ (this.getSpawnerWorld().rand.nextDouble()
|
||||
- this.getSpawnerWorld().rand.nextDouble())
|
||||
+ (this.getSpawnerWorld().rand.nextDouble() - this.getSpawnerWorld().rand.nextDouble())
|
||||
* (double) this.spawnRange;
|
||||
double d3 = (double)
|
||||
(this.getSpawnerY() + this.getSpawnerWorld().rand.nextInt(3) - 1);
|
||||
double d3 = (double) (this.getSpawnerY() + this.getSpawnerWorld().rand.nextInt(3) - 1);
|
||||
double d4 = (double) this.getSpawnerZ()
|
||||
+ (this.getSpawnerWorld().rand.nextDouble()
|
||||
- this.getSpawnerWorld().rand.nextDouble())
|
||||
+ (this.getSpawnerWorld().rand.nextDouble() - this.getSpawnerWorld().rand.nextDouble())
|
||||
* (double) this.spawnRange;
|
||||
EntityLiving entityliving = entity instanceof EntityLiving ? (EntityLiving) entity : null;
|
||||
entity.setLocationAndAngles(
|
||||
d0, d3, d4, this.getSpawnerWorld().rand.nextFloat() * 360.0F, 0.0F);
|
||||
entity.setLocationAndAngles(d0, d3, d4, this.getSpawnerWorld().rand.nextFloat() * 360.0F, 0.0F);
|
||||
|
||||
if (
|
||||
// entityliving == null ||
|
||||
@@ -224,14 +218,11 @@ public class WrathSpawnerLogic {
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks if the entity's current position is a valid location to spawn this
|
||||
* entity.
|
||||
* Checks if the entity's current position is a valid location to spawn this entity.
|
||||
*/
|
||||
public boolean entityCanSpawn(EntityLiving entity) {
|
||||
return entity.worldObj.checkNoEntityCollision(entity.boundingBox)
|
||||
&& entity.worldObj
|
||||
.getCollidingBoundingBoxes(entity, entity.boundingBox)
|
||||
.isEmpty()
|
||||
&& entity.worldObj.getCollidingBoundingBoxes(entity, entity.boundingBox).isEmpty()
|
||||
&& !entity.worldObj.isAnyLiquid(entity.boundingBox);
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user