lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Normalized code formatting.

Browse source
This commit is contained in:
WayofTime 2016-03-16 18:41:06 -04:00
parent b1db7c5152
commit 134b11f177
122 changed files with 944 additions and 697 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java
View file

@ -53,7 +53,8 @@ public class ItemActivationCrystal extends ItemBindable implements IVariantProvi
}
@Override
public List<Pair<Integer, String>> getVariants() {
public List<Pair<Integer, String>> getVariants()
{
List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
ret.add(new ImmutablePair<Integer, String>(0, "type=weak"));
ret.add(new ImmutablePair<Integer, String>(1, "type=demonic"));

3
src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java
View file

@ -92,7 +92,8 @@ public class ItemAltarMaker extends Item implements IAltarManipulator, IVariantP
}
@Override
public List<Pair<Integer, String>> getVariants() {
public List<Pair<Integer, String>> getVariants()
{
List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
ret.add(new ImmutablePair<Integer, String>(0, "type=altarmaker"));
return ret;

3
src/main/java/WayofTime/bloodmagic/item/ItemArcaneAshes.java
View file

@ -57,7 +57,8 @@ public class ItemArcaneAshes extends Item implements IVariantProvider
}
@Override
public List<Pair<Integer, String>> getVariants() {
public List<Pair<Integer, String>> getVariants()
{
List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
ret.add(new ImmutablePair<Integer, String>(0, "type=arcaneashes"));
return ret;

3
src/main/java/WayofTime/bloodmagic/item/ItemBloodShard.java
View file

@ -43,7 +43,8 @@ public class ItemBloodShard extends Item implements IVariantProvider
}
@Override
public List<Pair<Integer, String>> getVariants() {
public List<Pair<Integer, String>> getVariants()
{
List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
ret.add(new ImmutablePair<Integer, String>(0, "type=weak"));
ret.add(new ImmutablePair<Integer, String>(1, "type=demonic"));

4
src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java
View file

@ -57,7 +57,9 @@ public class ItemBoundPickaxe extends ItemBoundTool implements IMeshProvider
@Override
public boolean canHarvestBlock(Block blockIn)
{
return blockIn == Blocks.obsidian ? this.toolMaterial.getHarvestLevel() == 3 : (blockIn != Blocks.diamond_block && blockIn != Blocks.diamond_ore ? (blockIn != Blocks.emerald_ore && blockIn != Blocks.emerald_block ? (blockIn != Blocks.gold_block && blockIn != Blocks.gold_ore ? (blockIn != Blocks.iron_block && blockIn != Blocks.iron_ore ? (blockIn != Blocks.lapis_block && blockIn != Blocks.lapis_ore ? (blockIn != Blocks.redstone_ore && blockIn != Blocks.lit_redstone_ore ? (blockIn.getMaterial() == Material.rock || (blockIn.getMaterial() == Material.iron || blockIn.getMaterial() == Material.anvil)) : this.toolMaterial.getHarvestLevel() >= 2) : this.toolMaterial.getHarvestLevel() >= 1) : this.toolMaterial.getHarvestLevel() >= 1) : this.toolMaterial.getHarvestLevel() >= 2) : this.toolMaterial.getHarvestLevel() >= 2) : this.toolMaterial.getHarvestLevel() >= 2);
return blockIn == Blocks.obsidian ? this.toolMaterial.getHarvestLevel() == 3
: (blockIn != Blocks.diamond_block && blockIn != Blocks.diamond_ore ? (blockIn != Blocks.emerald_ore && blockIn != Blocks.emerald_block ? (blockIn != Blocks.gold_block && blockIn != Blocks.gold_ore ? (blockIn != Blocks.iron_block && blockIn != Blocks.iron_ore ? (blockIn != Blocks.lapis_block && blockIn != Blocks.lapis_ore ? (blockIn != Blocks.redstone_ore && blockIn != Blocks.lit_redstone_ore ? (blockIn.getMaterial() == Material.rock || (blockIn.getMaterial() == Material.iron || blockIn.getMaterial() == Material.anvil)) : this.toolMaterial.getHarvestLevel() >= 2)
: this.toolMaterial.getHarvestLevel() >= 1) : this.toolMaterial.getHarvestLevel() >= 1) : this.toolMaterial.getHarvestLevel() >= 2) : this.toolMaterial.getHarvestLevel() >= 2) : this.toolMaterial.getHarvestLevel() >= 2);
}
@Override

18
src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java
View file

@ -83,8 +83,7 @@ public class ItemBoundTool extends ItemTool implements IBindable, IActivatable
{
EntityPlayer player = (EntityPlayer) entityIn;
setHeldDownCount(stack, Math.min(player.getItemInUseDuration(), chargeTime));
}
else if (!isSelected)
} else if (!isSelected)
{
setBeingHeldDown(stack, false);
}
@ -158,7 +157,8 @@ public class ItemBoundTool extends ItemTool implements IBindable, IActivatable
}
@Override
public Multimap<String, AttributeModifier> getAttributeModifiers(ItemStack stack) {
public Multimap<String, AttributeModifier> getAttributeModifiers(ItemStack stack)
{
Multimap<String, AttributeModifier> multimap = super.getAttributeModifiers(stack);
double damage = getActivated(stack) ? this.damage : 1.0D;
multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), new AttributeModifier(itemModifierUUID, "Weapon modifier", damage, 0));
@ -202,7 +202,8 @@ public class ItemBoundTool extends ItemTool implements IBindable, IActivatable
}
@Override
public Set<String> getToolClasses(ItemStack stack) {
public Set<String> getToolClasses(ItemStack stack)
{
return ImmutableSet.of(name);
}
@ -240,17 +241,20 @@ public class ItemBoundTool extends ItemTool implements IBindable, IActivatable
// IBindable
@Override
public String getOwnerName(ItemStack stack) {
public String getOwnerName(ItemStack stack)
{
return stack != null ? NBTHelper.checkNBT(stack).getTagCompound().getString(Constants.NBT.OWNER_NAME) : null;
}
@Override
public String getOwnerUUID(ItemStack stack) {
public String getOwnerUUID(ItemStack stack)
{
return stack != null ? NBTHelper.checkNBT(stack).getTagCompound().getString(Constants.NBT.OWNER_UUID) : null;
}
@Override
public boolean onBind(EntityPlayer player, ItemStack stack) {
public boolean onBind(EntityPlayer player, ItemStack stack)
{
return true;
}

3
src/main/java/WayofTime/bloodmagic/item/ItemComponent.java
View file

@ -96,7 +96,8 @@ public class ItemComponent extends Item implements IVariantProvider
}
@Override
public List<Pair<Integer, String>> getVariants() {
public List<Pair<Integer, String>> getVariants()
{
List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
for (String name : names)
ret.add(new ImmutablePair<Integer, String>(names.indexOf(name), "type=" + name));

3
src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java
View file

@ -69,7 +69,8 @@ public class ItemDaggerOfSacrifice extends Item implements IVariantProvider
}
@Override
public List<Pair<Integer, String>> getVariants() {
public List<Pair<Integer, String>> getVariants()
{
List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
ret.add(new ImmutablePair<Integer, String>(0, "type=normal"));
return ret;

3
src/main/java/WayofTime/bloodmagic/item/ItemDemonCrystal.java
View file

@ -104,7 +104,8 @@ public class ItemDemonCrystal extends Item implements IDiscreteDemonWill, IVaria
}
@Override
public List<Pair<Integer, String>> getVariants() {
public List<Pair<Integer, String>> getVariants()
{
List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
for (String name : names)
ret.add(new ImmutablePair<Integer, String>(names.indexOf(name), "type=" + name));

6
src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java
View file

@ -77,7 +77,8 @@ public class ItemInscriptionTool extends ItemBindable implements IVariantProvide
}
@Override
public boolean showDurabilityBar(ItemStack stack) {
public boolean showDurabilityBar(ItemStack stack)
{
return true;
}
@ -99,7 +100,8 @@ public class ItemInscriptionTool extends ItemBindable implements IVariantProvide
}
@Override
public List<Pair<Integer, String>> getVariants() {
public List<Pair<Integer, String>> getVariants()
{
List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
for (int i = 1; i < EnumRuneType.values().length; i++)
ret.add(new ImmutablePair<Integer, String>(i, "type=" + EnumRuneType.values()[i].name()));

3
src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java
View file

@ -83,7 +83,8 @@ public class ItemLavaCrystal extends ItemBindable implements IFuelHandler, IVari
}
@Override
public List<Pair<Integer, String>> getVariants() {
public List<Pair<Integer, String>> getVariants()
{
List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
ret.add(new ImmutablePair<Integer, String>(0, "type=normal"));
return ret;

3
src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java
View file

@ -310,7 +310,8 @@ public class ItemRitualDiviner extends Item implements IVariantProvider
}
@Override
public List<Pair<Integer, String>> getVariants() {
public List<Pair<Integer, String>> getVariants()
{
List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
ret.add(new ImmutablePair<Integer, String>(0, "type=basic"));
ret.add(new ImmutablePair<Integer, String>(1, "type=dusk"));

3
src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java
View file

@ -152,7 +152,8 @@ public class ItemSacrificialDagger extends Item implements IVariantProvider
}
@Override
public List<Pair<Integer, String>> getVariants() {
public List<Pair<Integer, String>> getVariants()
{
List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
ret.add(new ImmutablePair<Integer, String>(0, "type=normal"));
ret.add(new ImmutablePair<Integer, String>(1, "type=creative"));

3
src/main/java/WayofTime/bloodmagic/item/ItemSlate.java
View file

@ -53,7 +53,8 @@ public class ItemSlate extends Item implements IVariantProvider
}
@Override
public List<Pair<Integer, String>> getVariants() {
public List<Pair<Integer, String>> getVariants()
{
List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
ret.add(new ImmutablePair<Integer, String>(0, "type=blank"));
ret.add(new ImmutablePair<Integer, String>(1, "type=reinforced"));

3
src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java
View file

@ -88,7 +88,8 @@ public class ItemTelepositionFocus extends ItemBindable implements IVariantProvi
}
@Override
public List<Pair<Integer, String>> getVariants() {
public List<Pair<Integer, String>> getVariants()
{
List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
ret.add(new ImmutablePair<Integer, String>(0, "type=weak"));
ret.add(new ImmutablePair<Integer, String>(1, "type=enhanced"));

3
src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java
View file

@ -88,7 +88,8 @@ public class ItemUpgradeTome extends Item implements IVariantProvider
}
@Override
public List<Pair<Integer, String>> getVariants() {
public List<Pair<Integer, String>> getVariants()
{
List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
ret.add(new ImmutablePair<Integer, String>(0, "type=upgradetome"));
return ret;

3
src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTrainer.java
View file

@ -112,7 +112,8 @@ public class ItemUpgradeTrainer extends Item implements IUpgradeTrainer, IVarian
}
@Override
public List<Pair<Integer, String>> getVariants() {
public List<Pair<Integer, String>> getVariants()
{
List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
ret.add(new ImmutablePair<Integer, String>(0, "type=upgradetrainer"));
return ret;

4
src/main/java/WayofTime/bloodmagic/item/block/ItemBlockBloodTank.java
View file

@ -1,6 +1,5 @@
package WayofTime.bloodmagic.item.block;
import java.util.List;
import net.minecraft.block.Block;
@ -69,7 +68,8 @@ public class ItemBlockBloodTank extends ItemBlock implements IFluidContainerItem
@Override
public int fill(ItemStack stack, FluidStack resource, boolean doFill)
{
if (resource == null || stack.stackSize != 1) return 0;
if (resource == null || stack.stackSize != 1)
return 0;
int fillAmount = 0, capacity = getCapacity(stack);
NBTTagCompound tag = stack.getTagCompound(), fluidTag = null;
FluidStack fluid = null;

3
src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java
View file

@ -95,7 +95,8 @@ public class ItemPackSacrifice extends ItemArmor implements IAltarManipulator, I
}
@Override
public List<Pair<Integer, String>> getVariants() {
public List<Pair<Integer, String>> getVariants()
{
List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
ret.add(new ImmutablePair<Integer, String>(0, "type=normal"));
return ret;

3
src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java
View file

@ -114,7 +114,8 @@ public class ItemPackSelfSacrifice extends ItemArmor implements IAltarManipulato
}
@Override
public List<Pair<Integer, String>> getVariants() {
public List<Pair<Integer, String>> getVariants()
{
List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
ret.add(new ImmutablePair<Integer, String>(0, "type=normal"));
return ret;

3
src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java
View file

@ -196,7 +196,8 @@ public class ItemNodeRouter extends Item implements INodeRenderer, IVariantProvi
}
@Override
public List<Pair<Integer, String>> getVariants() {
public List<Pair<Integer, String>> getVariants()
{
List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
ret.add(new ImmutablePair<Integer, String>(0, "type=normal"));
return ret;

3
src/main/java/WayofTime/bloodmagic/item/routing/ItemRouterFilter.java
View file

@ -154,7 +154,8 @@ public class ItemRouterFilter extends Item implements IItemFilterProvider, IVari
}
@Override
public List<Pair<Integer, String>> getVariants() {
public List<Pair<Integer, String>> getVariants()
{
List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
ret.add(new ImmutablePair<Integer, String>(0, "type=exact"));
ret.add(new ImmutablePair<Integer, String>(1, "type=ignorenbt"));

3
src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java
View file

@ -62,7 +62,8 @@ public class ItemSigilBase extends ItemBindable implements ISigil, IVariantProvi
}
@Override
public List<Pair<Integer, String>> getVariants() {
public List<Pair<Integer, String>> getVariants()
{
List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
ret.add(new ImmutablePair<Integer, String>(0, "type=normal"));
return ret;

15
src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBloodLight.java
View file

@ -21,7 +21,8 @@ public class ItemSigilBloodLight extends ItemSigilBase
}
@Override
public void onUpdate(ItemStack stack, World worldIn, Entity entityIn, int itemSlot, boolean isSelected) {
public void onUpdate(ItemStack stack, World worldIn, Entity entityIn, int itemSlot, boolean isSelected)
{
if (getCooldownRemainder(stack) > 0)
reduceCooldown(stack);
}
@ -49,7 +50,8 @@ public class ItemSigilBloodLight extends ItemSigilBase
}
} else
{
if (!world.isRemote) {
if (!world.isRemote)
{
world.spawnEntityInWorld(new EntityBloodLight(world, player));
NetworkHelper.syphonAndDamage(NetworkHelper.getSoulNetwork(player), player, getLPUsed());
}
@ -65,15 +67,18 @@ public class ItemSigilBloodLight extends ItemSigilBase
return oldStack.getItem() != newStack.getItem();
}
public int getCooldownRemainder(ItemStack stack) {
public int getCooldownRemainder(ItemStack stack)
{
return NBTHelper.checkNBT(stack).getTagCompound().getInteger(Constants.NBT.TICKS_REMAINING);
}
public void reduceCooldown(ItemStack stack) {
public void reduceCooldown(ItemStack stack)
{
NBTHelper.checkNBT(stack).getTagCompound().setInteger(Constants.NBT.TICKS_REMAINING, getCooldownRemainder(stack) - 1);
}
public void resetCooldown(ItemStack stack) {
public void resetCooldown(ItemStack stack)
{
NBTHelper.checkNBT(stack).getTagCompound().setInteger(Constants.NBT.TICKS_REMAINING, 10);
}
}

1
src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSuppression.java
View file

@ -54,5 +54,4 @@ public class ItemSigilSuppression extends ItemSigilToggleable
}
}
}

1
src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java
View file

@ -82,4 +82,3 @@ public class ItemSigilTeleposition extends ItemSigilBase
return tag.getInteger(key);
}
}

3
src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleable.java
View file

@ -83,7 +83,8 @@ public class ItemSigilToggleable extends ItemSigilBase
}
@Override
public List<Pair<Integer, String>> getVariants() {
public List<Pair<Integer, String>> getVariants()
{
List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
ret.add(new ImmutablePair<Integer, String>(0, "active=false"));
ret.add(new ImmutablePair<Integer, String>(1, "active=true"));

2
src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTransposition.java
View file

@ -1,6 +1,5 @@
package WayofTime.bloodmagic.item.sigil;
import java.util.List;
import net.minecraft.block.Block;
@ -146,5 +145,4 @@ public class ItemSigilTransposition extends ItemSigilBase
world.addWeatherEffect(new EntityLightningBolt(world, blockPos.getX(), blockPos.getY(), blockPos.getZ()));
}
}

3
src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWater.java
View file

@ -83,7 +83,8 @@ public class ItemSigilWater extends ItemSigilBase
return false;
}
if (world.getBlockState(blockPos).getBlock() == Blocks.cauldron && syphonNetwork(stack, player, getLPUsed())) {
if (world.getBlockState(blockPos).getBlock() == Blocks.cauldron && syphonNetwork(stack, player, getLPUsed()))
{
world.setBlockState(blockPos, Blocks.cauldron.getDefaultState().withProperty(BlockCauldron.LEVEL, 3));
return true;
}

3
src/main/java/WayofTime/bloodmagic/item/soul/ItemMonsterSoul.java
View file

@ -97,7 +97,8 @@ public class ItemMonsterSoul extends Item implements IDemonWill, IVariantProvide
}
@Override
public List<Pair<Integer, String>> getVariants() {
public List<Pair<Integer, String>> getVariants()
{
List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
ret.add(new ImmutablePair<Integer, String>(0, "type=monstersoul"));
return ret;

3
src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java
View file

@ -188,7 +188,8 @@ public class ItemSoulGem extends Item implements IDemonWillGem, IVariantProvider
}
@Override
public List<Pair<Integer, String>> getVariants() {
public List<Pair<Integer, String>> getVariants()
{
List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
ret.add(new ImmutablePair<Integer, String>(0, "type=petty"));
ret.add(new ImmutablePair<Integer, String>(1, "type=lesser"));

3
src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulSnare.java
View file

@ -76,7 +76,8 @@ public class ItemSoulSnare extends Item implements IVariantProvider
}
@Override
public List<Pair<Integer, String>> getVariants() {
public List<Pair<Integer, String>> getVariants()
{
List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
ret.add(new ImmutablePair<Integer, String>(0, "type=soulsnare"));
return ret;