Cleaned up code and formatting

This commit is contained in:
70000hp 2023-09-04 18:22:31 -04:00
parent bf400c3525
commit 7c1bd3ad40
2 changed files with 53 additions and 80 deletions

View File

@ -17,108 +17,81 @@ import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World; import net.minecraft.world.World;
public class ItemBombCaller extends Item { public class ItemBombCaller extends Item {
public ItemBombCaller() { public ItemBombCaller() {
super(); super();
this.setHasSubtypes(true); this.setHasSubtypes(true);
} }
@Override @Override
public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool) public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool)
{ {
list.add("Aim & click to call an airstrike!"); list.add("Aim & click to call an airstrike!");
switch (stack.getItemDamage()) { switch (stack.getItemDamage()) {
case 0: list.add("Type: Carpet bombing"); break;
case 1: case 1: list.add("Type: Napalm"); break;
list.add("Type: Napalm"); case 2: list.add("Type: Poison gas"); break;
break; case 3: list.add("Type: Agent orange"); break;
case 2: case 4: list.add("Type: Atomic bomb"); break;
list.add("Type: Poison gas"); case 5: list.add("Type: VT stinger rockets"); break;
break; case 6: list.add("Type: PIP OH GOD"); break;
case 3: case 7: list.add("Type: Cloud the cloud oh god the cloud"); break;
list.add("Type: Agent orange"); default: list.add("Type: INVALID, Report it to mod creator");
break;
case 4:
list.add("Type: Atomic bomb");
break;
case 5:
list.add("Type: VT stinger rockets");
break;
case 6:
list.add("Type: PIP OH GOD");
break;
case 7:
list.add("Type: Cloud the cloud oh god the cloud");
break;
default:
list.add("Type: Carpet bombing");
} }
} }
@Override @Override
public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player)
{ {
MovingObjectPosition pos = Library.rayTrace(player, 500, 1); MovingObjectPosition pos = Library.rayTrace(player, 500, 1);
int x = pos.blockX; int x = pos.blockX;
int y = pos.blockY; int y = pos.blockY;
int z = pos.blockZ; int z = pos.blockZ;
if(!world.isRemote) if(!world.isRemote)
{ {
switch(stack.getItemDamage()) { EntityBomber bomber;
case 1: switch(stack.getItemDamage()) {
WorldUtil.loadAndSpawnEntityInWorld(EntityBomber.statFacNapalm(world, x, y, z));
break; case 1: bomber = EntityBomber.statFacNapalm(world, x, y, z); break;
case 2: case 2: bomber = EntityBomber.statFacChlorine(world, x, y, z); break;
WorldUtil.loadAndSpawnEntityInWorld(EntityBomber.statFacChlorine(world, x, y, z)); case 3: bomber = EntityBomber.statFacOrange(world, x, y, z); break;
break; case 4: bomber = EntityBomber.statFacABomb(world, x, y, z); break;
case 3: case 5: bomber = EntityBomber.statFacStinger(world, x, y, z); break;
WorldUtil.loadAndSpawnEntityInWorld(EntityBomber.statFacOrange(world, x, y, z)); case 6: bomber = EntityBomber.statFacBoxcar(world, x, y, z); break;
break; case 7: bomber = EntityBomber.statFacPC(world, x, y, z); break;
case 4: default: bomber = EntityBomber.statFacCarpet(world, x, y, z);
WorldUtil.loadAndSpawnEntityInWorld(EntityBomber.statFacABomb(world, x, y, z));
break;
case 5:
WorldUtil.loadAndSpawnEntityInWorld(EntityBomber.statFacStinger(world, x, y, z));
break;
case 6:
WorldUtil.loadAndSpawnEntityInWorld(EntityBomber.statFacBoxcar(world, x, y, z));
break;
case 7:
WorldUtil.loadAndSpawnEntityInWorld(EntityBomber.statFacPC(world, x, y, z));
default:
WorldUtil.loadAndSpawnEntityInWorld(EntityBomber.statFacCarpet(world, x, y, z));
} }
WorldUtil.loadAndSpawnEntityInWorld(bomber);
player.addChatMessage(new ChatComponentText("Called in airstrike!")); player.addChatMessage(new ChatComponentText("Called in airstrike!"));
world.playSoundAtEntity(player, "hbm:item.techBleep", 1.0F, 1.0F); world.playSoundAtEntity(player, "hbm:item.techBleep", 1.0F, 1.0F);
} }
stack.stackSize -= 1;
return stack;
}
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(Item p_150895_1_, CreativeTabs p_150895_2_, List p_150895_3_)
{
p_150895_3_.add(new ItemStack(p_150895_1_, 1, 0));
p_150895_3_.add(new ItemStack(p_150895_1_, 1, 1));
p_150895_3_.add(new ItemStack(p_150895_1_, 1, 2));
p_150895_3_.add(new ItemStack(p_150895_1_, 1, 3));
p_150895_3_.add(new ItemStack(p_150895_1_, 1, 4));
}
@Override stack.stackSize -= 1;
return stack;
}
@Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public boolean hasEffect(ItemStack p_77636_1_) public void getSubItems(Item p_150895_1_, CreativeTabs p_150895_2_, List p_150895_3_)
{ {
return p_77636_1_.getItemDamage() >= 4; p_150895_3_.add(new ItemStack(p_150895_1_, 1, 0));
} p_150895_3_.add(new ItemStack(p_150895_1_, 1, 1));
p_150895_3_.add(new ItemStack(p_150895_1_, 1, 2));
p_150895_3_.add(new ItemStack(p_150895_1_, 1, 3));
p_150895_3_.add(new ItemStack(p_150895_1_, 1, 4));
}
@Override
@SideOnly(Side.CLIENT)
public boolean hasEffect(ItemStack p_77636_1_)
{
return p_77636_1_.getItemDamage() >= 4;
}
} }

View File

@ -40,8 +40,8 @@ public class WorldUtil {
/*fun fact: this is based off of joinEntityInSurroundings in World /*fun fact: this is based off of joinEntityInSurroundings in World
however, since mojang is staffed by field mice, that function is client side only and half-baked however, since mojang is staffed by field mice, that function is client side only and half-baked
*/ */
public static void loadAndSpawnEntityInWorld(Entity entity) public static void loadAndSpawnEntityInWorld(Entity entity) {
{
World world = entity.worldObj; World world = entity.worldObj;
int chunkX = MathHelper.floor_double(entity.posX / 16.0D); int chunkX = MathHelper.floor_double(entity.posX / 16.0D);
int chunkZ = MathHelper.floor_double(entity.posZ / 16.0D); int chunkZ = MathHelper.floor_double(entity.posZ / 16.0D);