From 20bef6e26d948698398bd16aeab8c9e6b89110e4 Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Thu, 22 Aug 2019 20:01:40 -0400 Subject: Format/import cleanup --- .../darkknight/jewelrycraft/item/ItemSpawnEgg.java | 92 +++++++--------------- 1 file changed, 28 insertions(+), 64 deletions(-) (limited to 'src/main/java/darkknight/jewelrycraft/item/ItemSpawnEgg.java') diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemSpawnEgg.java b/src/main/java/darkknight/jewelrycraft/item/ItemSpawnEgg.java index bb57f9a..265e692 100755 --- a/src/main/java/darkknight/jewelrycraft/item/ItemSpawnEgg.java +++ b/src/main/java/darkknight/jewelrycraft/item/ItemSpawnEgg.java @@ -30,14 +30,9 @@ import net.minecraft.world.World; public class ItemSpawnEgg extends ItemMonsterPlacer { private static final Map eggTypes = new LinkedHashMap(); - public static void registerSpawnEgg( - Class entity, - String entityName, int id, int eggBackgroundColor, - int eggForegroundColor) { - eggTypes.put((short) id, - new EggData(id, entityName, entity, - eggBackgroundColor, - eggForegroundColor)); + public static void registerSpawnEgg(Class entity, String entityName, int id, + int eggBackgroundColor, int eggForegroundColor) { + eggTypes.put((short) id, new EggData(id, entityName, entity, eggBackgroundColor, eggForegroundColor)); } private static EggData getEggData(ItemStack is) { @@ -51,23 +46,19 @@ public class ItemSpawnEgg extends ItemMonsterPlacer { @Override public String getItemStackDisplayName(ItemStack is) { - String s = StatCollector.translateToLocal( - getUnlocalizedName() + ".name").trim(); + String s = StatCollector.translateToLocal(getUnlocalizedName() + ".name").trim(); String mob = ""; EggData egg = getEggData(is); if (egg != null) - mob = StatCollector.translateToLocal("entity." - + Variables.MODID + "." - + egg.entityName + ".name"); + mob = StatCollector.translateToLocal("entity." + Variables.MODID + "." + egg.entityName + ".name"); return String.format(s, mob); } @Override - public boolean onItemUse(ItemStack is, EntityPlayer player, - World world, int x, int y, int z, int side, - float hitX, float hitY, float hitZ) { + public boolean onItemUse(ItemStack is, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, + float hitY, float hitZ) { if (world.isRemote) return true; @@ -78,11 +69,7 @@ public class ItemSpawnEgg extends ItemMonsterPlacer { EggData egg = getEggData(is); if (egg != null) { - egg.spawnMob(world, x + 0.5D, y + (side == 1 - && block != null - && block.getRenderType() == 11 - ? 0.5D - : 0D), + egg.spawnMob(world, x + 0.5D, y + (side == 1 && block != null && block.getRenderType() == 11 ? 0.5D : 0D), z + 0.5D, is); if (!player.capabilities.isCreativeMode) @@ -93,24 +80,19 @@ public class ItemSpawnEgg extends ItemMonsterPlacer { } @Override - public ItemStack onItemRightClick(ItemStack is, World world, - EntityPlayer player) { + public ItemStack onItemRightClick(ItemStack is, World world, EntityPlayer player) { if (world.isRemote) return is; - MovingObjectPosition mop = getMovingObjectPositionFromPlayer( - world, player, true); + MovingObjectPosition mop = getMovingObjectPositionFromPlayer(world, player, true); if (mop != null && mop.typeOfHit == MovingObjectType.BLOCK) { int x = mop.blockX, y = mop.blockY, z = mop.blockZ; - if (!world.canMineBlock(player, x, y, z) - || !player.canPlayerEdit(x, y, z, - mop.sideHit, is)) + if (!world.canMineBlock(player, x, y, z) || !player.canPlayerEdit(x, y, z, mop.sideHit, is)) return is; - if (world.getBlock(x, y, z) - .getMaterial() == Material.water) { + if (world.getBlock(x, y, z).getMaterial() == Material.water) { EggData egg = getEggData(is); if (egg != null) { egg.spawnMob(world, x, y, z, is); @@ -124,8 +106,7 @@ public class ItemSpawnEgg extends ItemMonsterPlacer { return is; } - public static EntityLiving getEntity(World world, double x, - double y, double z, ItemStack is) { + public static EntityLiving getEntity(World world, double x, double y, double z, ItemStack is) { EggData egg = getEggData(is); return egg.spawnMob(world, x, y, z, is); } @@ -134,10 +115,7 @@ public class ItemSpawnEgg extends ItemMonsterPlacer { @SideOnly(Side.CLIENT) public int getColorFromItemStack(ItemStack is, int pass) { EggData egg = getEggData(is); - return egg != null - ? pass == 0 ? egg.primaryColor - : egg.secondaryColor - : 16777215; + return egg != null ? pass == 0 ? egg.primaryColor : egg.secondaryColor : 16777215; } @Override @@ -148,28 +126,20 @@ public class ItemSpawnEgg extends ItemMonsterPlacer { } static class EggData { - private final short id; - String entityName; - private final Class entityClass; - int primaryColor; - int secondaryColor; - - EggData(int id, String entityName, - Class entityClass, - int[] rgbPrimaryColor, + private final short id; + String entityName; + private final Class entityClass; + int primaryColor; + int secondaryColor; + + EggData(int id, String entityName, Class entityClass, int[] rgbPrimaryColor, int[] rgbSecondaryColor) { - this(id, entityName, entityClass, - rgbPrimaryColor[0] << 16 - | rgbPrimaryColor[1] << 8 - | rgbPrimaryColor[2], - rgbSecondaryColor[0] << 16 - | rgbSecondaryColor[1] << 8 - | rgbSecondaryColor[2]); + this(id, entityName, entityClass, rgbPrimaryColor[0] << 16 | rgbPrimaryColor[1] << 8 | rgbPrimaryColor[2], + rgbSecondaryColor[0] << 16 | rgbSecondaryColor[1] << 8 | rgbSecondaryColor[2]); } - EggData(int id, String entityName, - Class entityClass, - int primaryColor, int secondaryColor) { + EggData(int id, String entityName, Class entityClass, int primaryColor, + int secondaryColor) { this.id = (short) id; this.entityName = entityName; this.entityClass = entityClass; @@ -177,13 +147,11 @@ public class ItemSpawnEgg extends ItemMonsterPlacer { this.secondaryColor = secondaryColor; } - public EntityLiving spawnMob(World world, double x, - double y, double z, ItemStack is) { + public EntityLiving spawnMob(World world, double x, double y, double z, ItemStack is) { EntityLiving e = null; try { - e = entityClass.getConstructor(World.class) - .newInstance(world); + e = entityClass.getConstructor(World.class).newInstance(world); } catch (Exception ex) { ex.printStackTrace(); return null; @@ -208,11 +176,7 @@ public class ItemSpawnEgg extends ItemMonsterPlacer { else ((EntityHeart) e).setType("Red"); } - e.setLocationAndAngles(x, y, z, MathHelper - .wrapAngleTo180_float(world.rand - .nextFloat() - * 360F), - 0F); + e.setLocationAndAngles(x, y, z, MathHelper.wrapAngleTo180_float(world.rand.nextFloat() * 360F), 0F); e.rotationYawHead = e.rotationYaw; e.renderYawOffset = e.rotationYaw; e.onSpawnWithEgg((IEntityLivingData) null); -- cgit v1.2.3