Merge pull request #41 from McMoonLakeDev/v1.9-alpha

v1.9 a5.1
McMoonLakeDev · Jun 12, 2017 · 3609f47 · 3609f47
2 parents 8790ac4 + 626fd1a
commit 3609f47
Show file tree

Hide file tree

Showing 27 changed files with 2,154 additions and 2,822 deletions.
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>com.minecraft.moonlake</groupId>
     <artifactId>MoonLake</artifactId>
     <packaging>jar</packaging>
-    <version>1.9-a5</version>
+    <version>1.9-a5.1</version>
 
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>

diff --git a/src/main/java/com/minecraft/moonlake/api/nbt/NBTEntity.java b/src/main/java/com/minecraft/moonlake/api/nbt/NBTEntity.java
@@ -69,6 +69,8 @@ public interface NBTEntity {
      * @return Entity
      * @throws NBTException 如果生成实体时错误则抛出异常
      * @throws IllegalArgumentException 如果 NBT 复合对象或目标世界对象为 {@code null} 则抛出异常
+     * @deprecated 已过时, 将于 v1.9-a6 删除.
      */
+    @Deprecated
     Entity spawnEntity(Object nbtTagCompound, World world) throws NBTException;
 }
diff --git a/src/main/java/com/minecraft/moonlake/api/nbt/NBTEntityExpression.java b/src/main/java/com/minecraft/moonlake/api/nbt/NBTEntityExpression.java
@@ -18,7 +18,9 @@
 
 package com.minecraft.moonlake.api.nbt;
 
+import com.minecraft.moonlake.api.utility.MinecraftBukkitVersion;
 import com.minecraft.moonlake.api.utility.MinecraftReflection;
+import com.minecraft.moonlake.builder.SingleParamBuilder;
 import com.minecraft.moonlake.nbt.exception.NBTException;
 import com.minecraft.moonlake.nbt.exception.NBTInitializeException;
 import com.minecraft.moonlake.reflect.FuzzyReflect;
@@ -65,7 +67,14 @@ public NBTEntityExpression() throws NBTInitializeException {
             // 这个 EntityTypes 类可以用模糊反射, 但是 Entity 类这几个函数都是同样参数同样返回值, 暂时不用
             entityTypesCreateEntityMethod = Accessors.getMethodAccessor(FuzzyReflect.fromClass(entityTypesClass, true).getMethodByParameters("a", entityClass, new Class[] { nbtTagCompoundClass, worldClass }));
             entityReadMethod = Accessors.getMethodAccessor(entityClass, "c", nbtTagCompoundClass);
-            entityPlayerReadMethod = Accessors.getMethodAccessor(entityClass, "e", nbtTagCompoundClass);
+            entityPlayerReadMethod = Accessors.getMethodAccessorBuilderBukkitVer(new SingleParamBuilder<MethodAccessor, MinecraftBukkitVersion>() {
+                @Override
+                public MethodAccessor build(MinecraftBukkitVersion param) {
+                    if(!param.isOrLater(MinecraftBukkitVersion.V1_9_R2))
+                        return Accessors.getMethodAccessor(entityClass, "e", nbtTagCompoundClass);
+                    return Accessors.getMethodAccessor(FuzzyReflect.fromClass(entityClass).getMethodByParameters("save", nbtTagCompoundClass, new Class[] { nbtTagCompoundClass }));
+                }
+            });
             entityWriteMethod = entityPlayerWriteMethod = Accessors.getMethodAccessor(entityClass, "f", nbtTagCompoundClass);
         }
         catch(Exception e) {

diff --git a/src/main/java/com/minecraft/moonlake/api/nbt/NBTExpression.java b/src/main/java/com/minecraft/moonlake/api/nbt/NBTExpression.java
@@ -182,6 +182,7 @@ public void write(Chunk chunk, NBTCompound nbt) throws NBTException {
     }
 
     @Override
+    @Deprecated
     public Entity spawnEntity(NBTCompound nbt, World world) throws NBTException {
 
         Validate.notNull(nbt, "The nbt tag object is null.");

diff --git a/src/main/java/com/minecraft/moonlake/api/nbt/NBTLibrary.java b/src/main/java/com/minecraft/moonlake/api/nbt/NBTLibrary.java
@@ -245,6 +245,8 @@ public interface NBTLibrary {
      * @return Entity
      * @throws NBTException 如果生成实体时错误则抛出异常
      * @throws IllegalArgumentException 如果实体对象或目标世界对象为 {@code null} 则抛出异常
+     * @deprecated 已过时, 将于 v1.9-a6 删除.
      */
+    @Deprecated
     Entity spawnEntity(NBTCompound nbt, World world) throws NBTException;
 }
diff --git a/src/main/java/com/minecraft/moonlake/api/nbt/NBTReflect.java b/src/main/java/com/minecraft/moonlake/api/nbt/NBTReflect.java
@@ -225,7 +225,7 @@ public Object createTag(Object value, NBTType type) throws NBTConvertException {
 
         Validate.notNull(type, "The nbt tag type object is null.");
 
-        return createTag(convertValue(value, type.getType()));
+        return createTag(convertValue(value, (byte) type.getTypeId()));
     }
 
     /**
-Original file line number
+Diff line change
@@ Expand Up @@
             Validate.notNull(type, "The nbt tag type object is null.");
-            return createTag(convertValue(value, type.getType()));
+            return createTag(convertValue(value, (byte) type.getTypeId()));
         }
         /**
@@ Expand Down @@