-
Notifications
You must be signed in to change notification settings - Fork 14
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
3 changed files
with
62 additions
and
62 deletions.
There are no files selected for viewing
58 changes: 29 additions & 29 deletions
58
src/main/java/ladysnake/blast/common/entity/PillowBombEntity.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,29 +1,29 @@ | ||
package ladysnake.blast.common.entity; | ||
|
||
import ladysnake.blast.common.init.BlastItems; | ||
import ladysnake.blast.common.world.CustomExplosion; | ||
import ladysnake.blast.common.world.KnockbackExplosion; | ||
import net.minecraft.entity.EntityType; | ||
import net.minecraft.entity.LivingEntity; | ||
import net.minecraft.item.Item; | ||
import net.minecraft.world.World; | ||
|
||
public class PillowBombEntity extends BombEntity { | ||
public PillowBombEntity(EntityType<? extends BombEntity> entityType, World world) { | ||
super(entityType, world); | ||
} | ||
|
||
public PillowBombEntity(EntityType<? extends BombEntity> entityType, World world, LivingEntity livingEntity) { | ||
super(entityType, world, livingEntity); | ||
} | ||
|
||
@Override | ||
protected Item getDefaultItem() { | ||
return BlastItems.PILLOW_BOMB; | ||
} | ||
|
||
@Override | ||
protected CustomExplosion getExplosion() { | ||
return new KnockbackExplosion(this.world, this, this.getX(), this.getY(), this.getZ(), 3f); | ||
} | ||
} | ||
//package ladysnake.blast.common.entity; | ||
// | ||
//import ladysnake.blast.common.init.BlastItems; | ||
//import ladysnake.blast.common.world.CustomExplosion; | ||
//import ladysnake.blast.common.world.KnockbackExplosion; | ||
//import net.minecraft.entity.EntityType; | ||
//import net.minecraft.entity.LivingEntity; | ||
//import net.minecraft.item.Item; | ||
//import net.minecraft.world.World; | ||
// | ||
//public class PillowBombEntity extends BombEntity { | ||
// public PillowBombEntity(EntityType<? extends BombEntity> entityType, World world) { | ||
// super(entityType, world); | ||
// } | ||
// | ||
// public PillowBombEntity(EntityType<? extends BombEntity> entityType, World world, LivingEntity livingEntity) { | ||
// super(entityType, world, livingEntity); | ||
// } | ||
// | ||
// @Override | ||
// protected Item getDefaultItem() { | ||
// return BlastItems.PILLOW_BOMB; | ||
// } | ||
// | ||
// @Override | ||
// protected CustomExplosion getExplosion() { | ||
// return new KnockbackExplosion(this.world, this, this.getX(), this.getY(), this.getZ(), 3f); | ||
// } | ||
//} |
60 changes: 30 additions & 30 deletions
60
src/main/java/ladysnake/blast/common/entity/PillowTriggerBombEntity.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,30 +1,30 @@ | ||
package ladysnake.blast.common.entity; | ||
|
||
import ladysnake.blast.common.init.BlastItems; | ||
import ladysnake.blast.common.world.CustomExplosion; | ||
import ladysnake.blast.common.world.KnockbackExplosion; | ||
import net.minecraft.entity.EntityType; | ||
import net.minecraft.entity.LivingEntity; | ||
import net.minecraft.item.Item; | ||
import net.minecraft.world.World; | ||
|
||
public class PillowTriggerBombEntity extends TriggerBombEntity { | ||
public PillowTriggerBombEntity(EntityType<? extends BombEntity> entityType, World world) { | ||
super(entityType, world); | ||
} | ||
|
||
public PillowTriggerBombEntity(EntityType<? extends BombEntity> entityType, World world, LivingEntity livingEntity) { | ||
super(entityType, world, livingEntity); | ||
} | ||
|
||
@Override | ||
protected Item getDefaultItem() { | ||
return BlastItems.PILLOW_TRIGGER_BOMB; | ||
} | ||
|
||
@Override | ||
protected CustomExplosion getExplosion() { | ||
return new KnockbackExplosion(this.world, this, this.getX(), this.getY(), this.getZ(), 3f); | ||
} | ||
|
||
} | ||
//package ladysnake.blast.common.entity; | ||
// | ||
//import ladysnake.blast.common.init.BlastItems; | ||
//import ladysnake.blast.common.world.CustomExplosion; | ||
//import ladysnake.blast.common.world.KnockbackExplosion; | ||
//import net.minecraft.entity.EntityType; | ||
//import net.minecraft.entity.LivingEntity; | ||
//import net.minecraft.item.Item; | ||
//import net.minecraft.world.World; | ||
// | ||
//public class PillowTriggerBombEntity extends TriggerBombEntity { | ||
// public PillowTriggerBombEntity(EntityType<? extends BombEntity> entityType, World world) { | ||
// super(entityType, world); | ||
// } | ||
// | ||
// public PillowTriggerBombEntity(EntityType<? extends BombEntity> entityType, World world, LivingEntity livingEntity) { | ||
// super(entityType, world, livingEntity); | ||
// } | ||
// | ||
// @Override | ||
// protected Item getDefaultItem() { | ||
// return BlastItems.PILLOW_TRIGGER_BOMB; | ||
// } | ||
// | ||
// @Override | ||
// protected CustomExplosion getExplosion() { | ||
// return new KnockbackExplosion(this.world, this, this.getX(), this.getY(), this.getZ(), 3f); | ||
// } | ||
// | ||
//} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters