From 211a75c572f2369e970b9ca506e7edf4171e401f Mon Sep 17 00:00:00 2001 From: DSH105 Date: Wed, 1 Jan 2014 14:24:32 +1100 Subject: [PATCH] Format --- .../java/io/github/dsh105/echopet/data/PetHandler.java | 2 +- .../java/io/github/dsh105/echopet/entity/PetType.java | 6 +++--- .../echopet/entity/inanimate/EntityInanimatePet.java | 1 - .../entity/inanimate/type/human/CraftHumanPet.java | 2 -- .../entity/inanimate/type/human/EntityHumanPet.java | 9 +++------ .../echopet/entity/inanimate/type/human/HumanPet.java | 2 -- .../dsh105/echopet/entity/living/CraftAgeablePet.java | 2 -- .../entity/living/type/creeper/CraftCreeperPet.java | 2 -- .../living/type/enderdragon/EntityEnderDragonPet.java | 2 +- .../echopet/entity/living/type/horse/HorseMarking.java | 2 +- 10 files changed, 9 insertions(+), 21 deletions(-) diff --git a/src/main/java/io/github/dsh105/echopet/data/PetHandler.java b/src/main/java/io/github/dsh105/echopet/data/PetHandler.java index 759ca91d..bb22a2a2 100644 --- a/src/main/java/io/github/dsh105/echopet/data/PetHandler.java +++ b/src/main/java/io/github/dsh105/echopet/data/PetHandler.java @@ -311,7 +311,7 @@ public void removePets(Player player, boolean makeDeathSound) { while (i.hasNext()) { Pet p = i.next(); if (p.getOwner().getName().equals(player.getName())) { - /*saveFileData("autosave", p); + /*saveFileData("autosave", p); ec.SPH.saveToDatabase(p, false);*/ p.removePet(makeDeathSound); i.remove(); diff --git a/src/main/java/io/github/dsh105/echopet/entity/PetType.java b/src/main/java/io/github/dsh105/echopet/entity/PetType.java index 70faf117..9d080f46 100644 --- a/src/main/java/io/github/dsh105/echopet/entity/PetType.java +++ b/src/main/java/io/github/dsh105/echopet/entity/PetType.java @@ -4,6 +4,9 @@ import io.github.dsh105.echopet.EchoPetPlugin; import io.github.dsh105.echopet.entity.inanimate.EntityInanimatePet; import io.github.dsh105.echopet.entity.inanimate.InanimatePet; +import io.github.dsh105.echopet.entity.inanimate.type.human.CraftHumanPet; +import io.github.dsh105.echopet.entity.inanimate.type.human.EntityHumanPet; +import io.github.dsh105.echopet.entity.inanimate.type.human.HumanPet; import io.github.dsh105.echopet.entity.living.EntityLivingPet; import io.github.dsh105.echopet.entity.living.LivingPet; import io.github.dsh105.echopet.entity.living.PetData; @@ -39,9 +42,6 @@ import io.github.dsh105.echopet.entity.living.type.horse.CraftHorsePet; import io.github.dsh105.echopet.entity.living.type.horse.EntityHorsePet; import io.github.dsh105.echopet.entity.living.type.horse.HorsePet; -import io.github.dsh105.echopet.entity.inanimate.type.human.CraftHumanPet; -import io.github.dsh105.echopet.entity.inanimate.type.human.EntityHumanPet; -import io.github.dsh105.echopet.entity.inanimate.type.human.HumanPet; import io.github.dsh105.echopet.entity.living.type.irongolem.CraftIronGolemPet; import io.github.dsh105.echopet.entity.living.type.irongolem.EntityIronGolemPet; import io.github.dsh105.echopet.entity.living.type.irongolem.IronGolemPet; diff --git a/src/main/java/io/github/dsh105/echopet/entity/inanimate/EntityInanimatePet.java b/src/main/java/io/github/dsh105/echopet/entity/inanimate/EntityInanimatePet.java index 0ee9421f..dc66a1d5 100644 --- a/src/main/java/io/github/dsh105/echopet/entity/inanimate/EntityInanimatePet.java +++ b/src/main/java/io/github/dsh105/echopet/entity/inanimate/EntityInanimatePet.java @@ -5,7 +5,6 @@ import io.github.dsh105.echopet.entity.CraftPet; import io.github.dsh105.echopet.entity.EntityPet; import io.github.dsh105.echopet.entity.Pet; -import io.github.dsh105.echopet.entity.living.LivingPet; import net.minecraft.server.v1_7_R1.*; import org.bukkit.Location; diff --git a/src/main/java/io/github/dsh105/echopet/entity/inanimate/type/human/CraftHumanPet.java b/src/main/java/io/github/dsh105/echopet/entity/inanimate/type/human/CraftHumanPet.java index fe685b7d..b734c25d 100644 --- a/src/main/java/io/github/dsh105/echopet/entity/inanimate/type/human/CraftHumanPet.java +++ b/src/main/java/io/github/dsh105/echopet/entity/inanimate/type/human/CraftHumanPet.java @@ -2,8 +2,6 @@ import io.github.dsh105.echopet.entity.inanimate.CraftInanimatePet; import io.github.dsh105.echopet.entity.inanimate.EntityInanimatePet; -import io.github.dsh105.echopet.entity.living.CraftLivingPet; -import io.github.dsh105.echopet.entity.living.EntityLivingPet; import org.bukkit.craftbukkit.v1_7_R1.CraftServer; public class CraftHumanPet extends CraftInanimatePet { diff --git a/src/main/java/io/github/dsh105/echopet/entity/inanimate/type/human/EntityHumanPet.java b/src/main/java/io/github/dsh105/echopet/entity/inanimate/type/human/EntityHumanPet.java index 96c3d916..2fcda0a8 100644 --- a/src/main/java/io/github/dsh105/echopet/entity/inanimate/type/human/EntityHumanPet.java +++ b/src/main/java/io/github/dsh105/echopet/entity/inanimate/type/human/EntityHumanPet.java @@ -4,14 +4,11 @@ import io.github.dsh105.dshutils.util.ReflectionUtil; import io.github.dsh105.echopet.entity.inanimate.EntityInanimatePet; import io.github.dsh105.echopet.entity.inanimate.InanimatePet; -import io.github.dsh105.echopet.entity.living.EntityLivingPet; -import io.github.dsh105.echopet.entity.living.LivingPet; import io.github.dsh105.echopet.entity.living.SizeCategory; -import net.minecraft.server.v1_7_R1.*; +import net.minecraft.server.v1_7_R1.Packet; +import net.minecraft.server.v1_7_R1.PacketPlayOutNamedEntitySpawn; +import net.minecraft.server.v1_7_R1.World; import net.minecraft.util.com.mojang.authlib.GameProfile; -import org.bukkit.Location; - -import java.lang.reflect.Field; public class EntityHumanPet extends EntityInanimatePet { diff --git a/src/main/java/io/github/dsh105/echopet/entity/inanimate/type/human/HumanPet.java b/src/main/java/io/github/dsh105/echopet/entity/inanimate/type/human/HumanPet.java index 19b32ca4..ce694174 100644 --- a/src/main/java/io/github/dsh105/echopet/entity/inanimate/type/human/HumanPet.java +++ b/src/main/java/io/github/dsh105/echopet/entity/inanimate/type/human/HumanPet.java @@ -2,9 +2,7 @@ import io.github.dsh105.echopet.entity.PetType; import io.github.dsh105.echopet.entity.inanimate.InanimatePet; -import io.github.dsh105.echopet.entity.living.LivingPet; import net.minecraft.util.com.mojang.authlib.GameProfile; -import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/src/main/java/io/github/dsh105/echopet/entity/living/CraftAgeablePet.java b/src/main/java/io/github/dsh105/echopet/entity/living/CraftAgeablePet.java index a6b429ac..7863c381 100644 --- a/src/main/java/io/github/dsh105/echopet/entity/living/CraftAgeablePet.java +++ b/src/main/java/io/github/dsh105/echopet/entity/living/CraftAgeablePet.java @@ -2,8 +2,6 @@ import org.bukkit.craftbukkit.v1_7_R1.CraftServer; import org.bukkit.entity.Ageable; -import org.bukkit.entity.AnimalTamer; -import org.bukkit.entity.Tameable; /** * Bukkit API stuff. Methods here shouldn't be accessed and controlled outside the EchoPet API diff --git a/src/main/java/io/github/dsh105/echopet/entity/living/type/creeper/CraftCreeperPet.java b/src/main/java/io/github/dsh105/echopet/entity/living/type/creeper/CraftCreeperPet.java index df9ed098..be000bb0 100644 --- a/src/main/java/io/github/dsh105/echopet/entity/living/type/creeper/CraftCreeperPet.java +++ b/src/main/java/io/github/dsh105/echopet/entity/living/type/creeper/CraftCreeperPet.java @@ -1,7 +1,5 @@ package io.github.dsh105.echopet.entity.living.type.creeper; -import io.github.dsh105.dshutils.logger.ConsoleLogger; -import io.github.dsh105.dshutils.logger.Logger; import io.github.dsh105.echopet.entity.Pet; import io.github.dsh105.echopet.entity.living.CraftLivingPet; import io.github.dsh105.echopet.entity.living.EntityLivingPet; diff --git a/src/main/java/io/github/dsh105/echopet/entity/living/type/enderdragon/EntityEnderDragonPet.java b/src/main/java/io/github/dsh105/echopet/entity/living/type/enderdragon/EntityEnderDragonPet.java index ed83bd77..132efda2 100644 --- a/src/main/java/io/github/dsh105/echopet/entity/living/type/enderdragon/EntityEnderDragonPet.java +++ b/src/main/java/io/github/dsh105/echopet/entity/living/type/enderdragon/EntityEnderDragonPet.java @@ -88,7 +88,7 @@ public void e() { float forw = ((EntityLiving) this.passenger).bf; /*float sideMot = (float) Math.pow(side, side); - float forMot = (float) Math.pow(forw, forw);*/ + float forMot = (float) Math.pow(forw, forw);*/ /*if (forMot <= 0.0F) { forMot *= 0.25F; diff --git a/src/main/java/io/github/dsh105/echopet/entity/living/type/horse/HorseMarking.java b/src/main/java/io/github/dsh105/echopet/entity/living/type/horse/HorseMarking.java index f4a1d096..c6c4c0e9 100644 --- a/src/main/java/io/github/dsh105/echopet/entity/living/type/horse/HorseMarking.java +++ b/src/main/java/io/github/dsh105/echopet/entity/living/type/horse/HorseMarking.java @@ -4,7 +4,7 @@ public enum HorseMarking { NONE(Horse.Style.NONE, 0, 1, 2, 3, 4, 5, 6), - SOCKS(Horse.Style.WHITE,256, 257, 258, 259, 260, 261, 262), + SOCKS(Horse.Style.WHITE, 256, 257, 258, 259, 260, 261, 262), WHITE_PATCH(Horse.Style.WHITEFIELD, 512, 513, 514, 515, 516, 517, 518), WHITE_SPOTS(Horse.Style.WHITE_DOTS, 768, 769, 770, 771, 772, 773, 774), BLACK_SPOTS(Horse.Style.BLACK_DOTS, 1024, 1025, 1026, 1027, 1028, 1029, 1030);