Way being picky.

This commit is contained in:
Fenn 2014-01-17 21:43:13 +00:00
parent e3644f2d2b
commit 7e30b02d69
303 changed files with 622 additions and 311 deletions

View file

@ -9,7 +9,8 @@ import net.minecraft.item.ItemStack;
import java.util.List;
public class AWBaseItems extends Item {
public class AWBaseItems extends Item
{
public AWBaseItems(int id)
{
super(id);

View file

@ -16,7 +16,8 @@ import org.lwjgl.input.Keyboard;
import java.util.List;
public class ActivationCrystal extends EnergyItems {
public class ActivationCrystal extends EnergyItems
{
private static final String[] ACTIVATION_CRYSTAL_NAMES = new String[]{"Weak", "Awakened"};
@SideOnly(Side.CLIENT)

View file

@ -6,7 +6,8 @@ import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.item.Item;
public class AirInk extends Item {
public class AirInk extends Item
{
public AirInk(int id)
{
super(id);

View file

@ -4,7 +4,8 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IconRegister;
public class AirScribeTool extends ScribeTool {
public class AirScribeTool extends ScribeTool
{
public AirScribeTool(int id)
{
super(id, 4);

View file

@ -4,7 +4,8 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IconRegister;
public class ApprenticeBloodOrb extends EnergyBattery {
public class ApprenticeBloodOrb extends EnergyBattery
{
public ApprenticeBloodOrb(int id, int damage)
{
super(id, damage);

View file

@ -4,7 +4,8 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IconRegister;
public class ArchmageBloodOrb extends EnergyBattery {
public class ArchmageBloodOrb extends EnergyBattery
{
public ArchmageBloodOrb(int id, int damage)
{
super(id, damage);

View file

@ -14,7 +14,8 @@ import net.minecraft.world.World;
import java.util.List;
public class ArmourInhibitor extends EnergyItems {
public class ArmourInhibitor extends EnergyItems
{
private static Icon activeIcon;
private static Icon passiveIcon;
private int tickDelay = 200;

View file

@ -14,7 +14,8 @@ import net.minecraftforge.common.DimensionManager;
import java.util.List;
public class BlankSpell extends EnergyItems {
public class BlankSpell extends EnergyItems
{
public BlankSpell(int par1)
{
super(par1);

View file

@ -11,7 +11,8 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
public class BloodShard extends Item implements ArmourUpgrade {
public class BloodShard extends Item implements ArmourUpgrade
{
public BloodShard(int par1)
{
super(par1);

View file

@ -13,7 +13,8 @@ import net.minecraft.nbt.NBTTagCompound;
import java.util.List;
public class BloodboundSword extends EnergyItems {
public class BloodboundSword extends EnergyItems
{
private float weaponDamage;
//private int maxMode = 3;
private NBTTagCompound data;

View file

@ -25,7 +25,8 @@ import thaumcraft.api.nodes.IRevealer;
import java.util.List;
public class BoundArmour extends ItemArmor implements ISpecialArmor, IRevealer, IGoggles, IBindable {
public class BoundArmour extends ItemArmor implements ISpecialArmor, IRevealer, IGoggles, IBindable
{
private static int invSize = 9;
private static Icon helmetIcon;
private static Icon plateIcon;

View file

@ -23,7 +23,8 @@ import net.minecraftforge.common.ForgeHooks;
import java.util.ArrayList;
import java.util.List;
public class BoundAxe extends ItemAxe implements IBindable {
public class BoundAxe extends ItemAxe implements IBindable
{
/**
* Array of blocks the tool has extra effect against.
*/

View file

@ -23,7 +23,8 @@ import net.minecraftforge.common.ForgeHooks;
import java.util.ArrayList;
import java.util.List;
public class BoundPickaxe extends ItemPickaxe implements IBindable {
public class BoundPickaxe extends ItemPickaxe implements IBindable
{
/**
* Array of blocks the tool has extra effect against.
*/

View file

@ -25,7 +25,8 @@ import net.minecraftforge.common.ForgeHooks;
import java.util.ArrayList;
import java.util.List;
public class BoundShovel extends ItemSpade implements IBindable {
public class BoundShovel extends ItemSpade implements IBindable
{
/**
* Array of blocks the tool has extra effect against.
*/

View file

@ -20,7 +20,8 @@ import net.minecraftforge.common.FakePlayer;
import java.util.List;
public class CheatyItem extends Item implements IBindable {
public class CheatyItem extends Item implements IBindable
{
// private int maxEssence;
//protected int orbLevel;

View file

@ -28,7 +28,8 @@ import net.minecraft.world.World;
import java.util.List;
public class DaggerOfSacrifice extends EnergyItems {
public class DaggerOfSacrifice extends EnergyItems
{
private float weaponDamage;
public DaggerOfSacrifice(int id)

View file

@ -18,7 +18,8 @@ import net.minecraft.world.World;
import java.util.List;
public class DemonPlacer extends Item {
public class DemonPlacer extends Item
{
@SideOnly(Side.CLIENT)
private Icon theIcon;

View file

@ -9,7 +9,8 @@ import net.minecraft.nbt.NBTTagCompound;
import java.util.List;
public class DemonicTelepositionFocus extends TelepositionFocus {
public class DemonicTelepositionFocus extends TelepositionFocus
{
public DemonicTelepositionFocus(int par1)
{
super(par1, 4);

View file

@ -4,7 +4,8 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IconRegister;
public class DuskScribeTool extends ScribeTool {
public class DuskScribeTool extends ScribeTool
{
public DuskScribeTool(int id)
{
super(id, 5);

View file

@ -6,7 +6,8 @@ import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.item.Item;
public class EarthInk extends Item {
public class EarthInk extends Item
{
public EarthInk(int id)
{
super(id);

View file

@ -4,7 +4,8 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IconRegister;
public class EarthScribeTool extends ScribeTool {
public class EarthScribeTool extends ScribeTool
{
public EarthScribeTool(int id)
{
super(id, 3);

View file

@ -18,7 +18,8 @@ import net.minecraftforge.common.FakePlayer;
import java.util.List;
public class EnergyBattery extends Item implements ArmourUpgrade, IBindable {
public class EnergyBattery extends Item implements ArmourUpgrade, IBindable
{
private int maxEssence;
protected int orbLevel;

View file

@ -15,7 +15,8 @@ import net.minecraft.world.World;
import java.util.List;
public class EnergyBazooka extends EnergyItems {
public class EnergyBazooka extends EnergyItems
{
private static Icon activeIcon;
private static Icon passiveIcon;
private static int damage;

View file

@ -14,7 +14,8 @@ import net.minecraft.world.World;
import java.util.List;
public class EnergyBlast extends EnergyItems {
public class EnergyBlast extends EnergyItems
{
private static Icon activeIcon;
private static Icon passiveIcon;
private static int damage;

View file

@ -14,7 +14,8 @@ import net.minecraft.server.MinecraftServer;
import net.minecraft.util.DamageSource;
import net.minecraft.world.World;
public class EnergyItems extends Item implements IBindable {
public class EnergyItems extends Item implements IBindable
{
private int energyUsed;
public EnergyItems(int id)

View file

@ -19,7 +19,8 @@ import net.minecraft.world.World;
import java.util.List;
public class EnergySword extends ItemSword {
public class EnergySword extends ItemSword
{
//private float weaponDamaged;
//private int maxMode = 3;
private NBTTagCompound data;

View file

@ -6,7 +6,8 @@ import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.item.Item;
public class FireInk extends Item {
public class FireInk extends Item
{
public FireInk(int id)
{
super(id);

View file

@ -4,7 +4,8 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IconRegister;
public class FireScribeTool extends ScribeTool {
public class FireScribeTool extends ScribeTool
{
public FireScribeTool(int id)
{
super(id, 2);

View file

@ -20,7 +20,8 @@ import net.minecraftforge.common.FakePlayer;
import java.util.List;
public class ItemDiabloKey extends EnergyItems {
public class ItemDiabloKey extends EnergyItems
{
public ItemDiabloKey(int id)
{
super(id);

View file

@ -20,7 +20,8 @@ import net.minecraft.world.World;
import java.util.List;
public class ItemRitualDiviner extends EnergyItems {
public class ItemRitualDiviner extends EnergyItems
{
private int maxMetaData;
public ItemRitualDiviner(int id)

View file

@ -19,7 +19,8 @@ import thaumcraft.api.nodes.IRevealer;
import java.util.List;
public class ItemSanguineArmour extends ItemArmor implements IRevealer, ArmourUpgrade, IGoggles, IVisDiscounter {
public class ItemSanguineArmour extends ItemArmor implements IRevealer, ArmourUpgrade, IGoggles, IVisDiscounter
{
private static Icon helmetIcon;
public ItemSanguineArmour(int par1)

View file

@ -12,7 +12,8 @@ import net.minecraft.world.World;
import java.util.List;
public class LavaCrystal extends EnergyItems {
public class LavaCrystal extends EnergyItems
{
public LavaCrystal(int id)
{
super(id);

View file

@ -5,7 +5,8 @@ import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.item.ItemBucket;
public class LifeBucket extends ItemBucket {
public class LifeBucket extends ItemBucket
{
public LifeBucket(int par1, int par2)
{
super(par1, par2);

View file

@ -4,7 +4,8 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IconRegister;
public class MagicianBloodOrb extends EnergyBattery {
public class MagicianBloodOrb extends EnergyBattery
{
public MagicianBloodOrb(int id, int damage)
{
super(id, damage);

View file

@ -4,7 +4,8 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IconRegister;
public class MasterBloodOrb extends EnergyBattery {
public class MasterBloodOrb extends EnergyBattery
{
public MasterBloodOrb(int id, int damage)
{
super(id, damage);

View file

@ -8,7 +8,8 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
public class OrbOfTesting extends EnergyItems {
public class OrbOfTesting extends EnergyItems
{
public OrbOfTesting(int id)
{
super(id);

View file

@ -9,7 +9,8 @@ import net.minecraft.nbt.NBTTagCompound;
import java.util.List;
public class ReinforcedTelepositionFocus extends TelepositionFocus {
public class ReinforcedTelepositionFocus extends TelepositionFocus
{
public ReinforcedTelepositionFocus(int par1)
{
super(par1, 3);

View file

@ -16,7 +16,8 @@ import net.minecraftforge.common.FakePlayer;
import java.util.List;
public class SacrificialDagger extends Item {
public class SacrificialDagger extends Item
{
public SacrificialDagger(int id)
{
super(id);

View file

@ -7,7 +7,8 @@ import net.minecraft.world.World;
import java.util.List;
public class ScribeTool extends EnergyItems {
public class ScribeTool extends EnergyItems
{
private int meta;
public ScribeTool(int id, int inkType)

View file

@ -12,7 +12,8 @@ import net.minecraftforge.common.DimensionManager;
import java.util.List;
public class TelepositionFocus extends EnergyItems {
public class TelepositionFocus extends EnergyItems
{
private int focusLevel;
public TelepositionFocus(int par1, int focusLevel)

View file

@ -6,7 +6,8 @@ import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.item.Item;
public class WaterInk extends Item {
public class WaterInk extends Item
{
public WaterInk(int id)
{
super(id);

View file

@ -5,7 +5,8 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IconRegister;
public class WaterScribeTool extends ScribeTool {
public class WaterScribeTool extends ScribeTool
{
public WaterScribeTool(int id)
{
super(id, 1);

View file

@ -28,7 +28,8 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
public class AlchemyFlask extends Item {
public class AlchemyFlask extends Item
{
private int maxPotionAmount = 20;
public AlchemyFlask(int id)

View file

@ -14,7 +14,8 @@ import org.lwjgl.input.Keyboard;
import java.util.List;
public class AlchemyReagent extends Item {
public class AlchemyReagent extends Item
{
public AlchemyReagent(int id)
{
super(id);

View file

@ -4,7 +4,8 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IconRegister;
public class AverageLengtheningCatalyst extends LengtheningCatalyst {
public class AverageLengtheningCatalyst extends LengtheningCatalyst
{
public AverageLengtheningCatalyst(int id)
{
super(id, 2);

View file

@ -4,7 +4,8 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IconRegister;
public class AveragePowerCatalyst extends PowerCatalyst {
public class AveragePowerCatalyst extends PowerCatalyst
{
public AveragePowerCatalyst(int id)
{
super(id, 2);

View file

@ -7,7 +7,8 @@ import net.minecraft.client.renderer.texture.IconRegister;
import java.util.Random;
public class EnhancedFillingAgent extends WeakFillingAgent {
public class EnhancedFillingAgent extends WeakFillingAgent
{
public EnhancedFillingAgent(int par1)
{
super(par1);

View file

@ -10,7 +10,8 @@ import net.minecraft.nbt.NBTTagCompound;
import java.util.List;
public class EnhancedTelepositionFocus extends TelepositionFocus {
public class EnhancedTelepositionFocus extends TelepositionFocus
{
public EnhancedTelepositionFocus(int par1)
{
super(par1, 2);

View file

@ -4,7 +4,8 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IconRegister;
public class GreaterLengtheningCatalyst extends LengtheningCatalyst {
public class GreaterLengtheningCatalyst extends LengtheningCatalyst
{
public GreaterLengtheningCatalyst(int id)
{
super(id, 3);

View file

@ -4,7 +4,8 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IconRegister;
public class GreaterPowerCatalyst extends PowerCatalyst {
public class GreaterPowerCatalyst extends PowerCatalyst
{
public GreaterPowerCatalyst(int id)
{
super(id, 3);

View file

@ -11,7 +11,8 @@ import org.lwjgl.input.Keyboard;
import java.util.List;
public class LengtheningCatalyst extends Item implements ICatalyst {
public class LengtheningCatalyst extends Item implements ICatalyst
{
private int catalystStrength;
public LengtheningCatalyst(int id, int catalystStrength)

View file

@ -4,7 +4,8 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IconRegister;
public class MundaneLengtheningCatalyst extends LengtheningCatalyst {
public class MundaneLengtheningCatalyst extends LengtheningCatalyst
{
public MundaneLengtheningCatalyst(int id)
{
super(id, 1);

View file

@ -4,7 +4,8 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IconRegister;
public class MundanePowerCatalyst extends PowerCatalyst {
public class MundanePowerCatalyst extends PowerCatalyst
{
public MundanePowerCatalyst(int id)
{
super(id, 1);

View file

@ -11,7 +11,8 @@ import org.lwjgl.input.Keyboard;
import java.util.List;
public class PowerCatalyst extends Item implements ICatalyst {
public class PowerCatalyst extends Item implements ICatalyst
{
private int catalystStrength;
public PowerCatalyst(int id, int catalystStrength)

View file

@ -14,7 +14,8 @@ import org.lwjgl.input.Keyboard;
import java.util.List;
public class StandardBindingAgent extends Item implements IBindingAgent {
public class StandardBindingAgent extends Item implements IBindingAgent
{
public StandardBindingAgent(int id)
{
super(id);

View file

@ -5,7 +5,8 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IconRegister;
public class StandardFillingAgent extends WeakFillingAgent {
public class StandardFillingAgent extends WeakFillingAgent
{
public StandardFillingAgent(int par1)
{
super(par1);

View file

@ -4,7 +4,8 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IconRegister;
public class WeakBindingAgent extends StandardBindingAgent {
public class WeakBindingAgent extends StandardBindingAgent
{
public WeakBindingAgent(int id)
{
super(id);

View file

@ -15,7 +15,8 @@ import org.lwjgl.input.Keyboard;
import java.util.List;
import java.util.Random;
public class WeakFillingAgent extends Item implements IFillingAgent {
public class WeakFillingAgent extends Item implements IFillingAgent
{
public WeakFillingAgent(int par1)
{
super(par1);

View file

@ -13,7 +13,8 @@ import net.minecraft.world.World;
import java.util.List;
public class AirSigil extends EnergyItems implements ArmourUpgrade {
public class AirSigil extends EnergyItems implements ArmourUpgrade
{
private int energyUsed;
public AirSigil(int id)

View file

@ -18,7 +18,8 @@ import net.minecraft.world.World;
import java.util.List;
public class DivinationSigil extends Item implements ArmourUpgrade {
public class DivinationSigil extends Item implements ArmourUpgrade
{
public DivinationSigil(int par1)
{
super(par1);

View file

@ -15,7 +15,8 @@ import net.minecraft.world.World;
import java.util.List;
public class ItemBloodLightSigil extends EnergyItems {
public class ItemBloodLightSigil extends EnergyItems
{
private int tickDelay = 100;
public ItemBloodLightSigil(int id)

View file

@ -20,7 +20,8 @@ import net.minecraft.world.World;
import java.util.List;
public class LavaSigil extends ItemBucket implements ArmourUpgrade {
public class LavaSigil extends ItemBucket implements ArmourUpgrade
{
/**
* field for checking if the bucket has been filled.
*/

View file

@ -16,7 +16,8 @@ import net.minecraft.world.World;
import java.util.List;
public class SigilOfElementalAffinity extends EnergyItems {
public class SigilOfElementalAffinity extends EnergyItems
{
@SideOnly(Side.CLIENT)
private static Icon activeIcon;
@SideOnly(Side.CLIENT)

View file

@ -21,7 +21,8 @@ import net.minecraftforge.event.entity.player.BonemealEvent;
import java.util.List;
public class SigilOfGrowth extends EnergyItems implements ArmourUpgrade {
public class SigilOfGrowth extends EnergyItems implements ArmourUpgrade
{
private static Icon activeIcon;
private static Icon passiveIcon;
private int tickDelay = 100;

View file

@ -16,7 +16,8 @@ import net.minecraft.world.World;
import java.util.List;
public class SigilOfHaste extends EnergyItems implements ArmourUpgrade {
public class SigilOfHaste extends EnergyItems implements ArmourUpgrade
{
@SideOnly(Side.CLIENT)
private static Icon activeIcon;
@SideOnly(Side.CLIENT)

View file

@ -17,7 +17,8 @@ import net.minecraft.world.World;
import java.util.ArrayList;
import java.util.List;
public class SigilOfHolding extends EnergyItems {
public class SigilOfHolding extends EnergyItems
{
private int invSize = 4;
public static List<Integer> allowedSigils = new ArrayList();

View file

@ -17,7 +17,8 @@ import net.minecraft.world.World;
import java.util.List;
public class SigilOfMagnetism extends EnergyItems implements ArmourUpgrade {
public class SigilOfMagnetism extends EnergyItems implements ArmourUpgrade
{
private static Icon activeIcon;
private static Icon passiveIcon;
private int tickDelay = 300;

View file

@ -17,7 +17,8 @@ import net.minecraft.world.World;
import java.util.List;
public class SigilOfTheBridge extends EnergyItems implements ArmourUpgrade {
public class SigilOfTheBridge extends EnergyItems implements ArmourUpgrade
{
private static Icon activeIcon;
private static Icon passiveIcon;
private int tickDelay = 200;

View file

@ -17,7 +17,8 @@ import net.minecraft.world.World;
import java.util.List;
public class SigilOfTheFastMiner extends EnergyItems implements ArmourUpgrade {
public class SigilOfTheFastMiner extends EnergyItems implements ArmourUpgrade
{
@SideOnly(Side.CLIENT)
private static Icon activeIcon;
@SideOnly(Side.CLIENT)

View file

@ -16,7 +16,8 @@ import net.minecraft.world.World;
import java.util.List;
public class SigilOfWind extends EnergyItems implements ArmourUpgrade {
public class SigilOfWind extends EnergyItems implements ArmourUpgrade
{
@SideOnly(Side.CLIENT)
private static Icon activeIcon;
@SideOnly(Side.CLIENT)

View file

@ -20,7 +20,8 @@ import net.minecraftforge.event.entity.player.FillBucketEvent;
import java.util.List;
public class VoidSigil extends ItemBucket implements ArmourUpgrade {
public class VoidSigil extends ItemBucket implements ArmourUpgrade
{
private int isFull;
private int energyUsed;

View file

@ -19,7 +19,8 @@ import net.minecraft.world.World;
import java.util.List;
public class WaterSigil extends ItemBucket implements ArmourUpgrade {
public class WaterSigil extends ItemBucket implements ArmourUpgrade
{
/**
* field for checking if the bucket has been filled.
*/

View file

@ -18,7 +18,8 @@ import thaumcraft.api.wands.IWandFocus;
import java.util.List;
public abstract class FocusBase extends EnergyItems implements IWandFocus {
public abstract class FocusBase extends EnergyItems implements IWandFocus
{
protected Icon ornament, depth;
public FocusBase(int par1)

View file

@ -19,7 +19,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class FocusBloodBlast extends FocusBase {
public class FocusBloodBlast extends FocusBase
{
private static final AspectList visUsage = new AspectList().add(Aspect.AIR, 15).add(Aspect.ENTROPY, 45);
private final int maxCooldown = 7;

View file

@ -23,7 +23,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class FocusGravityWell extends FocusBase {
public class FocusGravityWell extends FocusBase
{
private static final AspectList visUsage = new AspectList().add(Aspect.AIR, 5).add(Aspect.ORDER, 5);
private final int maxCooldown = 1;