6 Commits

10 changed files with 60 additions and 22 deletions
+7 -1
View File
@@ -29,4 +29,10 @@ jobs:
with: with:
name: ${{ github.event.repository.name }}-windows-x64-${{ github.sha }} name: ${{ github.event.repository.name }}-windows-x64-${{ github.sha }}
path: | path: |
bin/ bin/DLL/
- uses: actions/upload-artifact@v3
with:
name: PDB
path: |
bin/PDB/
+27 -10
View File
@@ -29,7 +29,13 @@ jobs:
with: with:
name: ${{ github.event.repository.name }}-windows-x64-${{ github.sha }} name: ${{ github.event.repository.name }}-windows-x64-${{ github.sha }}
path: | path: |
bin/ bin/DLL/
- uses: actions/upload-artifact@v3
with:
name: PDB
path: |
bin/PDB/
upload-to-release: upload-to-release:
needs: needs:
@@ -38,24 +44,35 @@ jobs:
contents: write contents: write
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v4 - name: Checkout code
uses: actions/checkout@v4
- uses: actions/download-artifact@v3 - name: Download Plugin
uses: actions/download-artifact@v3
with: with:
name: ${{ github.event.repository.name }}-windows-x64-${{ github.sha }} name: ${{ github.event.repository.name }}-windows-x64-${{ github.sha }}
path: release/ path: release/Plugin/
- run: | - name: Download PDB
cp LICENSE README.md release/ uses: actions/download-artifact@v3
with:
name: PDB
path: release/PDB/
- name: Copy additional files
run: |
cp LICENSE README.md release/Plugin/
- name: Archive release - name: Archive release
run: | run: |
cd release cd release/Plugin
zip -r ../${{ github.event.repository.name }}-windows-x64.zip * zip -r ../${{ github.event.repository.name }}-windows-x64.zip *
cd .. cd ..
- uses: softprops/action-gh-release@v1 - name: Create GitHub Release
id: create_release
uses: softprops/action-gh-release@v1
with: with:
append_body: true
files: | files: |
${{ github.event.repository.name }}-windows-x64.zip release/${{ github.event.repository.name }}-windows-x64.zip
release/PDB/${{ github.event.repository.name }}.pdb
+3
View File
@@ -1,6 +1,9 @@
{ {
"name": "${pluginName}", "name": "${pluginName}",
"entry": "${pluginFile}", "entry": "${pluginFile}",
"version": "0.10.0",
"author": "GroupMountain",
"description": "Check Player's Inventory",
"type": "native", "type": "native",
"dependencies": [ "dependencies": [
{ {
+3 -2
View File
@@ -88,10 +88,11 @@ function pack_plugin(target,plugin_define)
local manifest_path = find_file("manifest.json", os.projectdir()) local manifest_path = find_file("manifest.json", os.projectdir())
if manifest_path then if manifest_path then
local manifest = io.readfile(manifest_path) local manifest = io.readfile(manifest_path)
local bindir = path.join(os.projectdir(), "bin") local bindir = path.join(os.projectdir(), "bin/DLL")
local pdbdir = path.join(os.projectdir(), "bin/PDB")
local outputdir = path.join(bindir, plugin_define.pluginName) local outputdir = path.join(bindir, plugin_define.pluginName)
local targetfile = path.join(outputdir, plugin_define.pluginFile) local targetfile = path.join(outputdir, plugin_define.pluginFile)
local pdbfile = path.join(outputdir, path.basename(plugin_define.pluginFile) .. ".pdb") local pdbfile = path.join(pdbdir, path.basename(plugin_define.pluginFile) .. ".pdb")
local manifestfile = path.join(outputdir, "manifest.json") local manifestfile = path.join(outputdir, "manifest.json")
local oritargetfile = target:targetfile() local oritargetfile = target:targetfile()
local oripdbfile = path.join(path.directory(oritargetfile), path.basename(oritargetfile) .. ".pdb") local oripdbfile = path.join(path.directory(oritargetfile), path.basename(oritargetfile) .. ".pdb")
+8
View File
@@ -24,6 +24,14 @@ auto enable(ll::plugin::NativePlugin& /*self*/) -> bool {
auto load(ll::plugin::NativePlugin& self) -> bool { auto load(ll::plugin::NativePlugin& self) -> bool {
selfPluginInstance = std::make_unique<std::reference_wrapper<ll::plugin::NativePlugin>>(self); selfPluginInstance = std::make_unique<std::reference_wrapper<ll::plugin::NativePlugin>>(self);
initPlugin(); initPlugin();
if (GMLIB::Version::getProtocolVersion() != TARGET_PROTOCOL) {
logger.error(tr("error.protocolMismatch.info"));
logger.error(
tr("error.protocolMismatch.version",
{std::to_string(TARGET_PROTOCOL), std::to_string(GMLIB::Version::getProtocolVersion())})
);
return false;
}
initPlayerDataCache(); initPlayerDataCache();
return true; return true;
} }
+2 -1
View File
@@ -1,7 +1,8 @@
#pragma once #pragma once
#include <include_all.h> #include <include_all.h>
#define PLUGIN_NAME "InventoryCheck" #define PLUGIN_NAME "InventoryCheck"
#define TARGET_PROTOCOL 662
extern ll::Logger logger; extern ll::Logger logger;
+2 -4
View File
@@ -101,8 +101,7 @@ std::string getNameFormUuid(mce::UUID& uuid) {
std::unordered_map<mce::UUID, std::string> generateUuidMap() { std::unordered_map<mce::UUID, std::string> generateUuidMap() {
auto allUuids = GMLIB_Player::getAllUuids(); auto allUuids = GMLIB_Player::getAllUuids();
std::unordered_map<mce::UUID, std::string> allList; std::unordered_map<mce::UUID, std::string> allList;
for (auto& strUuid : allUuids) { for (auto& uuid : allUuids) {
auto uuid = mce::UUID::fromString(strUuid);
auto name = getNameFormUuid(uuid); auto name = getNameFormUuid(uuid);
allList[uuid] = name; allList[uuid] = name;
} }
@@ -274,8 +273,7 @@ void confirmDeleteForm(Player& pl, mce::UUID uuid, std::string name) {
if (player) { if (player) {
return deleteFailedForm(pl, uuid, name); return deleteFailedForm(pl, uuid, name);
} }
auto serverId = GMLIB_Player::getServerIdFromUuid(uuid); GMLIB_Player::deletePlayerNbt(uuid);
GMLIB_Player::deletePlayerNbt(serverId);
return pl.sendMessage(tr("checkPlayer.deleteNbt.success", {name})); return pl.sendMessage(tr("checkPlayer.deleteNbt.success", {name}));
} }
return checkPlayerForm(pl, uuid); return checkPlayerForm(pl, uuid);
+4
View File
@@ -49,6 +49,8 @@ std::string defaultLanguage_en_US = R"(
checkAll.empty=You've played the entire archive alone, and you're still playing here to check the bag? \nWhy don't you go and recruit people? checkAll.empty=You've played the entire archive alone, and you're still playing here to check the bag? \nWhy don't you go and recruit people?
resumeInventory.success=Your backpack has been resumed! resumeInventory.success=Your backpack has been resumed!
resumeInventory.failed=Unable to resume your backpack, no data was found on your backpack! resumeInventory.failed=Unable to resume your backpack, no data was found on your backpack!
error.protocolMismatch.info=You are running on an unsupport protocol version! This may result in crash!
error.protocolMismatch.version=Support protocol %1$s, current protocol %2$s.
)"; )";
std::string defaultLanguage_zh_CN = R"( std::string defaultLanguage_zh_CN = R"(
@@ -99,4 +101,6 @@ std::string defaultLanguage_zh_CN = R"(
checkAll.empty=\n还不快去招人 checkAll.empty=\n还不快去招人
resumeInventory.success= resumeInventory.success=
resumeInventory.failed= resumeInventory.failed=
error.protocolMismatch.info=
error.protocolMismatch.version= %1$s %2$s
)"; )";
+3 -3
View File
@@ -1,7 +1,7 @@
{ {
"format_version": 2, "format_version": 2,
"tooth": "github.com/GroupMountain/InventoryCheck", "tooth": "github.com/GroupMountain/InventoryCheck",
"version": "0.9.0", "version": "0.10.0",
"info": { "info": {
"name": "InventoryCheck", "name": "InventoryCheck",
"description": "Check Player's Inventory", "description": "Check Player's Inventory",
@@ -14,9 +14,9 @@
"gmlib" "gmlib"
] ]
}, },
"asset_url": "https://github.com/GroupMountain/InventoryCheck/releases/download/v0.9.0/InventoryCheck-windows-x64.zip", "asset_url": "https://github.com/GroupMountain/InventoryCheck/releases/download/v0.10.0/InventoryCheck-windows-x64.zip",
"dependencies": { "dependencies": {
"github.com/GroupMountain/GMLIB": ">=0.9.0" "github.com/GroupMountain/GMLIB": ">=0.10.x"
}, },
"files": { "files": {
"place": [ "place": [