mirror of
https://github.com/ZareMate/kubejs.git
synced 2026-11-12 14:20:29 +00:00
fix: fixed saving issues
This commit is contained in:
+37
-12
@@ -12,7 +12,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
// Dependencies: LuckPerms
|
// Dependencies: LuckPerms
|
||||||
|
(function () {
|
||||||
var DAILY_QUESTS_FILE = "kubejs/data/dailyquests/players.json";
|
var DAILY_QUESTS_FILE = "kubejs/data/dailyquests/players.json";
|
||||||
var DAILY_QUESTS_CONFIG = "config/dailyquests.json";
|
var DAILY_QUESTS_CONFIG = "config/dailyquests.json";
|
||||||
|
|
||||||
@@ -436,7 +436,9 @@ function saveData() {
|
|||||||
try {
|
try {
|
||||||
JsonIO.write(DAILY_QUESTS_FILE, data);
|
JsonIO.write(DAILY_QUESTS_FILE, data);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error("[DailyQuests] Failed to save data: " + String(error));
|
console.error(
|
||||||
|
"[DailyQuests] Failed to save data: " + String(error),
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -617,7 +619,9 @@ function countItem(player, itemId) {
|
|||||||
total += stack.count;
|
total += stack.count;
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error("[DailyQuests] Inventory count error: " + String(error));
|
console.error(
|
||||||
|
"[DailyQuests] Inventory count error: " + String(error),
|
||||||
|
);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@@ -726,7 +730,8 @@ function tellQuest(player, category, quest, claimed) {
|
|||||||
var progress = getProgress(player, quest);
|
var progress = getProgress(player, quest);
|
||||||
|
|
||||||
var itemName =
|
var itemName =
|
||||||
quest.itemName || quest.description.replace(/^Collect\s+\d+\s+/i, "");
|
quest.itemName ||
|
||||||
|
quest.description.replace(/^Collect\s+\d+\s+/i, "");
|
||||||
|
|
||||||
var rewardName = reward && reward.name ? reward.name : reward.item;
|
var rewardName = reward && reward.name ? reward.name : reward.item;
|
||||||
|
|
||||||
@@ -800,7 +805,9 @@ function openDailyQuests(player) {
|
|||||||
|
|
||||||
tellQuest(player, "hard", hardQuest, playerData.hardClaimed);
|
tellQuest(player, "hard", hardQuest, playerData.hardClaimed);
|
||||||
|
|
||||||
player.tell(Text.of("[ REFRESH ]").aqua().clickRunCommand("/dailyquests"));
|
player.tell(
|
||||||
|
Text.of("[ REFRESH ]").aqua().clickRunCommand("/dailyquests"),
|
||||||
|
);
|
||||||
|
|
||||||
separator(player);
|
separator(player);
|
||||||
}
|
}
|
||||||
@@ -810,7 +817,11 @@ function claimQuest(player, category) {
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (category !== "easy" && category !== "medium" && category !== "hard") {
|
if (
|
||||||
|
category !== "easy" &&
|
||||||
|
category !== "medium" &&
|
||||||
|
category !== "hard"
|
||||||
|
) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -848,7 +859,9 @@ function claimQuest(player, category) {
|
|||||||
|
|
||||||
if (!reward) {
|
if (!reward) {
|
||||||
player.tell(
|
player.tell(
|
||||||
Text.of("This quest has an invalid reward configuration.").red(),
|
Text.of(
|
||||||
|
"This quest has an invalid reward configuration.",
|
||||||
|
).red(),
|
||||||
);
|
);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
@@ -861,7 +874,10 @@ function claimQuest(player, category) {
|
|||||||
|
|
||||||
player.tell(
|
player.tell(
|
||||||
Text.of(
|
Text.of(
|
||||||
"Required: " + quest.amount + " | You have: " + currentAmount,
|
"Required: " +
|
||||||
|
quest.amount +
|
||||||
|
" | You have: " +
|
||||||
|
currentAmount,
|
||||||
).gray(),
|
).gray(),
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -870,7 +886,9 @@ function claimQuest(player, category) {
|
|||||||
|
|
||||||
if (countItem(player, quest.item) < quest.amount) {
|
if (countItem(player, quest.item) < quest.amount) {
|
||||||
player.tell(
|
player.tell(
|
||||||
Text.of("Your inventory changed. The claim was cancelled.").red(),
|
Text.of(
|
||||||
|
"Your inventory changed. The claim was cancelled.",
|
||||||
|
).red(),
|
||||||
);
|
);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
@@ -981,7 +999,9 @@ function rerollPlayer(server, name) {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
data.players[savedPlayer.uuid] = createOfflinePlayerData(savedPlayer.name);
|
data.players[savedPlayer.uuid] = createOfflinePlayerData(
|
||||||
|
savedPlayer.name,
|
||||||
|
);
|
||||||
|
|
||||||
saveData();
|
saveData();
|
||||||
|
|
||||||
@@ -1055,7 +1075,8 @@ ServerEvents.commandRegistry(function (event) {
|
|||||||
return 1;
|
return 1;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error(
|
console.error(
|
||||||
"[DailyQuests] /dailyquests error: " + String(error),
|
"[DailyQuests] /dailyquests error: " +
|
||||||
|
String(error),
|
||||||
);
|
);
|
||||||
|
|
||||||
ctx.source.sendFailure(
|
ctx.source.sendFailure(
|
||||||
@@ -1104,7 +1125,10 @@ ServerEvents.commandRegistry(function (event) {
|
|||||||
Arguments.PLAYER.create(event),
|
Arguments.PLAYER.create(event),
|
||||||
).executes((ctx) => {
|
).executes((ctx) => {
|
||||||
try {
|
try {
|
||||||
var target = Arguments.PLAYER.getResult(ctx, "player");
|
var target = Arguments.PLAYER.getResult(
|
||||||
|
ctx,
|
||||||
|
"player",
|
||||||
|
);
|
||||||
|
|
||||||
if (!target) {
|
if (!target) {
|
||||||
ctx.source.sendFailure(
|
ctx.source.sendFailure(
|
||||||
@@ -1194,3 +1218,4 @@ loadConfig();
|
|||||||
loadData();
|
loadData();
|
||||||
|
|
||||||
console.log("[DailyQuests] Loaded successfully.");
|
console.log("[DailyQuests] Loaded successfully.");
|
||||||
|
})();
|
||||||
|
|||||||
+24
-11
@@ -12,8 +12,9 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
// Dependencies: LuckPerms, KubeJSHTTP
|
// Dependencies: LuckPerms, KubeJSHTTP
|
||||||
|
(function () {
|
||||||
var DISCORD_WEBHOOK_URL = "REPLACE_ME";
|
var DISCORD_WEBHOOK_URL =
|
||||||
|
"https://discord.com/api/webhooks/1544442801247494226/A-1JQpkeJ2jFFik63uEWPIV0Vd-fOcJV9KoySseGu8LO5SpkxZ23okWXxd-IMkD_tQDP";
|
||||||
|
|
||||||
var MULTIACCOUNT_PERMISSION_CHECKIP = "multiaccount.command.checkip";
|
var MULTIACCOUNT_PERMISSION_CHECKIP = "multiaccount.command.checkip";
|
||||||
var MULTIACCOUNT_PERMISSION_ALERT = "multiaccount.alert";
|
var MULTIACCOUNT_PERMISSION_ALERT = "multiaccount.alert";
|
||||||
@@ -35,7 +36,9 @@ function getLuckPerms() {
|
|||||||
try {
|
try {
|
||||||
luckPermsApi = LuckPermsApiProvider.get();
|
luckPermsApi = LuckPermsApiProvider.get();
|
||||||
|
|
||||||
console.log("[Multi-Account] luckPermsApi API loaded successfully!");
|
console.log(
|
||||||
|
"[Multi-Account] luckPermsApi API loaded successfully!",
|
||||||
|
);
|
||||||
|
|
||||||
return luckPermsApi;
|
return luckPermsApi;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
@@ -147,14 +150,14 @@ function sendDiscordNotification(player, otherPlayers) {
|
|||||||
":S>",
|
":S>",
|
||||||
color: 3447003,
|
color: 3447003,
|
||||||
footer: {
|
footer: {
|
||||||
text: "Multi-Account Watch",
|
text: "Sputnik watch",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.error("[Multi-Account Watch] Failed to send webhook: " + e);
|
console.error("[SputnikWatch] Failed to send webhook: " + e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -217,7 +220,7 @@ function sendCheckIPWebhook(player, groups) {
|
|||||||
":S>",
|
":S>",
|
||||||
color: 3447003,
|
color: 3447003,
|
||||||
footer: {
|
footer: {
|
||||||
text: "Multi-Account watch",
|
text: "Sputnik watch",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
@@ -226,7 +229,9 @@ function sendCheckIPWebhook(player, groups) {
|
|||||||
|
|
||||||
console.log("[Multi-Account] /checkip results sent to Discord.");
|
console.log("[Multi-Account] /checkip results sent to Discord.");
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.error("[Multi-Account Watch] Failed to send /checkip webhook: " + e);
|
console.error(
|
||||||
|
"[SputnikWatch] Failed to send /checkip webhook: " + e,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -336,7 +341,10 @@ ServerEvents.commandRegistry((event) => {
|
|||||||
|
|
||||||
rebuildPlayerIPMap(server);
|
rebuildPlayerIPMap(server);
|
||||||
|
|
||||||
source.sendSuccess(Text.of("§6Players sharing an IP:"), false);
|
source.sendSuccess(
|
||||||
|
Text.of("§6Players sharing an IP:"),
|
||||||
|
false,
|
||||||
|
);
|
||||||
|
|
||||||
for (var players of playerIPMap.values()) {
|
for (var players of playerIPMap.values()) {
|
||||||
if (players.size <= 1) {
|
if (players.size <= 1) {
|
||||||
@@ -350,7 +358,9 @@ ServerEvents.commandRegistry((event) => {
|
|||||||
groups.push(playerList);
|
groups.push(playerList);
|
||||||
|
|
||||||
source.sendSuccess(
|
source.sendSuccess(
|
||||||
Text.of(`§7Group ${group}: §e${playerList.join(", ")}`),
|
Text.of(
|
||||||
|
`§7Group ${group}: §e${playerList.join(", ")}`,
|
||||||
|
),
|
||||||
false,
|
false,
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -374,11 +384,13 @@ ServerEvents.commandRegistry((event) => {
|
|||||||
console.log("[Multi-Account] Script loaded successfully!");
|
console.log("[Multi-Account] Script loaded successfully!");
|
||||||
|
|
||||||
console.log(
|
console.log(
|
||||||
"[Multi-Account] /checkip permission: " + MULTIACCOUNT_PERMISSION_CHECKIP,
|
"[Multi-Account] /checkip permission: " +
|
||||||
|
MULTIACCOUNT_PERMISSION_CHECKIP,
|
||||||
);
|
);
|
||||||
|
|
||||||
console.log(
|
console.log(
|
||||||
"[Multi-Account] Chat alert permission: " + MULTIACCOUNT_PERMISSION_ALERT,
|
"[Multi-Account] Chat alert permission: " +
|
||||||
|
MULTIACCOUNT_PERMISSION_ALERT,
|
||||||
);
|
);
|
||||||
|
|
||||||
console.log("[Multi-Account] Commands: /checkip");
|
console.log("[Multi-Account] Commands: /checkip");
|
||||||
@@ -389,3 +401,4 @@ console.log(
|
|||||||
? "✓ Configured"
|
? "✓ Configured"
|
||||||
: "✗ Not configured"),
|
: "✗ Not configured"),
|
||||||
);
|
);
|
||||||
|
})();
|
||||||
|
|||||||
Reference in New Issue
Block a user