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

- Made it so peaceful animals provide more LP by default (to encourage creating your own farm).

Browse source 
- Increased the effectiveness of animals for the Gathering of the Forsaken Souls ritual by a factor of 4.
- Added the framework for the Purification Altar.
This commit is contained in:
WayofTime 2016-11-05 11:14:56 -04:00
parent da4de55c2e
commit faef980e59
14 changed files with 290 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/main/java/WayofTime/bloodmagic/meteor/Meteor.java
View file

@ -34,17 +34,19 @@ public class Meteor
this.maxWeight = maxWeight;
}
public void generateMeteor(World world, BlockPos pos, IBlockState fillerBlock)
public void generateMeteor(World world, BlockPos pos, IBlockState fillerBlock, double radiusModifier, double explosionModifier, double fillerChance)
{
world.newExplosion(null, pos.getX(), pos.getY(), pos.getZ(), explosionStrength, true, true);
world.newExplosion(null, pos.getX(), pos.getY(), pos.getZ(), (float) (explosionStrength * explosionModifier), true, true);
int radius = (int) Math.ceil(getRadius() * radiusModifier);
double floatingRadius = getRadius() * radiusModifier;
for (int i = -getRadius(); i <= getRadius(); i++)
for (int i = -radius; i <= radius; i++)
{
for (int j = -getRadius(); j <= getRadius(); j++)
for (int j = -radius; j <= radius; j++)
{
for (int k = -getRadius(); k <= getRadius(); k++)
for (int k = -radius; k <= radius; k++)
{
if (i * i + j * j + k * k > (getRadius() + 0.5) * (getRadius() + 0.5))
if (i * i + j * j + k * k > (floatingRadius + 0.5) * (floatingRadius + 0.5))
{
continue;
}
@ -54,15 +56,19 @@ public class Meteor
if (world.isAirBlock(newPos) || Utils.isBlockLiquid(state))
{
IBlockState placedState = getRandomOreFromComponents(fillerBlock);
world.setBlockState(newPos, placedState);
IBlockState placedState = getRandomOreFromComponents(fillerBlock, fillerChance);
if (placedState != null)
{
world.setBlockState(newPos, placedState);
}
}
}
}
}
}
public IBlockState getRandomOreFromComponents(IBlockState fillerBlock)
//fillerChance is the chance that the filler block will NOT be placed
public IBlockState getRandomOreFromComponents(IBlockState fillerBlock, double fillerChance)
{
int goal = RAND.nextInt(getMaxWeight());
@ -77,11 +83,11 @@ public class Meteor
return state;
} else
{
return fillerBlock;
return RAND.nextDouble() > fillerChance ? fillerBlock : null;
}
}
}
return fillerBlock;
return RAND.nextDouble() > fillerChance ? fillerBlock : null;
}
}

4
src/main/java/WayofTime/bloodmagic/meteor/MeteorRegistry.java
View file

@ -41,12 +41,12 @@ public class MeteorRegistry
return wrapper != null ? meteorMap.get(wrapper) : null;
}
public static void generateMeteorForItem(ItemStack stack, World world, BlockPos pos, IBlockState fillerBlock)
public static void generateMeteorForItem(ItemStack stack, World world, BlockPos pos, IBlockState fillerBlock, double radiusModifier, double explosionModifier, double fillerChance)
{
Meteor holder = getMeteorForItem(stack);
if (holder != null)
{
holder.generateMeteor(world, pos, fillerBlock);
holder.generateMeteor(world, pos, fillerBlock, radiusModifier, explosionModifier, fillerChance);
}
}
}