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

Anti-comments sweep!

Browse source
This commit is contained in:
Tombenpotter 2014-10-13 22:33:20 +02:00
parent e6a10f3f06
commit dea1f87078
454 changed files with 23594 additions and 26739 deletions
Download patch file Download diff file Expand all files Collapse all files

55
1.7.10/main/java/WayofTime/alchemicalWizardry/common/items/potion/AlchemyFlask.java
View file

@ -1,11 +1,10 @@
package WayofTime.alchemicalWizardry.common.items.potion;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.api.alchemy.AlchemyPotionHelper;
import com.google.common.collect.HashMultimap;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.ai.attributes.AttributeModifier;
@ -24,13 +23,12 @@ import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
import net.minecraftforge.common.util.Constants;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.api.alchemy.AlchemyPotionHelper;
import com.google.common.collect.HashMultimap;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
public class AlchemyFlask extends Item
{
@ -42,7 +40,6 @@ public class AlchemyFlask extends Item
this.setMaxDamage(8);
this.setMaxStackSize(1);
setCreativeTab(AlchemicalWizardry.tabBloodMagic);
// TODO Auto-generated constructor stub
}
@Override
@ -64,7 +61,6 @@ public class AlchemyFlask extends Item
NBTTagCompound nbttagcompound = (NBTTagCompound) nbttaglist.getCompoundTagAt(i);
arraylist.add(AlchemyPotionHelper.readEffectFromNBT(nbttagcompound));
}
return arraylist;
} else
{
@ -166,11 +162,6 @@ public class AlchemyFlask extends Item
*/
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
// if(par3EntityPlayer.isSneaking())
// {
// this.setIsPotionThrowable(true, par1ItemStack);
// return par1ItemStack;
// }
if (par1ItemStack.getItemDamage() < par1ItemStack.getMaxDamage())
{
if (this.isPotionThrowable(par1ItemStack))
@ -195,14 +186,12 @@ public class AlchemyFlask extends Item
par3EntityPlayer.setItemInUse(par1ItemStack, this.getMaxItemUseDuration(par1ItemStack));
}
return par1ItemStack;
}
public void setConcentrationOfPotion(ItemStack par1ItemStack, int potionID, int concentration)
{
ArrayList<AlchemyPotionHelper> list = this.getEffects(par1ItemStack);
if (list != null)
{
for (AlchemyPotionHelper aph : list)
@ -213,7 +202,6 @@ public class AlchemyFlask extends Item
break;
}
}
this.setEffects(par1ItemStack, list);
}
}
@ -221,7 +209,6 @@ public class AlchemyFlask extends Item
public void setDurationFactorOfPotion(ItemStack par1ItemStack, int potionID, int durationFactor)
{
ArrayList<AlchemyPotionHelper> list = this.getEffects(par1ItemStack);
if (list != null)
{
for (AlchemyPotionHelper aph : list)
@ -232,7 +219,6 @@ public class AlchemyFlask extends Item
break;
}
}
this.setEffects(par1ItemStack, list);
}
}
@ -257,7 +243,6 @@ public class AlchemyFlask extends Item
{
int i = 0;
ArrayList<AlchemyPotionHelper> list = this.getEffects(par1ItemStack);
if (list != null)
{
for (AlchemyPotionHelper aph : list)
@ -269,13 +254,9 @@ public class AlchemyFlask extends Item
i++;
}
//if(i<this.maxPotionAmount)
{
list.add(new AlchemyPotionHelper(potionID, tickDuration, 0, 0));
this.setEffects(par1ItemStack, list);
return true;
}
list.add(new AlchemyPotionHelper(potionID, tickDuration, 0, 0));
this.setEffects(par1ItemStack, list);
return true;
} else
{
list = new ArrayList();
@ -318,7 +299,7 @@ public class AlchemyFlask extends Item
Entry entry = (Entry) iterator1.next();
AttributeModifier attributemodifier = (AttributeModifier) entry.getValue();
AttributeModifier attributemodifier1 = new AttributeModifier(attributemodifier.getName(), potion.func_111183_a(potioneffect.getAmplifier(), attributemodifier), attributemodifier.getOperation());
hashmultimap.put(((IAttribute)entry.getKey()).getAttributeUnlocalizedName(), attributemodifier1);
hashmultimap.put(((IAttribute) entry.getKey()).getAttributeUnlocalizedName(), attributemodifier1);
}
}
@ -388,8 +369,6 @@ public class AlchemyFlask extends Item
{
return false;
}
//return false;
}
public void setIsPotionThrowable(boolean flag, ItemStack par1ItemStack)
@ -412,22 +391,16 @@ public class AlchemyFlask extends Item
{
return null;
}
NBTTagList nbttaglist = new NBTTagList();
for (PotionEffect pe : potionList)
{
NBTTagCompound d = new NBTTagCompound();
d.setByte("Id", (byte) pe.getPotionID());
d.setByte("Amplifier", (byte) pe.getAmplifier());
//byte b1 = par0NBTTagCompound.getByte("Amplifier");
d.setInteger("Duration", pe.getDuration());
//int i = par0NBTTagCompound.getInteger("Duration");
d.setBoolean("Ambient", pe.getIsAmbient());
// boolean flag = par0NBTTagCompound.getBoolean("Ambient");
nbttaglist.appendTag(d);
}
potionStack.stackTagCompound.setTag("CustomPotionEffects", nbttaglist);
EntityPotion entityPotion = new EntityPotion(worldObj, entityLivingBase, potionStack);
return entityPotion;

