First compile for 1.7.2

This -just- compiles. No tests, and some features are disabled, such as
item serialization for persistent desires.

Author: Tim H

pom.xml

@@ -16,7 +16,7 @@
         <dependency>
             <groupId>org.bukkit</groupId>
             <artifactId>craftbukkit</artifactId>
-            <version>1.6.4-R2.0</version>
+            <version>1.7.2-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 

src/main/java/de/kumpelblase2/remoteentities/EntityManager.java

@@ -51,7 +51,7 @@ public void run()
 					}
 					else
 					{
-						entity.getHandle().y();
+						entity.getHandle().C();
 						if(entity.getHandle().dead)
 						{
 							if(entity.despawn(DespawnReason.DEATH))
@@ -335,9 +335,9 @@ public RemoteEntity[] getRemoteEntitiesByName(String inName)
 
 		for(RemoteEntity entity : this.getAllEntities())
 		{
-			if(entity instanceof Nameable)
+			if(entity != null)
 			{
-				if(((Nameable)entity).getName().equals(inName))
+				if(entity.getName().equals(inName))
 					entities.add(entity);
 			}
 		}

src/main/java/de/kumpelblase2/remoteentities/RemoteEntities.java

@@ -20,8 +20,8 @@ public class RemoteEntities extends JavaPlugin
 {
 	private final Map<String, EntityManager> m_managers = new HashMap<String, EntityManager>();
 	private static RemoteEntities s_instance;
-	private static String COMPATIBLE_VERSION = "1.6.4";
-	private static String COMPATIBLE_REVISION = "v1_6_R3";
+	private static String COMPATIBLE_VERSION = "1.7.2";
+	private static String COMPATIBLE_REVISION = "v1_7_R1";
 	private static final String VERSION_FILE = "http://repo.infinityblade.de/re_versions.txt";
 	private static String MINECRAFT_REVISION;
 	private final ClassPool m_pool = new ClassPool();
@@ -111,8 +111,8 @@ private void checkClasses()
 	private void checkConfig()
 	{
 		this.getConfig().set("autoUpdateSources", this.getConfig().get("autoUpdateSources", false));
-		COMPATIBLE_REVISION = this.getConfig().getString("COMPATIBLE_REVISION", "1_6_R3");
-		COMPATIBLE_VERSION = this.getConfig().getString("COMPATIBLE_VERSION", "1.6.4");
+		COMPATIBLE_REVISION = this.getConfig().getString("COMPATIBLE_REVISION", "1_7_R1");
+		COMPATIBLE_VERSION = this.getConfig().getString("COMPATIBLE_VERSION", "1.7.2");
 		this.saveConfig();
 	}
 

src/main/java/de/kumpelblase2/remoteentities/api/RemoteEntity.java

@@ -1,7 +1,7 @@
 package de.kumpelblase2.remoteentities.api;
 
 import java.util.Map;
-import net.minecraft.server.v1_6_R3.EntityLiving;
+import net.minecraft.server.v1_7_R1.EntityLiving;
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;

src/main/java/de/kumpelblase2/remoteentities/api/RemoteEntityType.java

@@ -1,7 +1,7 @@
 package de.kumpelblase2.remoteentities.api;
 
 import java.util.*;
-import net.minecraft.server.v1_6_R3.EntityLiving;
+import net.minecraft.server.v1_7_R1.EntityLiving;
 import de.kumpelblase2.remoteentities.entities.*;
 
 public class RemoteEntityType

src/main/java/de/kumpelblase2/remoteentities/api/features/RemoteInventoryFeature.java

@@ -1,6 +1,6 @@
 package de.kumpelblase2.remoteentities.api.features;
 
-import org.bukkit.craftbukkit.v1_6_R3.inventory.CraftInventoryCustom;
+import org.bukkit.craftbukkit.v1_7_R1.inventory.CraftInventoryCustom;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 import de.kumpelblase2.remoteentities.api.RemoteEntity;

src/main/java/de/kumpelblase2/remoteentities/api/features/RemoteMateFeature.java

@@ -1,7 +1,7 @@
 package de.kumpelblase2.remoteentities.api.features;
 
-import net.minecraft.server.v1_6_R3.EntityAnimal;
-import net.minecraft.server.v1_6_R3.EntityLiving;
+import net.minecraft.server.v1_7_R1.EntityAnimal;
+import net.minecraft.server.v1_7_R1.EntityLiving;
 import org.bukkit.entity.LivingEntity;
 
 public abstract class RemoteMateFeature extends RemoteFeature implements MateFeature
@@ -35,13 +35,13 @@ public boolean mate(LivingEntity inPartner)
 	public boolean isAffected()
 	{
 		EntityLiving handle = this.m_entity.getHandle();
-		return !(handle instanceof EntityAnimal) || ((EntityAnimal)handle).bY();
+		return !(handle instanceof EntityAnimal) || ((EntityAnimal)handle).cc();
 	}
 
 	@Override
 	public void resetAffection()
 	{
 		if(this.m_entity.getHandle() instanceof EntityAnimal)
-			((EntityAnimal)this.m_entity.getHandle()).bZ();
+			((EntityAnimal)this.m_entity.getHandle()).cd();
 	}
 }

src/main/java/de/kumpelblase2/remoteentities/api/features/RemoteRidingFeature.java

@@ -1,6 +1,6 @@
 package de.kumpelblase2.remoteentities.api.features;
 
-import net.minecraft.server.v1_6_R3.MathHelper;
+import net.minecraft.server.v1_7_R1.MathHelper;
 import de.kumpelblase2.remoteentities.api.RemoteEntity;
 import de.kumpelblase2.remoteentities.persistence.ParameterData;
 import de.kumpelblase2.remoteentities.persistence.SerializeAs;

src/main/java/de/kumpelblase2/remoteentities/api/features/RemoteTamedRidingFeature.java

@@ -1,6 +1,6 @@
 package de.kumpelblase2.remoteentities.api.features;
 
-import net.minecraft.server.v1_6_R3.MathHelper;
+import net.minecraft.server.v1_7_R1.MathHelper;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import de.kumpelblase2.remoteentities.api.RemoteEntity;

src/main/java/de/kumpelblase2/remoteentities/api/features/RemoteTradingFeature.java

@@ -1,11 +1,11 @@
 package de.kumpelblase2.remoteentities.api.features;
 
 import java.util.*;
-import net.minecraft.server.v1_6_R3.MerchantRecipe;
-import net.minecraft.server.v1_6_R3.MerchantRecipeList;
+import net.minecraft.server.v1_7_R1.MerchantRecipe;
+import net.minecraft.server.v1_7_R1.MerchantRecipeList;
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_6_R3.entity.CraftPlayer;
-import org.bukkit.craftbukkit.v1_6_R3.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.v1_7_R1.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_7_R1.inventory.CraftItemStack;
 import org.bukkit.entity.Player;
 import org.bukkit.event.*;
 import org.bukkit.event.inventory.InventoryCloseEvent;