fix offlineplayers and chat on 1.7.9

alecgorge · May 26, 2014 · 44c653a · 44c653a
1 parent 9da8129
commit 44c653a
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 18 deletions.
diff --git a/complete_build b/complete_build
@@ -5,55 +5,55 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 cd $DIR
 
 echo "Building 1.4.7-R1.0"
-mvn clean install $@ -DmcPackage=v1_4_R1 -DcbVersion=1.4.7-R1.0 -Dmc16OrNewer=no -Dmc17OrNewer=no
+mvn clean install $@ -DmcPackage=v1_4_R1 -DcbVersion=1.4.7-R1.0 -Dmc16OrNewer=no -Dmc17OrNewer=no -Dmc179OrNewer=no
 
 rc=$?
 if [[ $rc != 0 ]] ; then
     exit $rc
 fi
 
 echo "Building 1.5.2-R1.0"
-mvn clean install $@ -DmcPackage=v1_5_R3 -DcbVersion=1.5.2-R1.0 -Dmc16OrNewer=no -Dmc17OrNewer=no
+mvn clean install $@ -DmcPackage=v1_5_R3 -DcbVersion=1.5.2-R1.0 -Dmc16OrNewer=no -Dmc17OrNewer=no -Dmc179OrNewer=no
 
 rc=$?
 if [[ $rc != 0 ]] ; then
     exit $rc
 fi
 
 echo "Building 1.6.2-R1.0"
-mvn clean install $@ -DmcPackage=v1_6_R2 -DcbVersion=1.6.2-R1.0 -Dmc16OrNewer=yes -Dmc17OrNewer=no
+mvn clean install $@ -DmcPackage=v1_6_R2 -DcbVersion=1.6.2-R1.0 -Dmc16OrNewer=yes -Dmc17OrNewer=no -Dmc179OrNewer=no
 
 rc=$?
 if [[ $rc != 0 ]] ; then
     exit $rc
 fi
 
 echo "Building 1.6.4-R2.0"
-mvn clean install $@ -DmcPackage=v1_6_R3 -DcbVersion=1.6.4-R2.0 -Dmc16OrNewer=yes -Dmc17OrNewer=no
+mvn clean install $@ -DmcPackage=v1_6_R3 -DcbVersion=1.6.4-R2.0 -Dmc16OrNewer=yes -Dmc17OrNewer=no -Dmc179OrNewer=no
 
 rc=$?
 if [[ $rc != 0 ]] ; then
     exit $rc
 fi
 
 echo "Building 1.7.2-R0.3"
-mvn clean install $@ -DmcPackage=v1_7_R1 -DcbVersion=1.7.2-R0.3 -Dmc16OrNewer=yes -Dmc17OrNewer=yes
+mvn clean install $@ -DmcPackage=v1_7_R1 -DcbVersion=1.7.2-R0.3 -Dmc16OrNewer=yes -Dmc17OrNewer=yes -Dmc179OrNewer=no
 
 rc=$?
 if [[ $rc != 0 ]] ; then
     exit $rc
 fi
 
 echo "Building 1.7.5-R0.1-SNAPSHOT"
-mvn clean install $@ -DmcPackage=v1_7_R2 -DcbVersion=1.7.5-R0.1-SNAPSHOT -Dmc16OrNewer=yes -Dmc17OrNewer=yes
+mvn clean install $@ -DmcPackage=v1_7_R2 -DcbVersion=1.7.5-R0.1-SNAPSHOT -Dmc16OrNewer=yes -Dmc17OrNewer=yes -Dmc179OrNewer=no
 
 rc=$?
 if [[ $rc != 0 ]] ; then
     exit $rc
 fi
 
 echo "Building 1.7.9-R0.2-SNAPSHOT"
-mvn clean install $@ -DmcPackage=v1_7_R3 -DcbVersion=1.7.9-R0.2-SNAPSHOT -Dmc16OrNewer=yes -Dmc17OrNewer=yes
+mvn clean install $@ -DmcPackage=v1_7_R3 -DcbVersion=1.7.9-R0.2-SNAPSHOT -Dmc16OrNewer=yes -Dmc17OrNewer=yes -Dmc179OrNewer=yes
 
 rc=$?
 if [[ $rc != 0 ]] ; then

diff --git a/jsonapi b/jsonapi
@@ -43,7 +43,8 @@ available_versions = Object.keys(versions)
 build_cmd = (ver, cmd = "clean install") ->
 	mc16OrNewer = if parseFloat(ver.cb_version.substr(0, 3)) >= 1.6 then "yes" else "no"
 	mc17OrNewer = if parseFloat(ver.cb_version.substr(0, 3)) >= 1.7 then "yes" else "no"
-	return "mvn #{cmd} $@ -DmcPackage=#{ver.package} -DcbVersion=#{ver.cb_version} -Dmc16OrNewer=#{mc16OrNewer} -Dmc17OrNewer=#{mc17OrNewer}"
+	mc179OrNewer = if parseFloat(ver.cb_version.substr(2, 3)) >= 7.9 then "yes" else "no"
+	return "mvn #{cmd} $@ -DmcPackage=#{ver.package} -DcbVersion=#{ver.cb_version} -Dmc16OrNewer=#{mc16OrNewer} -Dmc17OrNewer=#{mc17OrNewer} -Dmc179OrNewer=#{mc179OrNewer}"
 eclipse_cmd = (ver) ->
 	return build_cmd ver, "eclipse:eclipse"
 build = (to_build) ->

