Skip to content

Commit

Permalink
Hide more pillow bomb refs
Browse files Browse the repository at this point in the history
  • Loading branch information
doctor4t committed Sep 23, 2021
1 parent 38391d8 commit d04c0be
Show file tree
Hide file tree
Showing 3 changed files with 62 additions and 62 deletions.
58 changes: 29 additions & 29 deletions src/main/java/ladysnake/blast/common/entity/PillowBombEntity.java
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);
// }
//}
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);
// }
//
//}
6 changes: 3 additions & 3 deletions src/main/java/ladysnake/blast/common/init/BlastEntities.java
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@ public static void init() {
BOMB = register("bomb", createBombEntityType(BombEntity::new));
TRIGGER_BOMB = register("trigger_bomb", createBombEntityType(TriggerBombEntity::new));
GOLDEN_BOMB = register("golden_bomb", createBombEntityType(GoldenBombEntity::new));
GOLDEN_TRIGGER_BOMB = register("golden_trigger_bomb", createBombEntityType(PillowTriggerBombEntity::new));
GOLDEN_TRIGGER_BOMB = register("golden_trigger_bomb", createBombEntityType(GoldenTriggerBombEntity::new));
DIAMOND_BOMB = register("diamond_bomb", createBombEntityType(DiamondBombEntity::new));
DIAMOND_TRIGGER_BOMB = register("diamond_trigger_bomb", createBombEntityType(DiamondTriggerBombEntity::new));
NAVAL_MINE = register("naval_mine", createBombEntityType(NavalMineEntity::new));
CONFETTI_BOMB = register("confetti_bomb", createBombEntityType(ConfettiBombEntity::new));
CONFETTI_TRIGGER_BOMB = register("confetti_trigger_bomb", createBombEntityType(ConfettiTriggerBombEntity::new));
PILLOW_BOMB = register("pillow_bomb", createBombEntityType(PillowBombEntity::new));
PILLOW_TRIGGER_BOMB = register("pillow_trigger_bomb", createBombEntityType(PillowTriggerBombEntity::new));
// PILLOW_BOMB = register("pillow_bomb", createBombEntityType(PillowBombEntity::new));
// PILLOW_TRIGGER_BOMB = register("pillow_trigger_bomb", createBombEntityType(PillowTriggerBombEntity::new));

// explosive blocks
GUNPOWDER_BLOCK = register("gunpowder_block", FabricEntityTypeBuilder.<GunpowderBlockEntity>create(SpawnGroup.MISC, GunpowderBlockEntity::new).dimensions(EntityDimensions.changing(1f, 1f)).trackRangeBlocks(64).trackedUpdateRate(1).forceTrackedVelocityUpdates(true).build());
Expand Down

0 comments on commit d04c0be

Please sign in to comment.