Compare commits
7 Commits
+1
-1
Submodule SDK-GMLIB updated: cda5bfbf85...cecc827900
+1
-1
@@ -2,7 +2,7 @@
|
|||||||
"name": "${pluginName}",
|
"name": "${pluginName}",
|
||||||
"entry": "${pluginFile}",
|
"entry": "${pluginFile}",
|
||||||
"type": "native",
|
"type": "native",
|
||||||
"version": "0.9.2",
|
"version": "0.11.0",
|
||||||
"author": "GroupMountain",
|
"author": "GroupMountain",
|
||||||
"description": "Clean Entities",
|
"description": "Clean Entities",
|
||||||
"dependencies": [
|
"dependencies": [
|
||||||
|
|||||||
@@ -57,7 +57,7 @@ bool ShouldClean(Actor* actor) {
|
|||||||
// Mobs
|
// Mobs
|
||||||
else if (en->isMob()) {
|
else if (en->isMob()) {
|
||||||
if (Config->getValue<bool>({"CleanMobs", "Enabled"}, false)) {
|
if (Config->getValue<bool>({"CleanMobs", "Enabled"}, false)) {
|
||||||
auto blacklist = Config->getValue<std::vector<std::string>>({"CleanMobs", "Blacklist"}, {});
|
auto blacklist = Config->getValue<std::vector<std::string>>({"CleanMobs", "BlackList"}, {});
|
||||||
for (auto& key : blacklist) {
|
for (auto& key : blacklist) {
|
||||||
if (isMatch(type, key)) {
|
if (isMatch(type, key)) {
|
||||||
return true;
|
return true;
|
||||||
|
|||||||
@@ -30,14 +30,15 @@ void sendVoteForm(Player* pl) {
|
|||||||
tr("cleaner.vote.no")
|
tr("cleaner.vote.no")
|
||||||
);
|
);
|
||||||
ll::service::getLevel()->forEachPlayer([&](Player& pl) -> bool {
|
ll::service::getLevel()->forEachPlayer([&](Player& pl) -> bool {
|
||||||
fm.sendTo(pl, [](Player& player, ll::form::ModalForm::SelectedButton button) {
|
fm.sendTo(pl, [](Player& player, ll::form::ModalFormResult result, ll::form::FormCancelReason reason) {
|
||||||
switch (button) {
|
if (result.has_value()) {
|
||||||
case ll::form::ModalForm::SelectedButton::Upper: {
|
switch (result.value()) {
|
||||||
|
case ll::form::ModalFormSelectedButton::Upper: {
|
||||||
voteList[player.getUuid()] = true;
|
voteList[player.getUuid()] = true;
|
||||||
player.sendMessage(tr("cleaner.vote.accept"));
|
player.sendMessage(tr("cleaner.vote.accept"));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
case ll::form::ModalForm::SelectedButton::Lower: {
|
case ll::form::ModalFormSelectedButton::Lower: {
|
||||||
voteList[player.getUuid()] = false;
|
voteList[player.getUuid()] = false;
|
||||||
player.sendMessage(tr("cleaner.vote.deny"));
|
player.sendMessage(tr("cleaner.vote.deny"));
|
||||||
return;
|
return;
|
||||||
@@ -45,6 +46,7 @@ void sendVoteForm(Player* pl) {
|
|||||||
default:
|
default:
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
});
|
});
|
||||||
return true;
|
return true;
|
||||||
});
|
});
|
||||||
@@ -104,17 +106,19 @@ void confirmForm(Player* pl) {
|
|||||||
tr("cleaner.vote.confirmOk"),
|
tr("cleaner.vote.confirmOk"),
|
||||||
tr("cleaner.vote.confirmNo")
|
tr("cleaner.vote.confirmNo")
|
||||||
);
|
);
|
||||||
fm.sendTo(*pl, [](Player& player, ll::form::ModalForm::SelectedButton button) {
|
fm.sendTo(*pl, [](Player& player, ll::form::ModalFormResult result, ll::form::FormCancelReason reason) {
|
||||||
switch (button) {
|
if (result.has_value()) {
|
||||||
case ll::form::ModalForm::SelectedButton::Upper: {
|
switch (result.value()) {
|
||||||
|
case ll::form::ModalFormSelectedButton::Upper: {
|
||||||
return voteClean(&player);
|
return voteClean(&player);
|
||||||
}
|
}
|
||||||
case ll::form::ModalForm::SelectedButton::Lower: {
|
case ll::form::ModalFormSelectedButton::Lower: {
|
||||||
return player.sendMessage(tr("cleaner.vote.cancel"));
|
return player.sendMessage(tr("cleaner.vote.cancel"));
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,7 @@
|
|||||||
|
// This file will make your plugin use LeviLamina's memory operators by default.
|
||||||
|
// This improves the memory management of your plugin and is recommended to use.
|
||||||
|
// You should not modify anything in this file.
|
||||||
|
|
||||||
|
#define LL_MEMORY_OPERATORS
|
||||||
|
|
||||||
|
#include <ll/api/memory/MemoryOperators.h>
|
||||||
+3
-3
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"format_version": 2,
|
"format_version": 2,
|
||||||
"tooth": "github.com/GroupMountain/Cleaner",
|
"tooth": "github.com/GroupMountain/Cleaner",
|
||||||
"version": "0.9.2",
|
"version": "0.11.0",
|
||||||
"info": {
|
"info": {
|
||||||
"name": "Cleaner",
|
"name": "Cleaner",
|
||||||
"description": "A Powerful Entities Cleaning up Plugin for BDS",
|
"description": "A Powerful Entities Cleaning up Plugin for BDS",
|
||||||
@@ -13,9 +13,9 @@
|
|||||||
"gmlib"
|
"gmlib"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"asset_url": "https://github.com/GroupMountain/Cleaner/releases/download/v0.9.2/Cleaner-windows-x64.zip",
|
"asset_url": "https://github.com/GroupMountain/Cleaner/releases/download/v0.11.0/Cleaner-windows-x64.zip",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"github.com/GroupMountain/GMLIB": ">=0.9.6"
|
"github.com/GroupMountain/GMLIB": ">=0.10.0"
|
||||||
},
|
},
|
||||||
"files": {
|
"files": {
|
||||||
"place": [
|
"place": [
|
||||||
|
|||||||
Reference in New Issue
Block a user