diff --git a/pom.xml b/pom.xml
@@ -105,6 +105,10 @@
 							<name>mc17OrNewer</name>
 							<value>${mc17OrNewer}</value>
 						</property>
+						<property>
+							<name>mc179OrNewer</name>
+							<value>${mc179OrNewer}</value>
+						</property>
 						<property>
 							<name>jsonapiDebug</name>
 							<value>${jsonapiDebug}</value>

diff --git a/sdk/testv2.php b/sdk/testv2.php
@@ -16,13 +16,13 @@ function gen_key($name) {
 }
 
 
-$methodName = "server";
+$methodName = "chat.with_name";
 $payload = array(
 	array(
 		'name' => $methodName,
 		'key' => gen_key($methodName),
 		'username' => $username,
-		'arguments' => [],
+		'arguments' => ['text', 'alecgorgd'],
 		'tag' => '1'
 	),
 	// array(
@@ -109,7 +109,7 @@ function gen_key($name) {
 	echo "<pre>";
 }
 
-$stream = true;
+$stream = false;
 if($stream) {
 	$url = sprintf("http://%s:%d/api/2/subscribe?json=%s", $host, $port, rawurlencode(json_encode($streamPayload)));
 	echo $url ."\n";

diff --git a/src/main/java/com/alecgorge/minecraft/jsonapi/util/OfflinePlayerLoader.java b/src/main/java/com/alecgorge/minecraft/jsonapi/util/OfflinePlayerLoader.java
@@ -1,6 +1,8 @@
 package com.alecgorge.minecraft.jsonapi.util;
 
 import java.io.File;
+import java.util.UUID;
+import java.lang.reflect.Method;
 
 //#ifdefined mcversion
 //$import net.minecraft.server./*$mcversion$*/.*;
@@ -16,13 +18,18 @@
 import org.bukkit.Bukkit;
 import org.bukkit.World;
 import org.bukkit.entity.Player;
+import org.bukkit.OfflinePlayer;
+
+import com.alecgorge.minecraft.jsonapi.JSONAPI;
 
 public class OfflinePlayerLoader {
 	public static Player load(String exactPlayerName) {
 		// big thanks to
 		// https://github.com/lishd/OpenInv/blob/master/src/com/lishid/openinv/internal/craftbukkit/PlayerDataManager.java
 		// Offline inv here...
 
+		OfflinePlayer player = Bukkit.getOfflinePlayer(exactPlayerName);
+
 		int index = 0;
 		for (World w : Bukkit.getWorlds()) {
 			try {
@@ -31,9 +38,13 @@ public static Player load(String exactPlayerName) {
 				// Find the player folder
 				File playerfolder = new File(w.getWorldFolder(), "players");
 				if (!playerfolder.exists()) {
-					return null;
+					playerfolder = new File(w.getWorldFolder(), "playerdata");
 				}
-
+
+				if(!playerfolder.exists()) {
+					continue;
+				}
+
 				Player target = null;
 				MinecraftServer server = null;
 				try {
@@ -43,10 +54,29 @@ public static Player load(String exactPlayerName) {
 				}
 
 				// Create an entity to load the player data
-				//#if mc17OrNewer=="yes"
-				EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(index), new GameProfile(null, exactPlayerName), new PlayerInteractManager(server.getWorldServer(index)));				
+				//#if mc179OrNewer=="yes"
+				//$UUID id = null;
+				//$
+				//$if(player == null) {
+				//$	id = UUID.randomUUID();
+				//$}
+				//$else {
+				//$	id = player.getUniqueId();
+				//$}
+				//$
+				//$try {
+				//$	Method m = OfflinePlayer.class.getMethod("getUniqueId", new Class<?>[]{});
+				//$	id = (UUID)m.invoke(player, new Object[]{});
+				//$}
+				//$catch(Exception e) {}
+				//$
+				//$EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(index), new GameProfile(id, exactPlayerName), new PlayerInteractManager(server.getWorldServer(index)));
 				//#else
-				//$EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(index), exactPlayerName, new PlayerInteractManager(server.getWorldServer(index)));
+					//#if mc17OrNewer=="yes"				
+					EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(index), new GameProfile(null, exactPlayerName), new PlayerInteractManager(server.getWorldServer(index)));				
+					//#else
+					//$EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(index), exactPlayerName, new PlayerInteractManager(server.getWorldServer(index)));
+					//#endif
 				//#endif
 
 				// Get the bukkit entity

diff --git a/src/resources/plugin.yml b/src/resources/plugin.yml
@@ -1,6 +1,6 @@
 name: JSONAPI
 main: com.alecgorge.minecraft.jsonapi.JSONAPI
-version: 5.5.3
+version: 5.6.0
 description: Control your server and fetch information from your server.
 website: http://mcjsonapi.com/
 author: Alec Gorge

diff --git a/test_179 b/test_179
@@ -3,5 +3,5 @@
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 cd $DIR
-mvn clean install $@ -DmcPackage=v1_7_R3 -DcbVersion=1.7.9-R0.2-SNAPSHOT -Dmc16OrNewer=yes -Dmc17OrNewer=yes && cd test/ && java -Xmx256M -jar craftbukkit-1.7.9-R0.2-SNAPSHOT.jar
+mvn clean install $@ -DmcPackage=v1_7_R3 -DcbVersion=1.7.9-R0.2-SNAPSHOT -Dmc16OrNewer=yes -Dmc17OrNewer=yes -Dmc179OrNewer=yes && cd test/ && java -Xmx256M -jar craftbukkit-1.7.9-R0.2-SNAPSHOT.jar
 cd $DIR