修复了Entity.getNbt和setNbt的bug，添加了ItemStack

Author: BlueBoxMirror

jni/header/bluebox_ll_entity_Player.h

@@ -0,0 +1,83 @@
+#include "../header/bluebox_ll_item_ItemStack.h"
+#include "../util/util.h"
+
+#include "mc/world/item/registry/ItemStack.h"
+
+/*
+ * Class:     bluebox_ll_item_ItemStack
+ * Method:    getCustomName
+ * Signature: ()Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_bluebox_ll_item_ItemStack_getCustomName
+  (JNIEnv *env, jobject thisObj){
+    ItemStack* item=(ItemStack*)lje::getNativePointer(env, thisObj);
+    return env->NewStringUTF(item->getCustomName().c_str());
+  }
+
+/*
+ * Class:     bluebox_ll_item_ItemStack
+ * Method:    getRawName
+ * Signature: ()Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_bluebox_ll_item_ItemStack_getRawName
+  (JNIEnv *env, jobject thisObj){
+    ItemStack* item=(ItemStack*)lje::getNativePointer(env, thisObj);
+    return env->NewStringUTF(item->getRawNameId().c_str());
+  }
+
+/*
+ * Class:     bluebox_ll_item_ItemStack
+ * Method:    getName
+ * Signature: ()Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_bluebox_ll_item_ItemStack_getName
+  (JNIEnv *env, jobject thisObj){
+    ItemStack* item=(ItemStack*)lje::getNativePointer(env, thisObj);
+    return env->NewStringUTF(item->getName().c_str());
+  }
+
+/*
+ * Class:     bluebox_ll_item_ItemStack
+ * Method:    setCustomName
+ * Signature: (Ljava/lang/String;)V
+ */
+JNIEXPORT void JNICALL Java_bluebox_ll_item_ItemStack_setCustomName
+  (JNIEnv *env, jobject thisObj, jstring jstr_name){
+    ItemStack* item=(ItemStack*)lje::getNativePointer(env, thisObj);
+    const char* name=env->GetStringUTFChars(jstr_name, NULL);
+    item->setCustomName(name);
+    env->ReleaseStringUTFChars(jstr_name, name);
+  }
+
+/*
+ * Class:     bluebox_ll_item_ItemStack
+ * Method:    getCount
+ * Signature: ()I
+ */
+JNIEXPORT jint JNICALL Java_bluebox_ll_item_ItemStack_getCount
+  (JNIEnv *env, jobject thisObj){
+    ItemStack* item=(ItemStack*)lje::getNativePointer(env, thisObj);
+    return item->mCount;
+  }
+
+/*
+ * Class:     bluebox_ll_item_ItemStack
+ * Method:    setCount
+ * Signature: (I)V
+ */
+JNIEXPORT void JNICALL Java_bluebox_ll_item_ItemStack_setCount
+  (JNIEnv *env, jobject thisObj, jint jint_count){
+    ItemStack* item=(ItemStack*)lje::getNativePointer(env, thisObj);
+    item->mCount=jint_count;
+  }
+
+/*
+ * Class:     bluebox_ll_item_ItemStack
+ * Method:    getTypeName
+ * Signature: ()Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_bluebox_ll_item_ItemStack_getTypeName
+  (JNIEnv *env, jobject thisObj){
+    ItemStack* item=(ItemStack*)lje::getNativePointer(env, thisObj);
+    return env->NewStringUTF(item->getTypeName().c_str());
+  }

jni/header/bluebox_ll_item_ItemStack.h

@@ -31,4 +31,15 @@ JNIEXPORT void JNICALL Java_bluebox_ll_entity_Player_sendChat
     packet.mMessage.assign(c_message);
     player->sendNetworkPacket(packet);
     env->ReleaseStringUTFChars(jstr_message,c_message);
+  }
+
+  /*
+ * Class:     bluebox_ll_entity_Player
+ * Method:    updateInventory
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_bluebox_ll_entity_Player_updateInventory
+  (JNIEnv *env, jobject thisObj){
+    Player* player = (Player*)lje::getNativePointer(env, thisObj);
+    player->refreshInventory();
   }

jni/jni/ItemStack.cpp

@@ -16,7 +16,7 @@ jobject newTagCompound(JNIEnv* env, const CompoundTag* compound){
     jclass jclass_NbtCompound=env->FindClass(JCLASS_COMPOUND_TAG);
     jmethodID jmethod_NbtCompound_init=env->GetMethodID(jclass_NbtCompound,"<init>","()V");
     jobject jobject_native_compound=env->NewObject(jclass_NbtCompound,jmethod_NbtCompound_init);
-    jmethodID jmethod_NbtCompound_put=env->GetMethodID(jclass_NbtCompound,"put","(Ljava/lang/String;" JCLASS_COMPOUND_TAG ")" JCLASS_COMPOUND_TAG );
+    jmethodID jmethod_NbtCompound_put=env->GetMethodID(jclass_NbtCompound,"put","(" JCLASS_String JCLASS_TAG ")" JCLASS_TAG );
     for(auto it=compound->begin();it!=compound->end();++it){
         const std::string& key=it->first;
         const Tag& tag=it->second.get();
@@ -72,7 +72,7 @@ jobject newTagList(JNIEnv* env, const ListTag* list){
     jclass jclass_NbtList=env->FindClass(JCLASS_LIST_TAG);
     jmethodID jmethod_NbtList_init=env->GetMethodID(jclass_NbtList,"<init>","()V");
     jobject jobject_native_list=env->NewObject(jclass_NbtList,jmethod_NbtList_init);
-    jmethodID jmethod_NbtList_add=env->GetMethodID(jclass_NbtList,"add","(" JCLASS_COMPOUND_TAG ")Z");
+    jmethodID jmethod_NbtList_add=env->GetMethodID(jclass_NbtList,"add","(" JCLASS_TAG ")Z");
     for(auto it=list->begin();it!=list->end();++it){
         const Tag* tag=it->get();
         jobject jobject_native_note=nullptr;
@@ -158,7 +158,7 @@ jobject newTagDouble(JNIEnv* env, const DoubleTag* value){
 }
 
 jobject newTagString(JNIEnv* env, const StringTag* value){
-    jclass jclass_NbtString=env->FindClass(JCLASS_STRING_TAG);
+    jclass jclass_NbtString=env->FindClass(JCLASS_String_TAG);
     jmethodID jmethod_NbtString_init=env->GetMethodID(jclass_NbtString,"<init>","(Ljava/lang/String;)V");
     jstring jstring_native_value=env->NewStringUTF(value->data());
     jobject jobject_native_value=env->NewObject(jclass_NbtString,jmethod_NbtString_init,jstring_native_value);
@@ -224,7 +224,7 @@ void toNativeDouble(JNIEnv *env, jobject obj, DoubleTag &tag){
     tag.data=(double)env->GetDoubleField(obj,jmethod_NbtDouble_value);
 }
 void toNativeString(JNIEnv *env, jobject obj, StringTag &tag){
-    jclass jclass_NbtString=env->FindClass(JCLASS_STRING_TAG);
+    jclass jclass_NbtString=env->FindClass(JCLASS_String_TAG);
     jfieldID jfield_NbtString_value=env->GetFieldID(jclass_NbtString,"value","Ljava/lang/String;");
     jstring jstring_value=(jstring)env->GetObjectField(obj,jfield_NbtString_value);
     const char* c_str_value=env->GetStringUTFChars(jstring_value,nullptr);
@@ -342,20 +342,23 @@ void toNativeList(JNIEnv *env, jobject thisObj, ListTag &tag){
 
 void toNativeCompound(JNIEnv *env, jobject thisObj, CompoundTag &tag){
     jclass jclass_NbtCompound=env->FindClass(JCLASS_COMPOUND_TAG);
+    jclass jclass_Iterator=env->FindClass("Ljava/util/Iterator;");
+    jclass jclass_Set=env->FindClass("Ljava/util/Set;");
     jclass jclass_Nbt=env->FindClass(JCLASS_TAG);
     jmethodID jmethod_Nbt_getId=env->GetMethodID(jclass_Nbt,"getId","()I");
     jmethodID jmethod_NbtCompound_entrySet=env->GetMethodID(jclass_NbtCompound,"entrySet","()Ljava/util/Set;");
     jobject jobject_native_entries=env->CallObjectMethod(thisObj,jmethod_NbtCompound_entrySet);
-    jclass jclass_NbtCompound_Entry=env->FindClass(PACK_JAVA_NAME("nbt/util/NbtCompound$Entry"));
-    jmethodID jmethod_NbtCompound_Entry_getKey=env->GetMethodID(jclass_NbtCompound_Entry,"getKey","()Ljava/lang/String;");
-    jmethodID jmethod_NbtCompound_Entry_getValue=env->GetMethodID(jclass_NbtCompound_Entry,"getValue","()" JCLASS_TAG);
-    jmethodID jmethod_NbtCompound_Entry_iterator=env->GetMethodID(jclass_NbtCompound_Entry,"iterator","()Ljava/util/Iterator;");
-    jmethodID jmethod_NbtCompound_Entry_hasNext=env->GetMethodID(jclass_NbtCompound_Entry,"hasNext","()Z");
-    jmethodID jmethod_NbtCompound_Entry_next=env->GetMethodID(jclass_NbtCompound_Entry,"next","()Ljava/lang/Object;");
-    jobject jobject_native_entry_iterator=env->CallObjectMethod(jobject_native_entries,jmethod_NbtCompound_Entry_iterator);
+    jclass jclass_NbtCompound_Entry=env->FindClass("Ljava/util/Map$Entry;");
+    jmethodID jmethod_NbtCompound_Entry_getKey=env->GetMethodID(jclass_NbtCompound_Entry,"getKey","()Ljava/lang/Object;");
+    jmethodID jmethod_NbtCompound_Entry_getValue=env->GetMethodID(jclass_NbtCompound_Entry,"getValue","()Ljava/lang/Object;");
+    jmethodID jmethod_Set_iterator=env->GetMethodID(jclass_Set,"iterator","()Ljava/util/Iterator;");
+    env->ExceptionDescribe();
+    jmethodID jmethod_NbtCompound_Iterator_hasNext=env->GetMethodID(jclass_Iterator,"hasNext","()Z");
+    jmethodID jmethod_NbtCompound_Iterator_next=env->GetMethodID(jclass_Iterator,"next","()Ljava/lang/Object;");
+    jobject jobject_native_entry_iterator=env->CallObjectMethod(jobject_native_entries,jmethod_Set_iterator);
 
-    while(env->CallBooleanMethod(jobject_native_entry_iterator,jmethod_NbtCompound_Entry_hasNext)){
-        jobject jobject_native_entry=env->CallObjectMethod(jobject_native_entry_iterator,jmethod_NbtCompound_Entry_next);
+    while(env->CallBooleanMethod(jobject_native_entry_iterator,jmethod_NbtCompound_Iterator_hasNext)){
+        jobject jobject_native_entry=env->CallObjectMethod(jobject_native_entry_iterator,jmethod_NbtCompound_Iterator_next);
         jstring jstring_native_key=(jstring)env->CallObjectMethod(jobject_native_entry,jmethod_NbtCompound_Entry_getKey);
         jobject jobject_native_tag=(jobject)env->CallObjectMethod(jobject_native_entry,jmethod_NbtCompound_Entry_getValue);
         const char* c_str_key=nullptr;

jni/jni/Player.cpp

@@ -14,7 +14,7 @@
 #define JCLASS_LONG_TAG         PACK_JAVA_NAME("util/nbt/TagLong")
 #define JCLASS_FLOAT_TAG        PACK_JAVA_NAME("util/nbt/TagFloat")
 #define JCLASS_DOUBLE_TAG       PACK_JAVA_NAME("util/nbt/TagDouble")
-#define JCLASS_STRING_TAG       PACK_JAVA_NAME("util/nbt/TagString")
+#define JCLASS_String_TAG       PACK_JAVA_NAME("util/nbt/TagString")
 #define JCLASS_BYTEARRAY_TAG    PACK_JAVA_NAME("util/nbt/TagByteArray")
 #define JCLASS_INTARRAY_TAG     PACK_JAVA_NAME("util/nbt/TagIntArray")
 #define JCLASS_END_TAG          PACK_JAVA_NAME("util/nbt/TagEnd")

jni/util/nbt/java_nbt.cpp

@@ -4,6 +4,7 @@
 
 #include "Entry.h"
 #include "PluginManager.h"
+#include "event/java_event.h"
 #include "ll/api/Expected.h"
 #include "ll/api/Logger.h"
 #include "ll/api/mod/Mod.h"
@@ -20,7 +21,6 @@ LJE_Manager ljeManage;
 std::shared_ptr<LJE_Manager> pluginManager;
 std::unique_ptr<LJE> instance;
 JavaVM* jvm=nullptr;
-JavaVMInitArgs vm_args;
 
 void detachCurrentThread(){
     jvm->DetachCurrentThread();
@@ -44,13 +44,14 @@ LJE_Manager& LJE::getPluginManager() { return *pluginManager; }
 bool LJE::load() {
     using namespace std;
 
-    //create java vm
     JNIEnv* env=nullptr;
+    jvm=nullptr;
     std::string option = ("-Djava.class.path=" + getSelf().getModDir().string() + "/LeviLaminaJavaEngine.jar");
     option=ll::string_utils::replaceAll(option,"/","\\");
     getSelf().getLogger().info("JVM option: " + option);
 
     JavaVMOption options[1];
+    JavaVMInitArgs vm_args;
     options[0].optionString = (char*) option.c_str();
     vm_args.version = JNI_VERSION_1_8;
     vm_args.nOptions = 1;
@@ -59,13 +60,13 @@ bool LJE::load() {
 
     auto status = JNI_CreateJavaVM(&jvm, (void**)&env, &vm_args);
     if(status!=JNI_OK){
-        getSelf().getLogger().error("Failed to create JVM");
+        getSelf().getLogger().error("Failed to create JVM:"+std::to_string(status));
         return false;
     }
     getSelf().getLogger().info("JVM created");
 
     //尝试加载类
-    jclass jclass_LeviLamina = env->FindClass(JCLASS_LEVILAMINA);
+    jclass jclass_LeviLamina = env->FindClass(JCLASS_LeviLamina);
     if(jclass_LeviLamina==nullptr){
         getSelf().getLogger().error("Failed to load LeviLamina class");
         env->ExceptionDescribe();
@@ -74,14 +75,14 @@ bool LJE::load() {
     }
 
 
-    // 注册native方法
-    //register_native_methods(env);
+    // 注册native事件
+    lje::event::registerNatives();
 
     // 启动 LeviLamina 类
     jclass jclass_File=env->FindClass("Ljava/io/File;");
-    jclass jclass_Logger=env->FindClass(JCLASS_LOGGER);
+    jclass jclass_Logger=env->FindClass(JCLASS_Logger);
     jfieldID jfield_LeviLamina_modRootDir=env->GetStaticFieldID(jclass_LeviLamina, "modRootDir", "Ljava/io/File;");
-    jfieldID jfield_LeviLamina_logger=env->GetStaticFieldID(jclass_LeviLamina, "logger", JCLASS_LOGGER);
+    jfieldID jfield_LeviLamina_logger=env->GetStaticFieldID(jclass_LeviLamina, "logger", JCLASS_Logger);
     jmethodID jmethod_LeviLamina_init=env->GetStaticMethodID(jclass_LeviLamina, "init", "()V");
     jmethodID jmethod_LeviLamina_load=env->GetStaticMethodID(jclass_LeviLamina, "load", "()V");
     jmethodID jmethod_Logger_init=env->GetMethodID(jclass_Logger, "<init>", "(J)V");
@@ -112,7 +113,7 @@ bool LJE::load() {
 bool LJE::enable() {
     JNIEnv* env=getEnv();
 
-    jclass jclass_LeviLamina = env->FindClass(JCLASS_LEVILAMINA);
+    jclass jclass_LeviLamina = env->FindClass(JCLASS_LeviLamina);
     jmethodID jmethod_enable=env->GetStaticMethodID(jclass_LeviLamina, "enable", "()V");
     env->CallStaticVoidMethod(jclass_LeviLamina, jmethod_enable);
 
@@ -123,13 +124,22 @@ bool LJE::enable() {
 
 bool LJE::disable() {
     JNIEnv* env=getEnv();
-    
-    jclass jclass_LeviLamina = env->FindClass(JCLASS_LEVILAMINA);
+    jclass jclass_LeviLamina = env->FindClass(JCLASS_LeviLamina);
     jmethodID jmethod_disable=env->GetStaticMethodID(jclass_LeviLamina, "disable", "()V");
     env->CallStaticVoidMethod(jclass_LeviLamina, jmethod_disable);
-
+    
     detachCurrentThread();
-    jvm->DestroyJavaVM();
+    getSelf().getLogger().info("destroying JVM:"+std::to_string(jvm->DestroyJavaVM()));
+    return true;
+}
+
+bool LJE::unload(){
+    auto& pluginManagerRegistry=ll::mod::ModManagerRegistry::getInstance();
+    bool isSuccess=pluginManagerRegistry.eraseManager("jvm");
+    if(!isSuccess){
+        getSelf().getLogger().error("Failed to unload plugin manager");
+        return false;
+    }
 
     return true;
 }

jni/util/nbt/java_nbt.h

@@ -4,11 +4,7 @@
 #include "ll/api/mod/NativeMod.h"
 
 #include "jni.h"
-
-#define PACK_JAVA_NAME(name) "Lbluebox/ll/" name ";"
-#define JCLASS_STRING "Ljava/lang/String;"
-#define JCLASS_LEVILAMINA PACK_JAVA_NAME("plugin/LeviLamina")
-#define JCLASS_LOGGER PACK_JAVA_NAME("Logger")
+#include "util.h"
 
 namespace lje {
 
@@ -39,7 +35,7 @@ class LJE{
 
     // TODO: Implement this method if you need to unload the mod.
     // /// @return True if the mod is unloaded successfully.
-    // bool unload();
+    bool unload();
 
 private:
     ll::mod::NativeMod& mSelf;