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

1
1.7.10/main/java/WayofTime/alchemicalWizardry/common/summoning/SummoningFallenAngel.java
View file

@ -10,7 +10,6 @@ public class SummoningFallenAngel extends SummoningHelper
public SummoningFallenAngel(int id)
{
super(id);
// TODO Auto-generated constructor stub
}
public EntityLivingBase getEntity(World worldObj)

22
1.7.10/main/java/WayofTime/alchemicalWizardry/common/summoning/SummoningHelperAW.java
View file

@ -1,28 +1,16 @@
package WayofTime.alchemicalWizardry.common.summoning;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.passive.EntityPig;
import net.minecraft.world.World;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.api.summoningRegistry.SummoningHelper;
import WayofTime.alchemicalWizardry.common.EntityAirElemental;
import WayofTime.alchemicalWizardry.common.entity.mob.EntityBileDemon;
import WayofTime.alchemicalWizardry.common.entity.mob.EntityBoulderFist;
import WayofTime.alchemicalWizardry.common.entity.mob.EntityEarthElemental;
import WayofTime.alchemicalWizardry.common.entity.mob.EntityFallenAngel;
import WayofTime.alchemicalWizardry.common.entity.mob.EntityFireElemental;
import WayofTime.alchemicalWizardry.common.entity.mob.EntityHolyElemental;
import WayofTime.alchemicalWizardry.common.entity.mob.EntityIceDemon;
import WayofTime.alchemicalWizardry.common.entity.mob.EntityLowerGuardian;
import WayofTime.alchemicalWizardry.common.entity.mob.EntityShade;
import WayofTime.alchemicalWizardry.common.entity.mob.EntityShadeElemental;
import WayofTime.alchemicalWizardry.common.entity.mob.EntitySmallEarthGolem;
import WayofTime.alchemicalWizardry.common.entity.mob.EntityWaterElemental;
import WayofTime.alchemicalWizardry.common.entity.mob.EntityWingedFireDemon;
import WayofTime.alchemicalWizardry.common.entity.mob.*;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.passive.EntityPig;
import net.minecraft.world.World;
public class SummoningHelperAW extends SummoningHelper
{
public SummoningHelperAW(int id)
public SummoningHelperAW(int id)
{
super(id);
}

140
1.7.10/main/java/WayofTime/alchemicalWizardry/common/summoning/meteor/MeteorParadigm.java
View file

@ -1,15 +1,15 @@
package WayofTime.alchemicalWizardry.common.summoning.meteor;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import net.minecraft.block.Block;
import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
public class MeteorParadigm
{
@ -17,7 +17,7 @@ public class MeteorParadigm
public ItemStack focusStack;
public int radius;
public static int maxChance = 1000;
public static Random rand = new Random();
public MeteorParadigm(ItemStack focusStack, int radius)
@ -44,37 +44,37 @@ public class MeteorParadigm
boolean hasCrystallos = false;
boolean hasIncendium = false;
boolean hasTennebrae = false;
if(flags != null && flags.length >= 5)
{
hasTerrae = flags[0];
hasOrbisTerrae = flags[1];
hasCrystallos = flags[2];
hasIncendium = flags[3];
hasTennebrae = flags[4];
}
int newRadius = radius;
int chance = maxChance;
if(hasOrbisTerrae)
{
newRadius += 2;
chance += 200;
}else if(hasTerrae)
{
newRadius += 1;
chance += 100;
}
if (flags != null && flags.length >= 5)
{
hasTerrae = flags[0];
hasOrbisTerrae = flags[1];
hasCrystallos = flags[2];
hasIncendium = flags[3];
hasTennebrae = flags[4];
}
int newRadius = radius;
int chance = maxChance;
if (hasOrbisTerrae)
{
newRadius += 2;
chance += 200;
} else if (hasTerrae)
{
newRadius += 1;
chance += 100;
}
world.createExplosion(null, x, y, z, newRadius * 4, AlchemicalWizardry.doMeteorsDestroyBlocks);
float iceChance = hasCrystallos ? 1 : 0;
float soulChance = hasIncendium ? 1 : 0;
float obsidChance = hasTennebrae ? 1 : 0;
float totalChance = iceChance + soulChance + obsidChance;
float soulChance = hasIncendium ? 1 : 0;
float obsidChance = hasTennebrae ? 1 : 0;
float totalChance = iceChance + soulChance + obsidChance;
for (int i = -newRadius; i <= newRadius; i++)
{
for (int j = -newRadius; j <= newRadius; j++)
@ -114,44 +114,44 @@ public class MeteorParadigm
if (!hasPlacedBlock)
{
float randChance = rand.nextFloat() * totalChance;
if(randChance < iceChance)
{
world.setBlock(x + i, y + j, z + k, Blocks.ice, 0, 3);
}else
{
randChance-=iceChance;
if(randChance < soulChance)
{
switch(rand.nextInt(3))
{
case 0:
world.setBlock(x + i, y + j, z + k, Blocks.soul_sand, 0, 3);
break;
case 1:
world.setBlock(x + i, y + j, z + k, Blocks.glowstone, 0, 3);
break;
case 2:
world.setBlock(x + i, y + j, z + k, Blocks.netherrack, 0, 3);
break;
}
}else
{
randChance-=soulChance;
if(randChance < obsidChance)
{
world.setBlock(x + i, y + j, z + k, Blocks.obsidian, 0, 3);
}else
{
randChance-=obsidChance;
float randChance = rand.nextFloat() * totalChance;
if (randChance < iceChance)
{
world.setBlock(x + i, y + j, z + k, Blocks.ice, 0, 3);
} else
{
randChance -= iceChance;
if (randChance < soulChance)
{
switch (rand.nextInt(3))
{
case 0:
world.setBlock(x + i, y + j, z + k, Blocks.soul_sand, 0, 3);
break;
case 1:
world.setBlock(x + i, y + j, z + k, Blocks.glowstone, 0, 3);
break;
case 2:
world.setBlock(x + i, y + j, z + k, Blocks.netherrack, 0, 3);
break;
}
} else
{
randChance -= soulChance;
if (randChance < obsidChance)
{
world.setBlock(x + i, y + j, z + k, Blocks.obsidian, 0, 3);
} else
{
randChance -= obsidChance;
world.setBlock(x + i, y + j, z + k, Blocks.stone, 0, 3);
}
}
}
}
}
}
}
}
}

2
1.7.10/main/java/WayofTime/alchemicalWizardry/common/summoning/meteor/MeteorRegistry.java
View file

@ -45,7 +45,7 @@ public class MeteorRegistry
{
ItemStack focusStack = paradigmList.get(i).focusStack;
if (focusStack != null && focusStack.getItem()== stack.getItem() && (focusStack.getItemDamage() == OreDictionary.WILDCARD_VALUE || focusStack.getItemDamage() == stack.getItemDamage()))
if (focusStack != null && focusStack.getItem() == stack.getItem() && (focusStack.getItemDamage() == OreDictionary.WILDCARD_VALUE || focusStack.getItemDamage() == stack.getItemDamage()))
{
return i;
}