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
@@ -1,5 +1,12 @@
|
||||
package am2.api;
|
||||
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.ai.attributes.IAttribute;
|
||||
import net.minecraft.entity.ai.attributes.RangedAttribute;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.inventory.IInventory;
|
||||
import net.minecraft.util.IIcon;
|
||||
|
||||
import am2.api.enchantment.IAMEnchantmentHelper;
|
||||
import am2.api.entities.IEntityManager;
|
||||
import am2.api.flickers.IFlickerRegistry;
|
||||
@@ -14,14 +21,9 @@ import am2.api.spell.enums.SkillPointTypes;
|
||||
import am2.api.spell.enums.SkillTrees;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.ai.attributes.IAttribute;
|
||||
import net.minecraft.entity.ai.attributes.RangedAttribute;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.inventory.IInventory;
|
||||
import net.minecraft.util.IIcon;
|
||||
|
||||
public class ArsMagicaApi {
|
||||
|
||||
public static final ArsMagicaApi instance = new ArsMagicaApi();
|
||||
|
||||
/**
|
||||
@@ -37,29 +39,30 @@ public class ArsMagicaApi {
|
||||
/**
|
||||
* Attributes for AM2's properties
|
||||
*/
|
||||
// Bonus to max mana. Applied additively.
|
||||
// Bonus to max mana. Applied additively.
|
||||
public static final IAttribute maxManaBonus = new RangedAttribute("am2.maxManaBonus", 0.0f, 0.0f, Double.MAX_VALUE)
|
||||
.setDescription("Mana Bonus")
|
||||
.setShouldWatch(true);
|
||||
// Bonus to max burnout. Applied additively.
|
||||
.setDescription("Mana Bonus").setShouldWatch(true);
|
||||
// Bonus to max burnout. Applied additively.
|
||||
public static final IAttribute maxBurnoutBonus = new RangedAttribute(
|
||||
"am2.maxBurnoutBonus", 0.0f, 0.0f, Double.MAX_VALUE)
|
||||
.setDescription("Burnout Bonus")
|
||||
.setShouldWatch(true);
|
||||
// Bonus to XP gained. Applied multiplicatively.
|
||||
"am2.maxBurnoutBonus",
|
||||
0.0f,
|
||||
0.0f,
|
||||
Double.MAX_VALUE).setDescription("Burnout Bonus").setShouldWatch(true);
|
||||
// Bonus to XP gained. Applied multiplicatively.
|
||||
public static final IAttribute xpGainModifier = new RangedAttribute(
|
||||
"am2.xpMultiplier", 1.0f, 0.0f, Double.MAX_VALUE)
|
||||
.setDescription("XP Mutiplier")
|
||||
.setShouldWatch(true);
|
||||
// Bonus to mana regen rate. Applied multiplicatively.
|
||||
"am2.xpMultiplier",
|
||||
1.0f,
|
||||
0.0f,
|
||||
Double.MAX_VALUE).setDescription("XP Mutiplier").setShouldWatch(true);
|
||||
// Bonus to mana regen rate. Applied multiplicatively.
|
||||
public static final IAttribute manaRegenTimeModifier = new RangedAttribute(
|
||||
"am2.manaRegenModifier", 1.0f, 0.5f, 2.0f)
|
||||
.setDescription("Mana Regen Rate Multiplier")
|
||||
.setShouldWatch(true);
|
||||
// Bonus to burnout reduction rate. Applied multiplicatively.
|
||||
"am2.manaRegenModifier",
|
||||
1.0f,
|
||||
0.5f,
|
||||
2.0f).setDescription("Mana Regen Rate Multiplier").setShouldWatch(true);
|
||||
// Bonus to burnout reduction rate. Applied multiplicatively.
|
||||
public static final IAttribute burnoutReductionRate = new RangedAttribute("am2.burnoutReduction", 1.0f, 0.1f, 2.0f)
|
||||
.setDescription("Burnout Reduction Rate")
|
||||
.setShouldWatch(true);
|
||||
.setDescription("Burnout Reduction Rate").setShouldWatch(true);
|
||||
|
||||
private static final float manaBurnoutRatio = 0.38f;
|
||||
|
||||
@@ -69,21 +72,21 @@ public class ArsMagicaApi {
|
||||
// Getters
|
||||
// ================================================================================
|
||||
/**
|
||||
* Gets the spell part manager. Used to register new shapes/components/modifiers/talents
|
||||
* Gets the spell part manager. Used to register new shapes/components/modifiers/talents
|
||||
*/
|
||||
public final ISpellPartManager getSpellPartManager() {
|
||||
return spellPartManager;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the enchantment helper. Used to resolve current enchantment IDs.
|
||||
* Gets the enchantment helper. Used to resolve current enchantment IDs.
|
||||
*/
|
||||
public final IAMEnchantmentHelper getEnchantHelper() {
|
||||
return enchantmentHelper;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the skill tree manager. Used to register spell parts into the skill trees (accessible via occulus)
|
||||
* Gets the skill tree manager. Used to register spell parts into the skill trees (accessible via occulus)
|
||||
*/
|
||||
public final ISkillTreeManager getSkillTreeManager() {
|
||||
return this.skillTreeManager;
|
||||
@@ -97,42 +100,44 @@ public class ArsMagicaApi {
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the keystone helper instance. Used to check inventories for keys and check access to blocks lockable by keystone.
|
||||
* Gets the keystone helper instance. Used to check inventories for keys and check access to blocks lockable by
|
||||
* keystone.
|
||||
*/
|
||||
public final IKeystoneHelper getKeystoneHelper() {
|
||||
return this.keystoneHelper;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the entity manager. Used to blacklist things from the progeny and butchery flicker operators
|
||||
* Gets the entity manager. Used to blacklist things from the progeny and butchery flicker operators
|
||||
*/
|
||||
public final IEntityManager getEntityManager() {
|
||||
return this.entityManager;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the fuel helper instance. Used to register new fuels for the Obelisk.
|
||||
* Gets the fuel helper instance. Used to register new fuels for the Obelisk.
|
||||
*/
|
||||
public final IObeliskFuelHelper getFuelHelper() {
|
||||
return this.obeliskFuelHelper;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the flicker registry. Used to register new flicker operators into the habitat.
|
||||
* Gets the flicker registry. Used to register new flicker operators into the habitat.
|
||||
*/
|
||||
public final IFlickerRegistry getFlickerOperatorRegistry() {
|
||||
return flickerOperatorRegistry;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the armor imbuement registry. Used to register new imbuements and check if imbuements are present on a given item stack.
|
||||
* Gets the armor imbuement registry. Used to register new imbuements and check if imbuements are present on a given
|
||||
* item stack.
|
||||
*/
|
||||
public final IImbuementRegistry getArmorInfusionRegistry() {
|
||||
return this.armorInfusionRegistry;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the AM recipe manager. Used to register new essence refiner recipes.
|
||||
* Gets the AM recipe manager. Used to register new essence refiner recipes.
|
||||
*/
|
||||
public final IAMRecipeManager getEssenceRecipeManager() {
|
||||
return this.essenceRecipes;
|
||||
@@ -175,30 +180,34 @@ public class ArsMagicaApi {
|
||||
|
||||
/**
|
||||
* Registers a skill tree entry (Shape, Component, Modifier, or Talent) into the mod
|
||||
* @param entry The skill tree entry to register
|
||||
* @param name The unlocalized name that is used to identify this entry
|
||||
* @param tree Which skill tree the entry should be located in
|
||||
* @param x The x coordinate that the entry should be located at in the tree. Typical increments are of 45 to space the items.
|
||||
* @param y The y coordinate that the entry should be located at in the tree. Typical increments are of 45 to space the items.
|
||||
* @param point The type of skill point needed to unlock this entry
|
||||
* @param prerequs Any skill tree entries that are required as prerequisites for this one. All prerequisites must be registered before the current entry.
|
||||
*
|
||||
* @param entry The skill tree entry to register
|
||||
* @param name The unlocalized name that is used to identify this entry
|
||||
* @param tree Which skill tree the entry should be located in
|
||||
* @param x The x coordinate that the entry should be located at in the tree. Typical increments are of 45 to
|
||||
* space the items.
|
||||
* @param y The y coordinate that the entry should be located at in the tree. Typical increments are of 45 to
|
||||
* space the items.
|
||||
* @param point The type of skill point needed to unlock this entry
|
||||
* @param prerequs Any skill tree entries that are required as prerequisites for this one. All prerequisites must be
|
||||
* registered before the current entry.
|
||||
*/
|
||||
public final void registerSkillTreeEntry(
|
||||
ISkillTreeEntry entry,
|
||||
String name,
|
||||
SkillTrees tree,
|
||||
int x,
|
||||
int y,
|
||||
SkillPointTypes point,
|
||||
ISkillTreeEntry... prereqs) {
|
||||
public final void registerSkillTreeEntry(ISkillTreeEntry entry, String name, SkillTrees tree, int x, int y,
|
||||
SkillPointTypes point, ISkillTreeEntry... prereqs) {
|
||||
spellPartManager.registerSkillTreeEntry(entry, name);
|
||||
skillTreeManager.RegisterPart(entry, x, y, tree, point, prereqs);
|
||||
}
|
||||
|
||||
/**
|
||||
* Registers the IIcon to use for the specified skill. This should be called during the API's registerSkillTreeIcons event for each entry that you registered. You get a reference to the ISpellIconManager which has the same method, so this is only here for convenience.
|
||||
* @param name The unlocalized name that was used to register the spell. See {@link #registerSkillTreeEntry(ISkillTreeEntry, String, SkillTrees, int, int, SkillPointTypes, ISkillTreeEntry...) registerSkillTreeEntry} method for more info on the name.
|
||||
* @param IIcon The IIcon to use. You need to register these IIcons with the game beforehand during your mod's load phase - AM won't do it for you.
|
||||
* Registers the IIcon to use for the specified skill. This should be called during the API's registerSkillTreeIcons
|
||||
* event for each entry that you registered. You get a reference to the ISpellIconManager which has the same method,
|
||||
* so this is only here for convenience.
|
||||
*
|
||||
* @param name The unlocalized name that was used to register the spell. See
|
||||
* {@link #registerSkillTreeEntry(ISkillTreeEntry, String, SkillTrees, int, int, SkillPointTypes, ISkillTreeEntry...)
|
||||
* registerSkillTreeEntry} method for more info on the name.
|
||||
* @param IIcon The IIcon to use. You need to register these IIcons with the game beforehand during your mod's load
|
||||
* phase - AM won't do it for you.
|
||||
*/
|
||||
@SideOnly(Side.CLIENT)
|
||||
public final void registerSkillIcon(String name, IIcon IIcon) {
|
||||
@@ -206,7 +215,7 @@ public class ArsMagicaApi {
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the IIcon manager. This is used to register spell IIcons.
|
||||
* Returns the IIcon manager. This is used to register spell IIcons.
|
||||
*/
|
||||
@SideOnly(Side.CLIENT)
|
||||
public final ISpellIconManager getSpellIconManager() {
|
||||
|
||||
@@ -3,10 +3,12 @@ package am2.api;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
public interface IAMRecipeManager {
|
||||
|
||||
/**
|
||||
* Adds a recipe to the essence refiner.
|
||||
* @param output The output created
|
||||
* @param components The components required. Must be a length of 5.
|
||||
*
|
||||
* @param output The output created
|
||||
* @param components The components required. Must be a length of 5.
|
||||
*/
|
||||
public void addRefinerRecipe(ItemStack output, ItemStack[] components);
|
||||
}
|
||||
@@ -8,21 +8,26 @@ public interface IAffinityData {
|
||||
* Gets the depth of the specified affinity as a percentage.
|
||||
*/
|
||||
float getAffinityDepth(Affinity affinity);
|
||||
|
||||
/**
|
||||
* Gets the factor at which affinity gains are currently reduced.
|
||||
*/
|
||||
float getDiminishingReturnsFactor();
|
||||
|
||||
/**
|
||||
* Directly sets an affinity. Does not take into account oppositions. Use sparingly.
|
||||
* Directly sets an affinity. Does not take into account oppositions. Use sparingly.
|
||||
*
|
||||
* @param affinity The affinity to set
|
||||
* @param depth The depth to set
|
||||
* @param depth The depth to set
|
||||
*/
|
||||
void setAffinityAndDepth(Affinity affinity, float depth);
|
||||
|
||||
/**
|
||||
* Increments the affinity by the specified amount, and decrements other affinities by an amount related to
|
||||
* how much in opposition they are to the specified affinity.
|
||||
* Increments the affinity by the specified amount, and decrements other affinities by an amount related to how much
|
||||
* in opposition they are to the specified affinity.
|
||||
*
|
||||
* @param affinity The affinity to increase
|
||||
* @param amt The amount to increase the affinity by
|
||||
* @param amt The amount to increase the affinity by
|
||||
*/
|
||||
void incrementAffinity(Affinity affinity, float amt);
|
||||
}
|
||||
@@ -4,10 +4,12 @@ import am2.api.math.AMVector3;
|
||||
|
||||
/**
|
||||
* Extended properties on EntityLiving used in Ars Magica.
|
||||
*
|
||||
* @author Mithion
|
||||
*
|
||||
*/
|
||||
public interface IExtendedProperties {
|
||||
|
||||
public float getCurrentMana();
|
||||
|
||||
public float getMaxMana();
|
||||
|
||||
@@ -1,64 +1,83 @@
|
||||
package am2.api;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
|
||||
import am2.api.spell.component.interfaces.ISkillTreeEntry;
|
||||
import am2.api.spell.enums.LearnStates;
|
||||
import am2.api.spell.enums.SkillPointTypes;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
|
||||
public interface ISkillData {
|
||||
|
||||
/**
|
||||
* Checks if the specified skill tree entry is known
|
||||
*/
|
||||
boolean isEntryKnown(SkillTreeEntry entry);
|
||||
|
||||
/**
|
||||
* Returns the number of skill points of the given type that this skill data has
|
||||
*/
|
||||
int getSpellPoints(SkillPointTypes type);
|
||||
|
||||
/**
|
||||
* Sets the number of skill points of the given type that this skill data has
|
||||
*/
|
||||
void setSpellPoints(int spellPoints, SkillPointTypes type);
|
||||
|
||||
/**
|
||||
* Sets the number of skill points for all types that this skill data has
|
||||
*/
|
||||
void setSpellPoints(int spellPoints_blue, int spellPoints_green, int spellPoints_red);
|
||||
|
||||
/**
|
||||
* Increments the skill points of the specified type.
|
||||
*/
|
||||
void incrementSpellPoints(SkillPointTypes type);
|
||||
|
||||
/**
|
||||
* Decrements the skill points of the specified type. Cannot go below 0.
|
||||
* Decrements the skill points of the specified type. Cannot go below 0.
|
||||
*/
|
||||
void decrementSpellPoints(SkillPointTypes type);
|
||||
|
||||
/**
|
||||
* Learns the specified entry. This will attempt to decrement skill points but is not bounded by it - make sure you check {@link #getLearnState(SkillTreeEntry, EntityPlayer)} first!
|
||||
* Learns the specified entry. This will attempt to decrement skill points but is not bounded by it - make sure you
|
||||
* check {@link #getLearnState(SkillTreeEntry, EntityPlayer)} first!
|
||||
*
|
||||
* @param entry
|
||||
*/
|
||||
void learn(ISkillTreeEntry entry);
|
||||
|
||||
/**
|
||||
* Returns an array of shifted IDs representing the known shapes.
|
||||
*/
|
||||
Integer[] getKnownShapes();
|
||||
|
||||
/**
|
||||
* Returns an array of shifted IDs representing the known components.
|
||||
*/
|
||||
Integer[] getKnownComponents();
|
||||
|
||||
/**
|
||||
* Returns an array of shifted IDs representing the known modifiers.
|
||||
*/
|
||||
Integer[] getKnownModifiers();
|
||||
|
||||
/**
|
||||
* Returns an array of shifted IDs representing the known talents.
|
||||
*/
|
||||
Integer[] getKnownTalents();
|
||||
|
||||
/**
|
||||
* Forces changes to sync to appropriate clients. Chances are you won't have to call this, as the sync will happen at regular intervals if there are actually changes to sync. This is for when you need the changes clientside immediately.
|
||||
* Forces changes to sync to appropriate clients. Chances are you won't have to call this, as the sync will happen
|
||||
* at regular intervals if there are actually changes to sync. This is for when you need the changes clientside
|
||||
* immediately.
|
||||
*/
|
||||
void forceSync();
|
||||
|
||||
/**
|
||||
* Clears all spell knowledge and skill points. Does not do any refunding -- this is NOT a respec!
|
||||
* Clears all spell knowledge and skill points. Does not do any refunding -- this is NOT a respec!
|
||||
*/
|
||||
void clearAllKnowledge();
|
||||
|
||||
/**
|
||||
* Gets the learn state for the specified skill.
|
||||
*/
|
||||
|
||||
@@ -4,6 +4,7 @@ import am2.api.spell.component.interfaces.ISkillTreeEntry;
|
||||
import am2.api.spell.enums.SkillTrees;
|
||||
|
||||
public class SkillTreeEntry {
|
||||
|
||||
public final int x;
|
||||
public final int y;
|
||||
public final SkillTrees tree;
|
||||
@@ -12,12 +13,7 @@ public class SkillTreeEntry {
|
||||
public final int tier;
|
||||
public boolean enabled;
|
||||
|
||||
public SkillTreeEntry(
|
||||
int x,
|
||||
int y,
|
||||
SkillTrees tree,
|
||||
SkillTreeEntry[] prerequisites,
|
||||
ISkillTreeEntry registeredItem,
|
||||
public SkillTreeEntry(int x, int y, SkillTrees tree, SkillTreeEntry[] prerequisites, ISkillTreeEntry registeredItem,
|
||||
boolean enabled) {
|
||||
this.x = x;
|
||||
this.y = y;
|
||||
|
||||
@@ -4,6 +4,7 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
|
||||
public interface IKeystoneLockable<T extends TileEntity, IInventory> {
|
||||
|
||||
/**
|
||||
* Return a three element array of the three runes in the inventory that make up the current keystone combination.
|
||||
* Elements can be NULL if there is no rune present.
|
||||
@@ -11,12 +12,12 @@ public interface IKeystoneLockable<T extends TileEntity, IInventory> {
|
||||
public ItemStack[] getRunesInKey();
|
||||
|
||||
/**
|
||||
* Does the keystone need to be the currently held item? Trumps {@link #keystoneMustBeInActionBar()}.
|
||||
* Does the keystone need to be the currently held item? Trumps {@link #keystoneMustBeInActionBar()}.
|
||||
*/
|
||||
public boolean keystoneMustBeHeld();
|
||||
|
||||
/**
|
||||
* Does the keystone need to be in the action bar? Or can it be anywhere in the inventory?
|
||||
* Does the keystone need to be in the action bar? Or can it be anywhere in the inventory?
|
||||
*/
|
||||
public boolean keystoneMustBeInActionBar();
|
||||
}
|
||||
@@ -2,11 +2,14 @@ package am2.api.blocks;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
public class MultiblockStructureDefinition {
|
||||
|
||||
public class BlockDec {
|
||||
|
||||
Block block;
|
||||
int meta;
|
||||
|
||||
@@ -50,6 +53,7 @@ public class MultiblockStructureDefinition {
|
||||
}
|
||||
|
||||
public class BlockCoord implements Comparable<BlockCoord> {
|
||||
|
||||
public int x;
|
||||
public int y;
|
||||
public int z;
|
||||
@@ -63,8 +67,7 @@ public class MultiblockStructureDefinition {
|
||||
@Override
|
||||
public boolean equals(Object obj) {
|
||||
if (obj instanceof BlockCoord) {
|
||||
return this.x == ((BlockCoord) obj).x
|
||||
&& this.y == ((BlockCoord) obj).y
|
||||
return this.x == ((BlockCoord) obj).x && this.y == ((BlockCoord) obj).y
|
||||
&& this.z == ((BlockCoord) obj).z;
|
||||
}
|
||||
return false;
|
||||
@@ -94,15 +97,14 @@ public class MultiblockStructureDefinition {
|
||||
|
||||
@Override
|
||||
public int compareTo(BlockCoord o) {
|
||||
return this.z > o.z
|
||||
? 1
|
||||
: this.z < o.z
|
||||
? -1
|
||||
return this.z > o.z ? 1
|
||||
: this.z < o.z ? -1
|
||||
: this.x > o.x ? 1 : this.x < o.x ? -1 : this.y > o.y ? 1 : this.y < o.y ? -1 : 0;
|
||||
}
|
||||
}
|
||||
|
||||
public class StructureGroup {
|
||||
|
||||
String name;
|
||||
int mutex;
|
||||
HashMap<BlockCoord, ArrayList<BlockDec>> allowedBlocks;
|
||||
@@ -143,8 +145,7 @@ public class MultiblockStructureDefinition {
|
||||
}
|
||||
|
||||
HashMap<BlockCoord, ArrayList<BlockDec>> getStructureLayer(int layer) {
|
||||
HashMap<BlockCoord, ArrayList<BlockDec>> toReturn =
|
||||
new HashMap<MultiblockStructureDefinition.BlockCoord, ArrayList<BlockDec>>();
|
||||
HashMap<BlockCoord, ArrayList<BlockDec>> toReturn = new HashMap<MultiblockStructureDefinition.BlockCoord, ArrayList<BlockDec>>();
|
||||
|
||||
if (layer > getMaxLayer() || layer < getMinLayer()) {
|
||||
return toReturn;
|
||||
|
||||
@@ -1,10 +1,12 @@
|
||||
package am2.api.enchantment;
|
||||
|
||||
public interface IAMEnchantmentHelper {
|
||||
|
||||
/**
|
||||
* Gets the current ID for soulbound enchantment
|
||||
*/
|
||||
public int getSoulboundID();
|
||||
|
||||
/**
|
||||
* Gets the current ID for magic resist enchantment
|
||||
*/
|
||||
|
||||
@@ -1,10 +1,12 @@
|
||||
package am2.api.entities;
|
||||
|
||||
public interface IEntityManager {
|
||||
|
||||
/**
|
||||
* Adds the specified entities to the butchery blacklist (won't be affected by sigil of butchery)
|
||||
*/
|
||||
public void addButcheryBlacklist(Class... clazz);
|
||||
|
||||
/**
|
||||
* Adds the specified entities to the progeny blacklist (won't be affected by sigil of progeny)
|
||||
*/
|
||||
|
||||
@@ -1,15 +1,18 @@
|
||||
package am2.api.events;
|
||||
|
||||
import cpw.mods.fml.common.eventhandler.Event;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import cpw.mods.fml.common.eventhandler.Event;
|
||||
|
||||
/**
|
||||
* Fired whenever mana cost of a spell is calculated, after all predefined calculations.
|
||||
*
|
||||
* @author Mithion
|
||||
*
|
||||
*/
|
||||
public class ManaCostEvent extends Event {
|
||||
|
||||
public final ItemStack spell;
|
||||
public final EntityLivingBase caster;
|
||||
public float manaCost;
|
||||
|
||||
@@ -1,21 +1,24 @@
|
||||
package am2.api.events;
|
||||
|
||||
import am2.api.spell.enums.SpellModifiers;
|
||||
import cpw.mods.fml.common.eventhandler.Event;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import am2.api.spell.enums.SpellModifiers;
|
||||
import cpw.mods.fml.common.eventhandler.Event;
|
||||
|
||||
/**
|
||||
* Called whenever a spell's modified variable is calculated
|
||||
*
|
||||
* @author Mithion
|
||||
*
|
||||
*/
|
||||
public class ModifierCalculatedEvent extends Event {
|
||||
|
||||
// The attribute being modified
|
||||
public final SpellModifiers attribute;
|
||||
// The caster of the spell
|
||||
public final EntityLivingBase caster;
|
||||
// The spell being cast. This is a copy of the ItemStack.
|
||||
// The spell being cast. This is a copy of the ItemStack.
|
||||
public final ItemStack spell;
|
||||
// the initial value of the variable
|
||||
public final double initialValue;
|
||||
@@ -30,13 +33,8 @@ public class ModifierCalculatedEvent extends Event {
|
||||
MULTIPLY
|
||||
}
|
||||
|
||||
public ModifierCalculatedEvent(
|
||||
ItemStack spell,
|
||||
EntityLivingBase caster,
|
||||
SpellModifiers attribute,
|
||||
double initialValue,
|
||||
double modifiedValue,
|
||||
OperationType operation) {
|
||||
public ModifierCalculatedEvent(ItemStack spell, EntityLivingBase caster, SpellModifiers attribute,
|
||||
double initialValue, double modifiedValue, OperationType operation) {
|
||||
this.spell = spell;
|
||||
this.caster = caster;
|
||||
this.attribute = attribute;
|
||||
|
||||
@@ -1,14 +1,17 @@
|
||||
package am2.api.events;
|
||||
|
||||
import cpw.mods.fml.common.eventhandler.Event;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
|
||||
import cpw.mods.fml.common.eventhandler.Event;
|
||||
|
||||
/**
|
||||
* Raised when a player's magic level changes.
|
||||
*
|
||||
* @author Mithion
|
||||
*
|
||||
*/
|
||||
public class PlayerMagicLevelChangeEvent extends Event {
|
||||
|
||||
public final int level;
|
||||
public final EntityLivingBase entity;
|
||||
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
package am2.api.events;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import cpw.mods.fml.common.eventhandler.Cancelable;
|
||||
import cpw.mods.fml.common.eventhandler.Event;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
@Cancelable
|
||||
public class ReconstructorRepairEvent extends Event {
|
||||
@@ -14,6 +15,7 @@ public class ReconstructorRepairEvent extends Event {
|
||||
|
||||
/**
|
||||
* Called when the arcane reconstructor ticks on repairing an item.
|
||||
*
|
||||
* @param item
|
||||
*/
|
||||
public ReconstructorRepairEvent(ItemStack item) {
|
||||
|
||||
@@ -4,6 +4,7 @@ import am2.api.spell.ISpellIconManager;
|
||||
import cpw.mods.fml.common.eventhandler.Event;
|
||||
|
||||
public class RegisterSkillTreeIcons extends Event {
|
||||
|
||||
public final ISpellIconManager manager;
|
||||
|
||||
public RegisterSkillTreeIcons(ISpellIconManager manager) {
|
||||
|
||||
@@ -1,15 +1,18 @@
|
||||
package am2.api.events;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
|
||||
import am2.api.spell.component.interfaces.ISkillTreeEntry;
|
||||
import cpw.mods.fml.common.eventhandler.Event;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
|
||||
/**
|
||||
* Raised when a player learns a skill at the Occulus
|
||||
*
|
||||
* @author Mithion
|
||||
*
|
||||
*/
|
||||
public class SkillLearnedEvent extends Event {
|
||||
|
||||
public final EntityPlayer player;
|
||||
public final ISkillTreeEntry skill;
|
||||
|
||||
|
||||
@@ -1,15 +1,18 @@
|
||||
package am2.api.events;
|
||||
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import am2.api.spell.ItemSpellBase;
|
||||
import am2.api.spell.enums.SpellCastResult;
|
||||
import cpw.mods.fml.common.eventhandler.Cancelable;
|
||||
import cpw.mods.fml.common.eventhandler.Event;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
public class SpellCastingEvent {
|
||||
|
||||
@Cancelable
|
||||
public class Pre extends Event {
|
||||
|
||||
/**
|
||||
* The spell being cast
|
||||
*/
|
||||
@@ -39,12 +42,7 @@ public class SpellCastingEvent {
|
||||
*/
|
||||
public final boolean isChanneled;
|
||||
|
||||
public Pre(
|
||||
ItemStack stack,
|
||||
ItemSpellBase spell,
|
||||
EntityLivingBase caster,
|
||||
float manaCost,
|
||||
float burnout,
|
||||
public Pre(ItemStack stack, ItemSpellBase spell, EntityLivingBase caster, float manaCost, float burnout,
|
||||
boolean isChanneled) {
|
||||
this.caster = caster;
|
||||
this.spell = spell;
|
||||
@@ -57,6 +55,7 @@ public class SpellCastingEvent {
|
||||
|
||||
@Cancelable
|
||||
public class Post extends Event {
|
||||
|
||||
/**
|
||||
* The spell being cast
|
||||
*/
|
||||
@@ -86,14 +85,8 @@ public class SpellCastingEvent {
|
||||
*/
|
||||
public final boolean isChanneled;
|
||||
|
||||
public Post(
|
||||
ItemStack stack,
|
||||
ItemSpellBase spell,
|
||||
EntityLivingBase caster,
|
||||
float manaCost,
|
||||
float burnout,
|
||||
boolean isChanneled,
|
||||
SpellCastResult castResult) {
|
||||
public Post(ItemStack stack, ItemSpellBase spell, EntityLivingBase caster, float manaCost, float burnout,
|
||||
boolean isChanneled, SpellCastResult castResult) {
|
||||
this.caster = caster;
|
||||
this.spell = spell;
|
||||
this.manaCost = manaCost;
|
||||
|
||||
@@ -3,29 +3,30 @@ package am2.api.events;
|
||||
import cpw.mods.fml.common.eventhandler.Event;
|
||||
|
||||
public class SpellRecipeItemsEvent extends Event {
|
||||
public final String registeredName; // The registered name of the spell part. Used to identify what spell
|
||||
|
||||
public final String registeredName; // The registered name of the spell part. Used to identify what spell
|
||||
// shape/component/modifier we are working with
|
||||
public final int
|
||||
ID; // The ID of the spell part. Also can be used to identify what we are working with, if you don't like
|
||||
public final int ID; // The ID of the spell part. Also can be used to identify what we are working with, if you
|
||||
// don't like
|
||||
// strings.
|
||||
|
||||
/**
|
||||
* recipe items, in order, that need to be thrown into the crafting altar in order to create the item.
|
||||
* <br/>
|
||||
* Use Items for items, Blocks for blocks, Strings for OreDictionary items, and E:[type flag] followed by an integer for essence amounts.
|
||||
* <br/>
|
||||
* Use itemstacks for items/blocks/oredict when meta is required. By default it is meta 0. Quantity (stack size) is ignored.
|
||||
* <br/>
|
||||
* Integer pairs represent the type (*=any, 1=neutral, 2=light, 4=dark, etc.), and the quantity of essence required. The type can be used as flags,
|
||||
* <br/>
|
||||
* recipe items, in order, that need to be thrown into the crafting altar in order to create the item. <br/>
|
||||
* Use Items for items, Blocks for blocks, Strings for OreDictionary items, and E:[type flag] followed by an integer
|
||||
* for essence amounts. <br/>
|
||||
* Use itemstacks for items/blocks/oredict when meta is required. By default it is meta 0. Quantity (stack size) is
|
||||
* ignored. <br/>
|
||||
* Integer pairs represent the type (*=any, 1=neutral, 2=light, 4=dark, etc.), and the quantity of essence required.
|
||||
* The type can be used as flags, <br/>
|
||||
* For example:
|
||||
*
|
||||
* <pre>
|
||||
* new Object[]{ "E:1|2", 1500 } //require 1500 of neutral or 1500 of light power.
|
||||
* new Object[]{ "E:*", 1500 } //require 1500 of any kind of power
|
||||
* etc.
|
||||
*</pre>
|
||||
* </pre>
|
||||
*/
|
||||
public Object[] recipeItems; // The actual recipe items. Change or verify them here.
|
||||
public Object[] recipeItems; // The actual recipe items. Change or verify them here.
|
||||
|
||||
public SpellRecipeItemsEvent(String name, int ID, Object[] recipeItems) {
|
||||
registeredName = name;
|
||||
|
||||
@@ -3,6 +3,7 @@ package am2.api.flickers;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
|
||||
public interface IFlickerController<T extends TileEntity> {
|
||||
|
||||
public byte[] getMetadata(IFlickerFunctionality operator);
|
||||
|
||||
public void setMetadata(IFlickerFunctionality operator, byte[] meta);
|
||||
|
||||
@@ -1,9 +1,11 @@
|
||||
package am2.api.flickers;
|
||||
|
||||
import am2.api.spell.enums.Affinity;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import am2.api.spell.enums.Affinity;
|
||||
|
||||
public interface IFlickerFunctionality {
|
||||
|
||||
boolean RequiresPower();
|
||||
|
||||
int PowerPerOperation();
|
||||
|
||||
@@ -1,10 +1,14 @@
|
||||
package am2.api.flickers;
|
||||
|
||||
public interface IFlickerRegistry {
|
||||
|
||||
/**
|
||||
* Attempts to register a flicker operator into the flicker network
|
||||
* @param singleton The instance of the class that should be called upon to perform the operations when loaded into a flicker block
|
||||
* @param mask The bit mask representing the flicker combination. These are ORed affinity masks. @see am2.api.spell.enums.Affinity.getMask for specific mask flags (flickers represent an affinity)
|
||||
*
|
||||
* @param singleton The instance of the class that should be called upon to perform the operations when loaded into
|
||||
* a flicker block
|
||||
* @param mask The bit mask representing the flicker combination. These are ORed affinity masks. @see
|
||||
* am2.api.spell.enums.Affinity.getMask for specific mask flags (flickers represent an affinity)
|
||||
* @return True if registered, false if the mask is already in use.
|
||||
*/
|
||||
public boolean registerFlickerOperator(IFlickerFunctionality singleton, int mask);
|
||||
|
||||
@@ -1,36 +1,41 @@
|
||||
package am2.api.illeffect;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
/**
|
||||
* Base interface for an ill effect during spell creation. <br/>
|
||||
* Base interface for an ill effect during spell creation. <br/>
|
||||
* Included for compatibility; do not directly inherit. <br/>
|
||||
* Use IllEffectBase instead.
|
||||
*
|
||||
* @author Mithion
|
||||
*
|
||||
*/
|
||||
public interface IIllEffect extends Comparable {
|
||||
|
||||
/**
|
||||
* The severity level of the effect. Controls at what instability level the effect could be applied.
|
||||
* The severity level of the effect. Controls at what instability level the effect could be applied.
|
||||
*
|
||||
* @return One of the values in the IllEffectSeverity enum.
|
||||
*/
|
||||
public IllEffectSeverity GetSeverity();
|
||||
|
||||
/**
|
||||
* Callback to actually apply the ill effect.
|
||||
*
|
||||
* @param world The world the effect is happening in
|
||||
* @param x The x coordinate of the vinteum crystal
|
||||
* @param y The y coordinate of the vinteum crystal
|
||||
* @param z The z coordinate of the vinteum crystal
|
||||
* @param x The x coordinate of the vinteum crystal
|
||||
* @param y The y coordinate of the vinteum crystal
|
||||
* @param z The z coordinate of the vinteum crystal
|
||||
* @return A map of entity players affected, as well as any metadata relevant to the effect applied on that player.
|
||||
*/
|
||||
public Map<EntityPlayer, Object> ApplyIllEffect(World world, int x, int y, int z);
|
||||
|
||||
/**
|
||||
* Gets the localized description of this ill effect as pertains to the affected entity player.
|
||||
* This will only be called based on your own class, so you can assume the metadata matches your metadata output from ApplyIllEffect.
|
||||
* Gets the localized description of this ill effect as pertains to the affected entity player. This will only be
|
||||
* called based on your own class, so you can assume the metadata matches your metadata output from ApplyIllEffect.
|
||||
*/
|
||||
public String getDescription(EntityPlayer player, Object metadata);
|
||||
}
|
||||
@@ -1,11 +1,13 @@
|
||||
package am2.api.illeffect;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
/**
|
||||
* Base class for all ill effects.
|
||||
*
|
||||
* @author Mithion
|
||||
*
|
||||
*/
|
||||
|
||||
@@ -2,6 +2,7 @@ package am2.api.illeffect;
|
||||
|
||||
/**
|
||||
* Varying severities for ill effects during spell creation.
|
||||
*
|
||||
* @author Mithion
|
||||
*
|
||||
*/
|
||||
|
||||
@@ -1,12 +1,15 @@
|
||||
package am2.api.items;
|
||||
|
||||
import am2.api.blocks.IKeystoneLockable;
|
||||
import java.util.ArrayList;
|
||||
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import am2.api.blocks.IKeystoneLockable;
|
||||
|
||||
public interface IKeystoneHelper {
|
||||
|
||||
/**
|
||||
* Gets all the keys from all keystones in the entity's inventory
|
||||
*/
|
||||
@@ -14,15 +17,18 @@ public interface IKeystoneHelper {
|
||||
|
||||
/**
|
||||
* Returns the key combination made by the specified runes
|
||||
*
|
||||
* @param runes An array of runes no larger than three elements (anything above will be ignored)
|
||||
* @return
|
||||
*/
|
||||
public long getKeyFromRunes(ItemStack[] runes);
|
||||
|
||||
/**
|
||||
* Returns true or false based on whether the passed in player meets the keystone requirements needed to access the specified container
|
||||
* Returns true or false based on whether the passed in player meets the keystone requirements needed to access the
|
||||
* specified container
|
||||
*
|
||||
* @param inventory The inventory the player is trying to access
|
||||
* @param player The player attempting the access check
|
||||
* @param player The player attempting the access check
|
||||
* @return True if the conditions are met, otherwise false
|
||||
*/
|
||||
public boolean canPlayerAccess(IKeystoneLockable inventory, EntityPlayer player);
|
||||
|
||||
@@ -3,6 +3,7 @@ package am2.api.items.armor;
|
||||
import cpw.mods.fml.common.eventhandler.Event;
|
||||
|
||||
public class ArmorTextureEvent extends Event {
|
||||
|
||||
public final int slot;
|
||||
public final int renderIndex;
|
||||
|
||||
|
||||
@@ -1,42 +1,52 @@
|
||||
package am2.api.items.armor;
|
||||
|
||||
import java.util.EnumSet;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
public interface IArmorImbuement {
|
||||
|
||||
/**
|
||||
* Gets the ID of the infusion effect. Must be unique.
|
||||
* Gets the ID of the infusion effect. Must be unique.
|
||||
*/
|
||||
String getID();
|
||||
|
||||
/**
|
||||
* Gets the IIcon index for the texture in the GUI
|
||||
*/
|
||||
int getIconIndex();
|
||||
|
||||
/**
|
||||
* Gets the tier for this infusion
|
||||
*/
|
||||
ImbuementTiers getTier();
|
||||
|
||||
/**
|
||||
* Gets all situations under which this infusion applies
|
||||
*/
|
||||
EnumSet<ImbuementApplicationTypes> getApplicationTypes();
|
||||
|
||||
/**
|
||||
* Applies the effect. This will be called when any of the application types is matched in an event.
|
||||
* @param player The player wearing the armor
|
||||
* @param world The world the player is in
|
||||
* @param stack The itemstack that was matched
|
||||
* Applies the effect. This will be called when any of the application types is matched in an event.
|
||||
*
|
||||
* @param player The player wearing the armor
|
||||
* @param world The world the player is in
|
||||
* @param stack The itemstack that was matched
|
||||
* @param matchedType The application type that was matched.
|
||||
* @param params Depends on the application type.
|
||||
* <br/>
|
||||
* In the case of ON_TICK, it will be a 1-length array with the first element being the LivingEvent event <br/>
|
||||
* In the case of ON_JUMP, it will be a 1-length array with the first element being the LivingJumpEvent event<br/>
|
||||
* In the case of ON_HIT, it will be a 1-length array with the first element being the LivingHurtEvent event<br/>
|
||||
* In the case of ON_MINING_SPEED, it will be a 1-length array with the first element being the BreakSpeed event <br/>
|
||||
* @param params Depends on the application type. <br/>
|
||||
* In the case of ON_TICK, it will be a 1-length array with the first element being the
|
||||
* LivingEvent event <br/>
|
||||
* In the case of ON_JUMP, it will be a 1-length array with the first element being the
|
||||
* LivingJumpEvent event<br/>
|
||||
* In the case of ON_HIT, it will be a 1-length array with the first element being the
|
||||
* LivingHurtEvent event<br/>
|
||||
* In the case of ON_MINING_SPEED, it will be a 1-length array with the first element being the
|
||||
* BreakSpeed event <br/>
|
||||
*/
|
||||
boolean applyEffect(
|
||||
EntityPlayer player, World world, ItemStack stack, ImbuementApplicationTypes matchedType, Object... params);
|
||||
boolean applyEffect(EntityPlayer player, World world, ItemStack stack, ImbuementApplicationTypes matchedType,
|
||||
Object... params);
|
||||
|
||||
/**
|
||||
* Gets all armor slots that this effect can be applied to
|
||||
|
||||
@@ -3,23 +3,27 @@ package am2.api.items.armor;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
public interface IImbuementRegistry {
|
||||
|
||||
/**
|
||||
* Registers a new imbuement instance into the system
|
||||
*/
|
||||
void registerImbuement(IArmorImbuement imbuementInstance);
|
||||
|
||||
/**
|
||||
* Locates the specified imbuement registered to the passed-in ID.
|
||||
* Returns null if not found.
|
||||
* Locates the specified imbuement registered to the passed-in ID. Returns null if not found.
|
||||
*/
|
||||
IArmorImbuement getImbuementByID(String ID);
|
||||
|
||||
/**
|
||||
* Returns all imbuements registered into the specified tier for the given armor type (slot).
|
||||
*/
|
||||
IArmorImbuement[] getImbuementsForTier(ImbuementTiers tier, int armorType);
|
||||
|
||||
/**
|
||||
* Is the given imbuement instance present on the passed-in item stack?
|
||||
*/
|
||||
boolean isImbuementPresent(ItemStack stack, IArmorImbuement imbuement);
|
||||
|
||||
/**
|
||||
* Is the given imbuement ID present on the passed-in item stack?
|
||||
*/
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package am2.api.math;
|
||||
|
||||
public class AMLineSegment {
|
||||
|
||||
private AMVector3 a, b;
|
||||
|
||||
public AMLineSegment(AMVector3 a, AMVector3 b) {
|
||||
@@ -24,11 +25,11 @@ public class AMLineSegment {
|
||||
float t = AMVector3.dotProduct(vVector2, vVector1);
|
||||
|
||||
// If our projected distance from vA, "t", is less than or equal to 0, it must
|
||||
// be closest to the end point vA. We want to return this end point.
|
||||
// be closest to the end point vA. We want to return this end point.
|
||||
if (t <= 0) return a.copy();
|
||||
|
||||
// If our projected distance from vA, "t", is greater than or equal to the magnitude
|
||||
// or distance of the line segment, it must be closest to the end point vB. So, return vB.
|
||||
// or distance of the line segment, it must be closest to the end point vB. So, return vB.
|
||||
if (t >= d) return b.copy();
|
||||
|
||||
AMVector3 vVector3 = vVector2.copy().scale(t);
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package am2.api.math;
|
||||
|
||||
public class AMMatrix4 {
|
||||
|
||||
float[] mat;
|
||||
|
||||
public AMMatrix4() {
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package am2.api.math;
|
||||
|
||||
public class AMPlane {
|
||||
|
||||
AMVector3 planeDef[];
|
||||
|
||||
public AMPlane(AMVector3... plane) {
|
||||
@@ -31,23 +32,18 @@ public class AMPlane {
|
||||
|
||||
float originDistance = planeDistance(vNormal, planeDef[0]);
|
||||
|
||||
distance1 = ((vNormal.x * p1.x)
|
||||
+ // Ax +
|
||||
(vNormal.y * p1.y)
|
||||
+ // Bx +
|
||||
(vNormal.z * p1.z))
|
||||
+ originDistance; // Cz + D
|
||||
distance1 = ((vNormal.x * p1.x) + // Ax +
|
||||
(vNormal.y * p1.y) + // Bx +
|
||||
(vNormal.z * p1.z)) + originDistance; // Cz + D
|
||||
|
||||
distance2 = ((vNormal.x * p2.x)
|
||||
+ // Ax +
|
||||
(vNormal.y * p2.y)
|
||||
+ // Bx +
|
||||
(vNormal.z * p2.z))
|
||||
+ originDistance; // Cz + D
|
||||
distance2 = ((vNormal.x * p2.x) + // Ax +
|
||||
(vNormal.y * p2.y) + // Bx +
|
||||
(vNormal.z * p2.z)) + originDistance; // Cz + D
|
||||
|
||||
if (distance1 * distance2 >= 0) // Check to see if both point's distances are both negative or both positive
|
||||
return false; // Return false if each point has the same sign. -1 and 1 would mean each point is on either side
|
||||
// of the plane. -1 -2 or 3 4 wouldn't...
|
||||
return false; // Return false if each point has the same sign. -1 and 1 would mean each point is on either
|
||||
// side
|
||||
// of the plane. -1 -2 or 3 4 wouldn't...
|
||||
|
||||
return true; // The line intersected the plane, Return TRUE
|
||||
}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package am2.api.math;
|
||||
|
||||
public class AMVector2 {
|
||||
|
||||
public double x;
|
||||
public double y;
|
||||
|
||||
|
||||
@@ -7,6 +7,7 @@ import net.minecraft.util.MathHelper;
|
||||
import net.minecraft.util.Vec3;
|
||||
|
||||
public class AMVector3 {
|
||||
|
||||
public float x;
|
||||
public float y;
|
||||
public float z;
|
||||
@@ -195,8 +196,8 @@ public class AMVector3 {
|
||||
}
|
||||
|
||||
/**
|
||||
* Writes the vector3 to the specified compound - note that the way this function works, only one vector3 can be written to a compound at a time.
|
||||
* Use sub-compounds if you need more!
|
||||
* Writes the vector3 to the specified compound - note that the way this function works, only one vector3 can be
|
||||
* written to a compound at a time. Use sub-compounds if you need more!
|
||||
*/
|
||||
public void writeToNBT(NBTTagCompound compound) {
|
||||
compound.setFloat("Vec3_x", x);
|
||||
|
||||
@@ -1,25 +1,30 @@
|
||||
package am2.api.particles;
|
||||
|
||||
public interface IBeamParticle {
|
||||
|
||||
/**
|
||||
* Sets the beam type. Determines the texture of the beam. Valid types are 0-2.
|
||||
* Sets the beam type. Determines the texture of the beam. Valid types are 0-2.
|
||||
*/
|
||||
public void setType(int type);
|
||||
|
||||
/**
|
||||
* Sets the color from a single integer. Good for hex colors.
|
||||
* Sets the color from a single integer. Good for hex colors.
|
||||
*/
|
||||
public void setRGBColor(int color);
|
||||
|
||||
/**
|
||||
* Sets the beam color from 3 int values (0-255).
|
||||
*/
|
||||
public void setRGBColorI(int r, int g, int b);
|
||||
|
||||
/**
|
||||
* Sets the beam color from 3 floating point values (0.0f - 1.0f)
|
||||
*/
|
||||
public void setRGBColorF(float r, float g, float b);
|
||||
|
||||
/**
|
||||
* Indicates that this beam is being cast by a player that is in first person. Should only be called when creating a beam from the local player, if the player is in first person.
|
||||
* <br />
|
||||
* Indicates that this beam is being cast by a player that is in first person. Should only be called when creating a
|
||||
* beam from the local player, if the player is in first person. <br />
|
||||
* This will offset the beam to make it look like it is coming from the player's active item and not their face.
|
||||
*/
|
||||
public void setFirstPersonPlayerCast();
|
||||
|
||||
@@ -3,14 +3,17 @@ package am2.api.power;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
public interface IObeliskFuelHelper {
|
||||
|
||||
/**
|
||||
* Registers a new fuel type for the obelisk to burn
|
||||
* @param stack The stack to use as a comparator (stackSize is ignored, just use 1)
|
||||
*
|
||||
* @param stack The stack to use as a comparator (stackSize is ignored, just use 1)
|
||||
* @param burnTime How long the obelisk should burn for when given one of these items
|
||||
*/
|
||||
public void registerFuelType(ItemStack stack, int burnTime);
|
||||
|
||||
/**
|
||||
* Retrieves the burn time for the specified stack. Returns 0 if it is not a valid fuel.
|
||||
* Retrieves the burn time for the specified stack. Returns 0 if it is not a valid fuel.
|
||||
*/
|
||||
public int getFuelBurnTime(ItemStack stack);
|
||||
}
|
||||
@@ -4,8 +4,8 @@ import net.minecraft.tileentity.TileEntity;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author Mithion
|
||||
* This will eventually allow you to interface with the AM power network - currently it is not fully working.
|
||||
* @author Mithion This will eventually allow you to interface with the AM power network - currently it is not fully
|
||||
* working.
|
||||
*/
|
||||
public interface IPowerNode<T extends TileEntity> {
|
||||
|
||||
@@ -16,12 +16,14 @@ public interface IPowerNode<T extends TileEntity> {
|
||||
|
||||
/**
|
||||
* Can this block provide power?
|
||||
*
|
||||
* @param type The power type we are checking for
|
||||
*/
|
||||
public boolean canProvidePower(PowerTypes type);
|
||||
|
||||
/**
|
||||
* Can this block relay power?
|
||||
*
|
||||
* @param type The type of power we are looking for
|
||||
*/
|
||||
public boolean canRelayPower(PowerTypes type);
|
||||
@@ -48,7 +50,8 @@ public interface IPowerNode<T extends TileEntity> {
|
||||
|
||||
/**
|
||||
* Offset of any particle effects to the origin of the block
|
||||
* @param axis The axis in question. 0=x, 1=y, 2=z
|
||||
*
|
||||
* @param axis The axis in question. 0=x, 1=y, 2=z
|
||||
*/
|
||||
public float particleOffset(int axis);
|
||||
}
|
||||
@@ -1,9 +1,10 @@
|
||||
package am2.api.power;
|
||||
|
||||
import java.security.InvalidParameterException;
|
||||
import java.util.ArrayList;
|
||||
|
||||
import am2.api.ArsMagicaApi;
|
||||
import cpw.mods.fml.common.FMLLog;
|
||||
import java.security.InvalidParameterException;
|
||||
import java.util.ArrayList;
|
||||
|
||||
public final class PowerTypes {
|
||||
|
||||
@@ -13,6 +14,7 @@ public final class PowerTypes {
|
||||
public static final PowerTypes DARK = new PowerTypes(4, "Dark", "\u00A74");
|
||||
|
||||
private static final ArrayList<PowerTypes> allPowerTypes = new ArrayList<PowerTypes>() {
|
||||
|
||||
{
|
||||
add(LIGHT);
|
||||
add(NEUTRAL);
|
||||
|
||||
@@ -5,21 +5,18 @@ import am2.api.spell.enums.SkillPointTypes;
|
||||
import am2.api.spell.enums.SkillTrees;
|
||||
|
||||
public interface ISkillTreeManager {
|
||||
|
||||
/**
|
||||
* Registers a spell part into the skill tree (where it can be unlocked).
|
||||
* Pass a null prerequisite for no prerequisite.
|
||||
* Throws an exception if the prerequisite passed in is not a registered entry in the skill tree, or if it is in a different tree.
|
||||
* @param shape The shape to register
|
||||
* @param x The x-coordinate in the skill tree to display the shape IIcon
|
||||
* @param y The y-coordinate in the skill tree to display the shape IIcon
|
||||
* @param tree The skill tree to register the shape into
|
||||
* Registers a spell part into the skill tree (where it can be unlocked). Pass a null prerequisite for no
|
||||
* prerequisite. Throws an exception if the prerequisite passed in is not a registered entry in the skill tree, or
|
||||
* if it is in a different tree.
|
||||
*
|
||||
* @param shape The shape to register
|
||||
* @param x The x-coordinate in the skill tree to display the shape IIcon
|
||||
* @param y The y-coordinate in the skill tree to display the shape IIcon
|
||||
* @param tree The skill tree to register the shape into
|
||||
* @param prerequisites The prerequisite skills needed for the shape.
|
||||
*/
|
||||
public void RegisterPart(
|
||||
ISkillTreeEntry part,
|
||||
int x,
|
||||
int y,
|
||||
SkillTrees tree,
|
||||
SkillPointTypes requiredPoint,
|
||||
public void RegisterPart(ISkillTreeEntry part, int x, int y, SkillTrees tree, SkillPointTypes requiredPoint,
|
||||
ISkillTreeEntry... prerequisites);
|
||||
}
|
||||
@@ -1,20 +1,23 @@
|
||||
package am2.api.spell;
|
||||
|
||||
import net.minecraft.util.IIcon;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.minecraft.util.IIcon;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public interface ISpellIconManager {
|
||||
|
||||
/**
|
||||
* Returns the IIcon registered to the specified spell name. Returns the missing IIcon if one doesn't exist.
|
||||
* Returns the IIcon registered to the specified spell name. Returns the missing IIcon if one doesn't exist.
|
||||
*/
|
||||
public IIcon getIcon(String spellName);
|
||||
|
||||
/**
|
||||
* Registers an IIcon to be associated with a spell component
|
||||
* @param spellName The unlocalized name of the spell used when it was registered
|
||||
* @param IIcon The IIcon of the spell
|
||||
*
|
||||
* @param spellName The unlocalized name of the spell used when it was registered
|
||||
* @param IIcon The IIcon of the spell
|
||||
*/
|
||||
public void registerIcon(String spellName, IIcon IIcon);
|
||||
}
|
||||
@@ -3,6 +3,7 @@ package am2.api.spell;
|
||||
import am2.api.spell.component.interfaces.ISpellModifier;
|
||||
|
||||
public interface ISpellModifierManager {
|
||||
|
||||
public int registerSpellModifier(ISpellModifier modifier, String modifierName);
|
||||
|
||||
public ISpellModifier getSpellModifier(int modifierID);
|
||||
|
||||
@@ -3,17 +3,20 @@ package am2.api.spell;
|
||||
import am2.api.spell.component.interfaces.ISkillTreeEntry;
|
||||
|
||||
public interface ISpellPartManager {
|
||||
|
||||
/**
|
||||
* Registers the skill tree entry into the skill manager.
|
||||
* @param component The skill tree entry to register
|
||||
* @param name The unlocalized name you want to register it to. Local translations are am2.spell.unlocalized_name, so register this into the language registry for localization.
|
||||
*
|
||||
* @param component The skill tree entry to register
|
||||
* @param name The unlocalized name you want to register it to. Local translations are
|
||||
* am2.spell.unlocalized_name, so register this into the language registry for localization.
|
||||
* @return The shifted numeric ID that is used, this should be stored somewhere
|
||||
*/
|
||||
public int registerSkillTreeEntry(ISkillTreeEntry component, String name);
|
||||
|
||||
/**
|
||||
*
|
||||
* @param ID The shifted ID of the skill.
|
||||
* @param ID The shifted ID of the skill.
|
||||
* @return The skill tree entry or null if not found.
|
||||
*/
|
||||
public ISkillTreeEntry getSkill(int ID);
|
||||
|
||||
@@ -3,6 +3,7 @@ package am2.api.spell;
|
||||
import am2.api.spell.component.interfaces.ISpellShape;
|
||||
|
||||
public interface ISpellShapeManager {
|
||||
|
||||
public int registerSpellShape(ISpellShape shape, String shapeName);
|
||||
|
||||
public ISpellShape getSpellShape(int shapeID);
|
||||
|
||||
@@ -6,24 +6,28 @@ import net.minecraft.util.MovingObjectPosition;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
/**
|
||||
* This is just here for reference - you shouldn't have any need to inherit from this item. To add new parts to spells, inherit from ISpellShape, ISpellModifier, or ISpellComponent.
|
||||
* This is just here for reference - you shouldn't have any need to inherit from this item. To add new parts to spells,
|
||||
* inherit from ISpellShape, ISpellModifier, or ISpellComponent.
|
||||
*
|
||||
* @author Mithion
|
||||
*
|
||||
*/
|
||||
public abstract class ItemSpellBase extends Item {
|
||||
|
||||
public ItemSpellBase() {
|
||||
super();
|
||||
}
|
||||
|
||||
/**
|
||||
* Specific version of getMovingObjectPosition that takes into account the targeting types that I need
|
||||
* @param caster The caster of the spell
|
||||
* @param world The world the spell is being cast in
|
||||
* @param range The range to raycast
|
||||
*
|
||||
* @param caster The caster of the spell
|
||||
* @param world The world the spell is being cast in
|
||||
* @param range The range to raycast
|
||||
* @param targetEntities Stop at collision with entities
|
||||
* @param targetWater Stop at collision with any non-solid block
|
||||
* @param targetWater Stop at collision with any non-solid block
|
||||
* @return A MovingObjectPosition instance if a collision was found, null otherwise
|
||||
*/
|
||||
public abstract MovingObjectPosition getMovingObjectPosition(
|
||||
EntityLivingBase caster, World world, double range, boolean targetEntities, boolean targetWater);
|
||||
public abstract MovingObjectPosition getMovingObjectPosition(EntityLivingBase caster, World world, double range,
|
||||
boolean targetEntities, boolean targetWater);
|
||||
}
|
||||
@@ -1,18 +1,20 @@
|
||||
package am2.api.spell.component.interfaces;
|
||||
|
||||
import am2.api.blocks.MultiblockStructureDefinition;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import am2.api.blocks.MultiblockStructureDefinition;
|
||||
|
||||
public interface IRitualInteraction<T extends ISkillTreeEntry> {
|
||||
|
||||
/**
|
||||
* Gets a MultiblockStructureDefinition outlining the ritual blocks needed and where they should be relative to a given location.
|
||||
* This should be instantiated on mod load and cached somewhere, and NOT instantiated upon request.
|
||||
* Gets a MultiblockStructureDefinition outlining the ritual blocks needed and where they should be relative to a
|
||||
* given location. This should be instantiated on mod load and cached somewhere, and NOT instantiated upon request.
|
||||
*/
|
||||
public MultiblockStructureDefinition getRitualShape();
|
||||
|
||||
/**
|
||||
* Gets a list of items that need to be present in {@link #getReagentSearchRadius() getReagentSearchRadius()} for the ritual to match.
|
||||
* Items on the ground as well as items attached to Wizard's Chalk are included.
|
||||
* Gets a list of items that need to be present in {@link #getReagentSearchRadius() getReagentSearchRadius()} for
|
||||
* the ritual to match. Items on the ground as well as items attached to Wizard's Chalk are included.
|
||||
*/
|
||||
public ItemStack[] getReagents();
|
||||
|
||||
|
||||
@@ -1,8 +1,10 @@
|
||||
package am2.api.spell.component.interfaces;
|
||||
|
||||
public interface ISkillTreeEntry {
|
||||
|
||||
/**
|
||||
* Gets the ID of the skill. Must be unique among all other skills.
|
||||
* Gets the ID of the skill. Must be unique among all other skills.
|
||||
*
|
||||
* @return The ID of the part.
|
||||
*/
|
||||
public int getID();
|
||||
|
||||
@@ -1,44 +1,40 @@
|
||||
package am2.api.spell.component.interfaces;
|
||||
|
||||
import am2.api.spell.enums.Affinity;
|
||||
import java.util.EnumSet;
|
||||
import java.util.Random;
|
||||
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import am2.api.spell.enums.Affinity;
|
||||
|
||||
public interface ISpellComponent extends ISpellPart {
|
||||
|
||||
/**
|
||||
* Apply the effect to a single block
|
||||
* @param stack The item stack that contains the effect data
|
||||
* @param world The world the effect is in
|
||||
* @param blockx The x coordinate of the block
|
||||
* @param blocky The y coordinate of the block
|
||||
* @param blockz The z coordinate of the block
|
||||
*
|
||||
* @param stack The item stack that contains the effect data
|
||||
* @param world The world the effect is in
|
||||
* @param blockx The x coordinate of the block
|
||||
* @param blocky The y coordinate of the block
|
||||
* @param blockz The z coordinate of the block
|
||||
* @param blockFace The face of the block that was targeted
|
||||
* @param impactX The x coordinate of the impact
|
||||
* @param impactY The y coordinate of the impact
|
||||
* @param impactZ The z coordinate of the impact
|
||||
* @param caster The caster of the spell
|
||||
* @param impactX The x coordinate of the impact
|
||||
* @param impactY The y coordinate of the impact
|
||||
* @param impactZ The z coordinate of the impact
|
||||
* @param caster The caster of the spell
|
||||
* @return True if the effect was successfully applied to the block
|
||||
*/
|
||||
public boolean applyEffectBlock(
|
||||
ItemStack stack,
|
||||
World world,
|
||||
int blockx,
|
||||
int blocky,
|
||||
int blockz,
|
||||
int blockFace,
|
||||
double impactX,
|
||||
double impactY,
|
||||
double impactZ,
|
||||
EntityLivingBase caster);
|
||||
public boolean applyEffectBlock(ItemStack stack, World world, int blockx, int blocky, int blockz, int blockFace,
|
||||
double impactX, double impactY, double impactZ, EntityLivingBase caster);
|
||||
|
||||
/**
|
||||
* Apply the effect to a single entity
|
||||
* @param stack The stack representing the spell
|
||||
* @param world The world the spell was cast in
|
||||
*
|
||||
* @param stack The stack representing the spell
|
||||
* @param world The world the spell was cast in
|
||||
* @param caster The caster of the spell
|
||||
* @param target The current target of the spell
|
||||
* @return True if the effect was applied successfully to the entity
|
||||
@@ -56,24 +52,17 @@ public interface ISpellComponent extends ISpellPart {
|
||||
public float burnout(EntityLivingBase caster);
|
||||
|
||||
/**
|
||||
* Gets any reagents that must be present in the caster's inventory in order
|
||||
* to cast the spell.
|
||||
* Gets any reagents that must be present in the caster's inventory in order to cast the spell.
|
||||
*/
|
||||
public ItemStack[] reagents(EntityLivingBase caster);
|
||||
|
||||
/**
|
||||
* Spawn visual effects for the component
|
||||
* @param colorModifier The color from the color modifier. -1 if missing.
|
||||
*
|
||||
* @param colorModifier The color from the color modifier. -1 if missing.
|
||||
*/
|
||||
public void spawnParticles(
|
||||
World world,
|
||||
double x,
|
||||
double y,
|
||||
double z,
|
||||
EntityLivingBase caster,
|
||||
Entity target,
|
||||
Random rand,
|
||||
int colorModifier);
|
||||
public void spawnParticles(World world, double x, double y, double z, EntityLivingBase caster, Entity target,
|
||||
Random rand, int colorModifier);
|
||||
|
||||
/**
|
||||
* Gets the affinity of the spell
|
||||
@@ -81,8 +70,9 @@ public interface ISpellComponent extends ISpellPart {
|
||||
public EnumSet<Affinity> getAffinity();
|
||||
|
||||
/**
|
||||
* Gets the amount (before diminishing returns) that this component, when successfully applied,
|
||||
* shifts the caster's affinity
|
||||
* Gets the amount (before diminishing returns) that this component, when successfully applied, shifts the caster's
|
||||
* affinity
|
||||
*
|
||||
* @param affinity The affinity being shifted
|
||||
*/
|
||||
public float getAffinityShift(Affinity affinity);
|
||||
|
||||
@@ -1,25 +1,30 @@
|
||||
package am2.api.spell.component.interfaces;
|
||||
|
||||
import am2.api.spell.enums.SpellModifiers;
|
||||
import java.util.EnumSet;
|
||||
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import am2.api.spell.enums.SpellModifiers;
|
||||
|
||||
public interface ISpellModifier extends ISpellPart {
|
||||
|
||||
/**
|
||||
* Returns a list of the aspects of a spell that this modifier can change.
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
public EnumSet<SpellModifiers> getAspectsModified();
|
||||
|
||||
/**
|
||||
* Returns the modified value for the specified type.
|
||||
* @param type The type of value we are modifying
|
||||
* @param caster The caster
|
||||
* @param target The target (can be the same as the caster)
|
||||
* @param world The world in which the spell is being cast.
|
||||
*
|
||||
* @param type The type of value we are modifying
|
||||
* @param caster The caster
|
||||
* @param target The target (can be the same as the caster)
|
||||
* @param world The world in which the spell is being cast.
|
||||
* @param metadata Any metadata written to the spell for this modifier (obtained from getModifierMetadata)
|
||||
* @return A factor to multiply the default value by (or add, depending on the component's programming)
|
||||
*/
|
||||
@@ -27,16 +32,21 @@ public interface ISpellModifier extends ISpellPart {
|
||||
|
||||
/**
|
||||
* Gets the amount that adding this modifier to the spell alters the mana cost.
|
||||
*
|
||||
* @param spellStack The itemstack comprising the spell (in case you want to base it on other modifiers added)
|
||||
* @param stage The stage in which this modifier has been added (if the modifier is added to multiple stages, this will be called multiple times, once per stage)
|
||||
* @param quantity The quantity of this multiplier in the specified stage.
|
||||
* @param stage The stage in which this modifier has been added (if the modifier is added to multiple stages,
|
||||
* this will be called multiple times, once per stage)
|
||||
* @param quantity The quantity of this multiplier in the specified stage.
|
||||
*/
|
||||
public float getManaCostMultiplier(ItemStack spellStack, int stage, int quantity);
|
||||
|
||||
/**
|
||||
* Gets any metadata needed by this modifier for the current spell. Used, for example, in the color modifier to determine what color was specified.
|
||||
* @param stage The stage this modifier is at
|
||||
* @param matchedRecipe The items that were added to the crafting altar which resulted in the matching of the recipe.
|
||||
* Gets any metadata needed by this modifier for the current spell. Used, for example, in the color modifier to
|
||||
* determine what color was specified.
|
||||
*
|
||||
* @param stage The stage this modifier is at
|
||||
* @param matchedRecipe The items that were added to the crafting altar which resulted in the matching of the
|
||||
* recipe.
|
||||
*/
|
||||
public byte[] getModifierMetadata(int stage, ItemStack[] matchedRecipe);
|
||||
}
|
||||
@@ -1,28 +1,30 @@
|
||||
package am2.api.spell.component.interfaces;
|
||||
|
||||
/**
|
||||
* Identifies that this object is either a spell component, a spell modifier, or a spell shape.
|
||||
* Do not inherit this directly unless you are adding talents and such, rather inherit ISpellComponent, ISpellModifier, or ISpellShape for spell parts.
|
||||
* Identifies that this object is either a spell component, a spell modifier, or a spell shape. Do not inherit this
|
||||
* directly unless you are adding talents and such, rather inherit ISpellComponent, ISpellModifier, or ISpellShape for
|
||||
* spell parts.
|
||||
*
|
||||
* @author Mithion
|
||||
*
|
||||
*/
|
||||
public interface ISpellPart extends ISkillTreeEntry {
|
||||
|
||||
/**
|
||||
* recipe items, in order, that need to be thrown into the crafting altar in order to create the item.
|
||||
* <br/>
|
||||
* Use Items for items, Blocks for blocks, Strings for OreDictionary items, and E:[type flag] followed by an integer for essence amounts.
|
||||
* <br/>
|
||||
* Use itemstacks for items/blocks/oredict when meta is required. By default it is meta 0. Quantity (stack size) is ignored.
|
||||
* <br/>
|
||||
* Integer pairs represent the type (*=any, 1=neutral, 2=light, 4=dark, etc.), and the quantity of essence required. The type can be used as flags,
|
||||
* <br/>
|
||||
* recipe items, in order, that need to be thrown into the crafting altar in order to create the item. <br/>
|
||||
* Use Items for items, Blocks for blocks, Strings for OreDictionary items, and E:[type flag] followed by an integer
|
||||
* for essence amounts. <br/>
|
||||
* Use itemstacks for items/blocks/oredict when meta is required. By default it is meta 0. Quantity (stack size) is
|
||||
* ignored. <br/>
|
||||
* Integer pairs represent the type (*=any, 1=neutral, 2=light, 4=dark, etc.), and the quantity of essence required.
|
||||
* The type can be used as flags, <br/>
|
||||
* For example:
|
||||
*
|
||||
* <pre>
|
||||
* new Object[]{ "E:1|2", 1500 } //require 1500 of neutral or 1500 of light power.
|
||||
* new Object[]{ "E:*", 1500 } //require 1500 of any kind of power
|
||||
* etc.
|
||||
*</pre>
|
||||
* </pre>
|
||||
*/
|
||||
public Object[] getRecipeItems();
|
||||
}
|
||||
@@ -1,40 +1,35 @@
|
||||
package am2.api.spell.component.interfaces;
|
||||
|
||||
import am2.api.spell.ItemSpellBase;
|
||||
import am2.api.spell.enums.Affinity;
|
||||
import am2.api.spell.enums.SpellCastResult;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import am2.api.spell.ItemSpellBase;
|
||||
import am2.api.spell.enums.Affinity;
|
||||
import am2.api.spell.enums.SpellCastResult;
|
||||
|
||||
public interface ISpellShape extends ISpellPart {
|
||||
|
||||
/**
|
||||
* Creates the target area/entity list and applies the effects to ground/mobs
|
||||
* @param item The spell being cast
|
||||
* @param stack The itemstack representing the spell
|
||||
* @param caster The caster of the spell
|
||||
* @param target The specified target of the spell. If this is not NULL, this is a forced target, and should be included with any other targets of the shape. Otherwise the default spell shape logic should apply.
|
||||
* @param world The world the spell is being cast in
|
||||
* @param x The x-coordinate of the spell's effect
|
||||
* @param y The y-coordinate of the spell's effect
|
||||
* @param z The z-coordinate of the spell's effect
|
||||
* @param side The side the spell is applied on
|
||||
* @param giveXP This is passed along to be given back to the SpellHelper where needed.
|
||||
*
|
||||
* @param item The spell being cast
|
||||
* @param stack The itemstack representing the spell
|
||||
* @param caster The caster of the spell
|
||||
* @param target The specified target of the spell. If this is not NULL, this is a forced target, and should be
|
||||
* included with any other targets of the shape. Otherwise the default spell shape logic should
|
||||
* apply.
|
||||
* @param world The world the spell is being cast in
|
||||
* @param x The x-coordinate of the spell's effect
|
||||
* @param y The y-coordinate of the spell's effect
|
||||
* @param z The z-coordinate of the spell's effect
|
||||
* @param side The side the spell is applied on
|
||||
* @param giveXP This is passed along to be given back to the SpellHelper where needed.
|
||||
* @param useCount The number of ticks the spell item has been in use for
|
||||
* @return The result of the spell cast.
|
||||
*/
|
||||
public SpellCastResult beginStackStage(
|
||||
ItemSpellBase item,
|
||||
ItemStack stack,
|
||||
EntityLivingBase caster,
|
||||
EntityLivingBase target,
|
||||
World world,
|
||||
double x,
|
||||
double y,
|
||||
double z,
|
||||
int side,
|
||||
boolean giveXP,
|
||||
int useCount);
|
||||
public SpellCastResult beginStackStage(ItemSpellBase item, ItemStack stack, EntityLivingBase caster,
|
||||
EntityLivingBase target, World world, double x, double y, double z, int side, boolean giveXP, int useCount);
|
||||
|
||||
/**
|
||||
* Is this shape a valid shape for a channeled/maintained spell?
|
||||
@@ -43,18 +38,20 @@ public interface ISpellShape extends ISpellPart {
|
||||
|
||||
/**
|
||||
* Allows different shapes to vary the mana cost of a spell
|
||||
* @param spellStack the itemstack representing the spell (useful if you want to vary based on added modifiers as well, for example)
|
||||
*
|
||||
* @param spellStack the itemstack representing the spell (useful if you want to vary based on added modifiers as
|
||||
* well, for example)
|
||||
* @return
|
||||
*/
|
||||
public float manaCostMultiplier(ItemStack spellStack);
|
||||
|
||||
/**
|
||||
* Is the spell a terminus shape? Return true if this component does not continue the spell chain when proccing.
|
||||
* Is the spell a terminus shape? Return true if this component does not continue the spell chain when proccing.
|
||||
*/
|
||||
public boolean isTerminusShape();
|
||||
|
||||
/**
|
||||
* Is the shape a principal shape? Return true if this spell requires another shape to proc (like runes and zones)
|
||||
* Is the shape a principal shape? Return true if this spell requires another shape to proc (like runes and zones)
|
||||
*/
|
||||
public boolean isPrincipumShape();
|
||||
|
||||
|
||||
@@ -3,93 +3,61 @@ package am2.api.spell.enums;
|
||||
import net.minecraft.item.Item;
|
||||
|
||||
public enum Affinity {
|
||||
NONE(
|
||||
0,
|
||||
0xFFFFFF,
|
||||
-1, // no direct opposite
|
||||
|
||||
NONE(0, 0xFFFFFF, -1, // no direct opposite
|
||||
new int[] {}, // no major opposites
|
||||
new int[] {}, // no minor opposites
|
||||
new int[] {}),
|
||||
|
||||
ARCANE(
|
||||
1,
|
||||
0xb935cd,
|
||||
9, // nature is direct opposite
|
||||
new int[] {9, 4, 2, 7}, // Major Opposites: life, earth, water, ice
|
||||
new int[] {5, 10}, // Minor Opposites: Air, Ender
|
||||
new int[] {6, 3}), // Adjacent Affinities: Lightning, Fire
|
||||
ARCANE(1, 0xb935cd, 9, // nature is direct opposite
|
||||
new int[] { 9, 4, 2, 7 }, // Major Opposites: life, earth, water, ice
|
||||
new int[] { 5, 10 }, // Minor Opposites: Air, Ender
|
||||
new int[] { 6, 3 }), // Adjacent Affinities: Lightning, Fire
|
||||
|
||||
WATER(
|
||||
2,
|
||||
0x0b5cef,
|
||||
3, // fire is direct opposite
|
||||
new int[] {7, 4, 1, 10}, // Major Opposites: lightning, earth, arcane, ender
|
||||
new int[] {5, 7}, // Minor Opposites: Air, Ice
|
||||
new int[] {9, 8}), // Adjacent Affinities: Life, Nature
|
||||
WATER(2, 0x0b5cef, 3, // fire is direct opposite
|
||||
new int[] { 7, 4, 1, 10 }, // Major Opposites: lightning, earth, arcane, ender
|
||||
new int[] { 5, 7 }, // Minor Opposites: Air, Ice
|
||||
new int[] { 9, 8 }), // Adjacent Affinities: Life, Nature
|
||||
|
||||
FIRE(
|
||||
3,
|
||||
0xef260b,
|
||||
2, // water is direct opposite
|
||||
new int[] {5, 7, 8, 9}, // Major Opposites: air, ice, nature, life
|
||||
new int[] {4, 6}, // Minor Opposites: Earth, Lightning
|
||||
new int[] {10, 1}), // Adjacent Affinities: Ender, Arcane
|
||||
FIRE(3, 0xef260b, 2, // water is direct opposite
|
||||
new int[] { 5, 7, 8, 9 }, // Major Opposites: air, ice, nature, life
|
||||
new int[] { 4, 6 }, // Minor Opposites: Earth, Lightning
|
||||
new int[] { 10, 1 }), // Adjacent Affinities: Ender, Arcane
|
||||
|
||||
EARTH(
|
||||
4,
|
||||
0x61330b,
|
||||
5, // air is direct opposite
|
||||
new int[] {2, 1, 9, 6}, // Major Opposites: water, arcane, life, lightning
|
||||
new int[] {8, 3}, // Minor Opposites: Nature, Fire
|
||||
new int[] {7, 10}), // Adjacent Affinities: Ice, Ender
|
||||
EARTH(4, 0x61330b, 5, // air is direct opposite
|
||||
new int[] { 2, 1, 9, 6 }, // Major Opposites: water, arcane, life, lightning
|
||||
new int[] { 8, 3 }, // Minor Opposites: Nature, Fire
|
||||
new int[] { 7, 10 }), // Adjacent Affinities: Ice, Ender
|
||||
|
||||
AIR(
|
||||
5,
|
||||
0x777777,
|
||||
4, // earth is direct opposite
|
||||
new int[] {8, 3, 7, 10}, // Major Opposites: nature, fire, ice, ender
|
||||
new int[] {2, 1}, // Minor Opposites: Water, Arcane
|
||||
new int[] {9, 6}), // Adjacent Affinities: Life, Lightning
|
||||
AIR(5, 0x777777, 4, // earth is direct opposite
|
||||
new int[] { 8, 3, 7, 10 }, // Major Opposites: nature, fire, ice, ender
|
||||
new int[] { 2, 1 }, // Minor Opposites: Water, Arcane
|
||||
new int[] { 9, 6 }), // Adjacent Affinities: Life, Lightning
|
||||
|
||||
LIGHTNING(
|
||||
6,
|
||||
0xdece19,
|
||||
7, // ice is direct opposite
|
||||
new int[] {2, 10, 8, 4}, // Major Opposites: water, ender, nature, earth
|
||||
new int[] {9, 3}, // Minor Opposites: Life, Fire
|
||||
new int[] {5, 1}), // Adjacent Affinities: Air, Arcane
|
||||
LIGHTNING(6, 0xdece19, 7, // ice is direct opposite
|
||||
new int[] { 2, 10, 8, 4 }, // Major Opposites: water, ender, nature, earth
|
||||
new int[] { 9, 3 }, // Minor Opposites: Life, Fire
|
||||
new int[] { 5, 1 }), // Adjacent Affinities: Air, Arcane
|
||||
|
||||
ICE(
|
||||
7,
|
||||
0xd3e8fc,
|
||||
6, // lightning is direct opposite
|
||||
new int[] {9, 3, 5, 1}, // Major Opposites: life, fire, air, arcane
|
||||
new int[] {2, 10}, // Minor Opposites: Water, Ender
|
||||
new int[] {8, 4}), // Adjacent Affinities: Nature, Earth
|
||||
ICE(7, 0xd3e8fc, 6, // lightning is direct opposite
|
||||
new int[] { 9, 3, 5, 1 }, // Major Opposites: life, fire, air, arcane
|
||||
new int[] { 2, 10 }, // Minor Opposites: Water, Ender
|
||||
new int[] { 8, 4 }), // Adjacent Affinities: Nature, Earth
|
||||
|
||||
NATURE(
|
||||
8,
|
||||
0x228718,
|
||||
6, // arcane is direct opposite
|
||||
new int[] {5, 10, 6, 3}, // Major Opposites: air, ender, lightning, fire
|
||||
new int[] {9, 4}, // Minor Opposites: Life, Earth
|
||||
new int[] {2, 7}), // Adjacent Affinities: Water, Ice
|
||||
NATURE(8, 0x228718, 6, // arcane is direct opposite
|
||||
new int[] { 5, 10, 6, 3 }, // Major Opposites: air, ender, lightning, fire
|
||||
new int[] { 9, 4 }, // Minor Opposites: Life, Earth
|
||||
new int[] { 2, 7 }), // Adjacent Affinities: Water, Ice
|
||||
|
||||
LIFE(
|
||||
9,
|
||||
0x34e122,
|
||||
10, // ender is direct opposite
|
||||
new int[] {1, 7, 3, 4}, // Major Opposites: arcane, ice, fire, earth
|
||||
new int[] {8, 6}, // Minor Opposites: Nature, Lightning
|
||||
new int[] {2, 5}), // Adjacent Affinities: Water, Air
|
||||
LIFE(9, 0x34e122, 10, // ender is direct opposite
|
||||
new int[] { 1, 7, 3, 4 }, // Major Opposites: arcane, ice, fire, earth
|
||||
new int[] { 8, 6 }, // Minor Opposites: Nature, Lightning
|
||||
new int[] { 2, 5 }), // Adjacent Affinities: Water, Air
|
||||
|
||||
ENDER(
|
||||
10,
|
||||
0x3f043d,
|
||||
9, // life is direct opposite
|
||||
new int[] {8, 6, 2, 5}, // Major Opposites: nature, lightning, water, air
|
||||
new int[] {1, 7}, // Minor Opposites: Arcane, Ice
|
||||
new int[] {4, 3}); // Adjacent Affinities: Earth, Fire
|
||||
ENDER(10, 0x3f043d, 9, // life is direct opposite
|
||||
new int[] { 8, 6, 2, 5 }, // Major Opposites: nature, lightning, water, air
|
||||
new int[] { 1, 7 }, // Minor Opposites: Arcane, Ice
|
||||
new int[] { 4, 3 }); // Adjacent Affinities: Earth, Fire
|
||||
|
||||
public int ID;
|
||||
private int directOpposingAffinity;
|
||||
@@ -100,12 +68,7 @@ public enum Affinity {
|
||||
public int representMeta;
|
||||
public final int color;
|
||||
|
||||
private Affinity(
|
||||
int ID,
|
||||
int color,
|
||||
int directOppositeAffinity,
|
||||
int[] majorOppositions,
|
||||
int[] minorOppositions,
|
||||
private Affinity(int ID, int color, int directOppositeAffinity, int[] majorOppositions, int[] minorOppositions,
|
||||
int[] adjacentAffinities) {
|
||||
this.ID = ID;
|
||||
this.directOpposingAffinity = directOppositeAffinity;
|
||||
@@ -164,7 +127,7 @@ public enum Affinity {
|
||||
}
|
||||
|
||||
public static Affinity[] getOrderedAffinities() {
|
||||
return new Affinity[] {AIR, LIGHTNING, ARCANE, FIRE, ENDER, EARTH, ICE, NATURE, WATER, LIFE};
|
||||
return new Affinity[] { AIR, LIGHTNING, ARCANE, FIRE, ENDER, EARTH, ICE, NATURE, WATER, LIFE };
|
||||
}
|
||||
|
||||
public int getAffinityMask() {
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package am2.api.spell.enums;
|
||||
|
||||
public class BuffPowerLevel {
|
||||
|
||||
public static final int Low = 0;
|
||||
public static final int Medium = 1;
|
||||
public static final int High = 2;
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package am2.api.spell.enums;
|
||||
|
||||
public enum SpellModifiers {
|
||||
|
||||
SPEED(1.0D),
|
||||
GRAVITY(0),
|
||||
BOUNCE(0),
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
Loaded 100 of 138 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user