28
1.7.10/main/java/WayofTime/alchemicalWizardry/common/items/potion/AlchemyReagent.java
View file

@ -1,20 +1,18 @@
package WayofTime.alchemicalWizardry.common.items.potion;
import java.util.List;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
import org.lwjgl.input.Keyboard;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.ModItems;
import WayofTime.alchemicalWizardry.api.alchemy.AlchemyRecipeRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
import org.lwjgl.input.Keyboard;
import java.util.List;
public class AlchemyReagent extends Item
{
@ -23,7 +21,6 @@ public class AlchemyReagent extends Item
super();
setCreativeTab(AlchemicalWizardry.tabBloodMagic);
this.setMaxStackSize(64);
// TODO Auto-generated constructor stub
}
@Override
@ -35,55 +32,46 @@ public class AlchemyReagent extends Item
this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:Incendium");
return;
}
if (this == ModItems.magicales)
{
this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:Magicales");
return;
}
if (this == ModItems.sanctus)
{
this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:Sanctus");
return;
}
if (this == ModItems.aether)
{
this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:Aether");
return;
}
if (this == ModItems.simpleCatalyst)
{
this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:SimpleCatalyst");
return;
}
if (this == ModItems.crepitous)
{
this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:Crepitous");
return;
}
if (this == ModItems.crystallos)
{
this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:Crystallos");
return;
}
if (this == ModItems.terrae)
{
this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:Terrae");
return;
}
if (this == ModItems.aquasalus)
{
this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:Aquasalus");
return;
}
if (this == ModItems.tennebrae)
{
this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:Tennebrae");

2
1.7.10/main/java/WayofTime/alchemicalWizardry/common/items/potion/AverageLengtheningCatalyst.java
View file

@ -1,8 +1,8 @@
package WayofTime.alchemicalWizardry.common.items.potion;
import net.minecraft.client.renderer.texture.IIconRegister;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister;
public class AverageLengtheningCatalyst extends LengtheningCatalyst
{

2
1.7.10/main/java/WayofTime/alchemicalWizardry/common/items/potion/AveragePowerCatalyst.java
View file

@ -1,8 +1,8 @@
package WayofTime.alchemicalWizardry.common.items.potion;
import net.minecraft.client.renderer.texture.IIconRegister;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister;
public class AveragePowerCatalyst extends PowerCatalyst
{

18
1.7.10/main/java/WayofTime/alchemicalWizardry/common/items/potion/CombinationalCatalyst.java
View file

@ -1,21 +1,21 @@
package WayofTime.alchemicalWizardry.common.items.potion;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.alchemy.ICombinationalCatalyst;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.item.Item;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.alchemy.ICombinationalCatalyst;
public class CombinationalCatalyst extends Item implements ICombinationalCatalyst
{
public CombinationalCatalyst()
{
super();
this.setCreativeTab(AlchemicalWizardry.tabBloodMagic);
}
@Override
public CombinationalCatalyst()
{
super();
this.setCreativeTab(AlchemicalWizardry.tabBloodMagic);
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister iconRegister)
{

9
1.7.10/main/java/WayofTime/alchemicalWizardry/common/items/potion/EnhancedFillingAgent.java
View file

@ -1,11 +1,11 @@
package WayofTime.alchemicalWizardry.common.items.potion;
import java.util.Random;
import net.minecraft.client.renderer.texture.IIconRegister;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister;
import java.util.Random;
public class EnhancedFillingAgent extends WeakFillingAgent
{
@ -19,13 +19,10 @@ public class EnhancedFillingAgent extends WeakFillingAgent
public int getFilledAmountForPotionNumber(int potionEffects)
{
Random rand = new Random();
if (potionEffects == 0)
{
return 8;
}
//if(potionEffects >=1 && potionEffects<=5)
{
switch (potionEffects)
{

2
1.7.10/main/java/WayofTime/alchemicalWizardry/common/items/potion/GreaterLengtheningCatalyst.java
View file

@ -1,8 +1,8 @@
package WayofTime.alchemicalWizardry.common.items.potion;
import net.minecraft.client.renderer.texture.IIconRegister;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister;
public class GreaterLengtheningCatalyst extends LengtheningCatalyst
{

2
1.7.10/main/java/WayofTime/alchemicalWizardry/common/items/potion/GreaterPowerCatalyst.java
View file

@ -1,8 +1,8 @@
package WayofTime.alchemicalWizardry.common.items.potion;
import net.minecraft.client.renderer.texture.IIconRegister;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister;
public class GreaterPowerCatalyst extends PowerCatalyst
{

2
1.7.10/main/java/WayofTime/alchemicalWizardry/common/items/potion/LengtheningCatalyst.java
View file

@ -7,7 +7,6 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
import org.lwjgl.input.Keyboard;
import java.util.List;
@ -18,7 +17,6 @@ public class LengtheningCatalyst extends Item implements ICatalyst
public LengtheningCatalyst(int catalystStrength)
{
super();
this.catalystStrength = catalystStrength;
setCreativeTab(AlchemicalWizardry.tabBloodMagic);
}

2
1.7.10/main/java/WayofTime/alchemicalWizardry/common/items/potion/MundaneLengtheningCatalyst.java
View file

@ -1,8 +1,8 @@
package WayofTime.alchemicalWizardry.common.items.potion;
import net.minecraft.client.renderer.texture.IIconRegister;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister;
public class MundaneLengtheningCatalyst extends LengtheningCatalyst
{

2
1.7.10/main/java/WayofTime/alchemicalWizardry/common/items/potion/MundanePowerCatalyst.java
View file

@ -1,8 +1,8 @@
package WayofTime.alchemicalWizardry.common.items.potion;
import net.minecraft.client.renderer.texture.IIconRegister;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister;
public class MundanePowerCatalyst extends PowerCatalyst
{

1
1.7.10/main/java/WayofTime/alchemicalWizardry/common/items/potion/PowerCatalyst.java
View file

@ -7,7 +7,6 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
import org.lwjgl.input.Keyboard;
import java.util.List;

18
1.7.10/main/java/WayofTime/alchemicalWizardry/common/items/potion/StandardBindingAgent.java
View file

@ -1,20 +1,18 @@
package WayofTime.alchemicalWizardry.common.items.potion;
import java.util.List;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
import org.lwjgl.input.Keyboard;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.api.alchemy.AlchemyRecipeRegistry;
import WayofTime.alchemicalWizardry.common.IBindingAgent;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
import org.lwjgl.input.Keyboard;
import java.util.List;
public class StandardBindingAgent extends Item implements IBindingAgent
{

3
1.7.10/main/java/WayofTime/alchemicalWizardry/common/items/potion/StandardFillingAgent.java
View file

@ -1,9 +1,9 @@
package WayofTime.alchemicalWizardry.common.items.potion;
import net.minecraft.client.renderer.texture.IIconRegister;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister;
public class StandardFillingAgent extends WeakFillingAgent
{
@ -16,7 +16,6 @@ public class StandardFillingAgent extends WeakFillingAgent
@Override
public int getFilledAmountForPotionNumber(int potionEffects)
{
//Random rand = new Random();
if (potionEffects == 0)
{
return 8;

3
1.7.10/main/java/WayofTime/alchemicalWizardry/common/items/potion/WeakBindingAgent.java
View file

@ -1,15 +1,14 @@
package WayofTime.alchemicalWizardry.common.items.potion;
import net.minecraft.client.renderer.texture.IIconRegister;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister;
public class WeakBindingAgent extends StandardBindingAgent
{
public WeakBindingAgent()
{
super();
// TODO Auto-generated constructor stub
}
@Override

20
1.7.10/main/java/WayofTime/alchemicalWizardry/common/items/potion/WeakFillingAgent.java
View file

@ -1,21 +1,19 @@
package WayofTime.alchemicalWizardry.common.items.potion;
import java.util.List;
import java.util.Random;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
import org.lwjgl.input.Keyboard;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.api.alchemy.AlchemyRecipeRegistry;
import WayofTime.alchemicalWizardry.common.IFillingAgent;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
import org.lwjgl.input.Keyboard;
import java.util.List;
import java.util.Random;
public class WeakFillingAgent extends Item implements IFillingAgent
{