fujin/Wizardry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add permafrost spell and fix dry frosted ice not being very icy

Browse Source
This commit is contained in:
Electroblob77
2020-10-23 01:22:28 +01:00
parent e530695f54
commit 29617451d8
14 changed files with 209 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/electroblob/wizardry/block/BlockDryFrostedIce.java
+13
View File
@@ -1,6 +1,8 @@
package electroblob.wizardry.block;
import net.minecraft.block.BlockFrostedIce;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.MathHelper;
@@ -12,6 +14,17 @@ import java.util.Random;
* disappears instead of turning to water. */
public class BlockDryFrostedIce extends BlockFrostedIce {
public BlockDryFrostedIce(){
super();
setDefaultSlipperiness(0.98f); // For some strange reason BlockFrostedIce overrides BlockIce's icy-ness...
setSoundType(SoundType.GLASS);
}
@Override
public Material getMaterial(IBlockState state){
return Material.ICE; // For goodness sake
}
@Override
protected void turnIntoWater(World world, BlockPos pos){
world.destroyBlock(pos, false);
src/main/java/electroblob/wizardry/block/BlockPermafrost.java
+42 -7
View File
@@ -1,22 +1,57 @@
package electroblob.wizardry.block;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import electroblob.wizardry.registry.Spells;
import electroblob.wizardry.registry.WizardryPotions;
import electroblob.wizardry.spell.Spell;
import electroblob.wizardry.util.EntityUtils;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.potion.PotionEffect;
import net.minecraft.util.DamageSource;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.MathHelper;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import javax.annotation.Nullable;
public class BlockPermafrost extends Block {
public class BlockPermafrost extends BlockDryFrostedIce {
public BlockPermafrost(){
super(Material.ICE);
protected static final AxisAlignedBB BOUNDING_BOX = new AxisAlignedBB(0, 0, 0, 1, 0, 1);
protected static final AxisAlignedBB SELECTION_BOUNDING_BOX = new AxisAlignedBB(0, 0, 0, 1, 0.125, 1);
@Override
public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos){
return BOUNDING_BOX;
}
@Override
public float getSlipperiness(IBlockState state, IBlockAccess world, BlockPos pos, @Nullable Entity entity){
return super.getSlipperiness(state, world, pos, entity);
public AxisAlignedBB getSelectedBoundingBox(IBlockState state, World worldIn, BlockPos pos){
return SELECTION_BOUNDING_BOX;
}
@Nullable
@Override
public AxisAlignedBB getCollisionBoundingBox(IBlockState blockState, IBlockAccess worldIn, BlockPos pos){
return super.getCollisionBoundingBox(blockState, worldIn, pos);
}
@Override
public boolean isFullCube(IBlockState state){
return false;
}
@Override
public void onEntityCollision(World world, BlockPos pos, IBlockState state, Entity entity){
if(EntityUtils.isLiving(entity) && entity.ticksExisted % 30 == 0){
// Can't make it player damage unless we make this block a tile entity, but there will be too many for that
entity.attackEntityFrom(DamageSource.MAGIC, Spells.permafrost.getProperty(Spell.DAMAGE).floatValue());
int duration = Spells.permafrost.getProperty(Spell.EFFECT_DURATION).intValue();
int amplifier = Spells.permafrost.getProperty(Spell.EFFECT_STRENGTH).intValue();
((EntityLivingBase)entity).addPotionEffect(new PotionEffect(WizardryPotions.frost, duration, amplifier));
}
}
}
src/main/java/electroblob/wizardry/registry/Spells.java
+2
View File
@@ -245,6 +245,7 @@ public final class Spells {
public static final Spell enrage = placeholder();
public static final Spell mark_sacrifice = placeholder();
public static final Spell permafrost = placeholder();
public static final Spell stormcloud = placeholder();
public static final Spell withering_totem = placeholder();
public static final Spell fangs = placeholder();
@@ -464,6 +465,7 @@ public final class Spells {
registry.register(new Enrage());
registry.register(new MarkSacrifice());
registry.register(new Permafrost());
registry.register(new Stormcloud());
registry.register(new WitheringTotem());
registry.register(new Fangs());
src/main/java/electroblob/wizardry/registry/WizardryBlocks.java
+2
View File
@@ -56,6 +56,7 @@ public final class WizardryBlocks {
public static final Block obsidian_crust = placeholder();
public static final Block dry_frosted_ice = placeholder();
public static final Block crystal_flower_pot = placeholder();
public static final Block permafrost = placeholder();
public static final Block runestone = placeholder();
public static final Block runestone_pedestal = placeholder();
@@ -120,6 +121,7 @@ public final class WizardryBlocks {
registerBlock(registry, "obsidian_crust", new BlockObsidianCrust());
registerBlock(registry, "dry_frosted_ice", new BlockDryFrostedIce());
registerBlock(registry, "crystal_flower_pot", new BlockCrystalFlowerPot());
registerBlock(registry, "permafrost", new BlockPermafrost());
registerBlock(registry, "runestone", new BlockRunestone(Material.ROCK));
registerBlock(registry, "runestone_pedestal", new BlockPedestal(Material.ROCK));
src/main/java/electroblob/wizardry/spell/Permafrost.java
+65
View File
@@ -0,0 +1,65 @@
package electroblob.wizardry.spell;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryBlocks;
import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.util.BlockUtils;
import electroblob.wizardry.util.ParticleBuilder;
import electroblob.wizardry.util.ParticleBuilder.Type;
import electroblob.wizardry.util.SpellModifiers;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.World;
public class Permafrost extends SpellRay {
public Permafrost(){
super("permafrost", SpellActions.POINT, true);
this.particleVelocity(1);
this.particleSpacing(0.5);
soundValues(0.5f, 1, 0);
addProperties(DURATION, DAMAGE, EFFECT_DURATION, EFFECT_STRENGTH);
this.ignoreLivingEntities(true);
}
@Override
protected boolean onEntityHit(World world, Entity target, Vec3d hit, EntityLivingBase caster, Vec3d origin, int ticksInUse, SpellModifiers modifiers){
return false;
}
@Override
protected boolean onBlockHit(World world, BlockPos pos, EnumFacing side, Vec3d hit, EntityLivingBase caster, Vec3d origin, int ticksInUse, SpellModifiers modifiers){
if(side == EnumFacing.UP && world.getBlockState(pos).isSideSolid(world, pos, EnumFacing.UP)
&& BlockUtils.canBlockBeReplaced(world, pos.up())){
int duration = (int)(getProperty(DURATION).floatValue() * modifiers.get(WizardryItems.duration_upgrade));
if(!world.isRemote && BlockUtils.canPlaceBlock(caster, world, pos.up())){
world.setBlockState(pos.up(), WizardryBlocks.permafrost.getDefaultState());
world.scheduleUpdate(pos.up().toImmutable(), WizardryBlocks.permafrost, duration);
}
return true;
}
return false;
}
@Override
protected boolean onMiss(World world, EntityLivingBase caster, Vec3d origin, Vec3d direction, int ticksInUse, SpellModifiers modifiers){
return true;
}
@Override
protected void spawnParticle(World world, double x, double y, double z, double vx, double vy, double vz){
float brightness = world.rand.nextFloat();
ParticleBuilder.create(Type.DUST).pos(x, y, z).vel(vx, vy, vz).time(8 + world.rand.nextInt(12))
.clr(0.4f + 0.6f * brightness, 0.6f + 0.4f*brightness, 1).spawn(world);
ParticleBuilder.create(Type.SNOW).pos(x, y, z).vel(vx, vy, vz).time(8 + world.rand.nextInt(12)).spawn(world);
}
}