Format

DSH105 · Jan 1, 2014 · 211a75c · 211a75c
1 parent 1362c72
commit 211a75c
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...in/java/io/github/dsh105/echopet/entity/living/type/enderdragon/EntityEnderDragonPet.java b/...in/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
@@ -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);