Merge #31

Merged
Sirherobrine23 merged 14 commits from main into stable 2021-02-09 17:53:17 +00:00
21 changed files with 4019 additions and 319 deletions
Showing only changes of commit 54a6ff7f89 - Show all commits

View File

@ -1,5 +1,5 @@
#!/bin/bash
v=`cat package.json | jq '.version' | sed "s|\"||g"`
v=`cat package.json | jq '.version' | tr "\"" " "`
d=`cat package.json | jq '.dependencies'|tr "\n" " "|sed "s|\^||g"|sed "s| ||g"`
echo "bds_api_version=${v}" >> $GITHUB_ENV
echo "bds_api_depe=${d} >> $GITHUB_ENV

View File

@ -57,7 +57,7 @@ module.exports = () => {
app.post("/service", (req, res) => {
const body = req.body
const command_bds = body.command
const tokens = JSON.parse(fs.readFileSync(path.join(bds.bds_dir, "bds_tokens.json"), "utf-8"))
const tokens = JSON.parse(fs.readFileSync(path.join(bds.bds_dir, "bds_tokens.json"), "utf8"))
var pass = false;
for (let token_verify in tokens) {
const element = tokens[token_verify].token;
@ -92,7 +92,7 @@ module.exports = () => {
app.post("/bds_download", (req, res) => {
const body = req.body
const ver = body.version
const tokens = JSON.parse(fs.readFileSync(path.join(bds.bds_dir, "bds_tokens.json"), "utf-8"))
const tokens = JSON.parse(fs.readFileSync(path.join(bds.bds_dir, "bds_tokens.json"), "utf8"))
var pass = false;
for (let token_verify in tokens) {
const element = tokens[token_verify].token;
@ -117,7 +117,7 @@ module.exports = () => {
});
app.post("/bds_command", (req, res) => {
const body = req.body
const tokens = JSON.parse(fs.readFileSync(path.join(bds.bds_dir, "bds_tokens.json"), "utf-8"))
const tokens = JSON.parse(fs.readFileSync(path.join(bds.bds_dir, "bds_tokens.json"), "utf8"))
var pass = false;
for (let token_verify in tokens) {
const element = tokens[token_verify].token;

View File

@ -4,7 +4,7 @@ module.exports.checkUser = (USERNAME) => {
const bds = require("../index")
const telegram_admin = path.join(bds.bds_dir, "telegram_admin.json")
if (fs.existsSync(telegram_admin)) {
var admins = fs.readFileSync(telegram_admin, "utf-8");
var admins = fs.readFileSync(telegram_admin, "utf8");
} else {
const config = {
"sh23_bot_not_config": {

View File

@ -116,7 +116,7 @@ if (!(fs.existsSync(bds_dir))){
// Configs
const bds_config_file = path.join(bds_dir, "bds_config.json")
if (fs.existsSync(bds_config_file)){
var bds_config = JSON.parse(fs.readFileSync(bds_config_file, "utf-8"))
var bds_config = JSON.parse(fs.readFileSync(bds_config_file, "utf8"))
} else {
const bds_config = {
"bds_platform": "bedrock",
@ -209,7 +209,7 @@ module.exports.telegram_token_save = (token) =>{
if (require("fs").existsSync(path.join(bds_dir, "telegram_token.txt"))){
console.log(`We identified the old telegram token file (${path.join (bds_dir, "telegram_token.txt")}), starting the immigration process`)
try {
const token = fs.readFileSync(path.join(bds_dir, "telegram_token.txt"), "utf-8").split("\n").join("")
const token = fs.readFileSync(path.join(bds_dir, "telegram_token.txt"), "utf8").split("\n").join("")
require("./index").telegram_token_save(token)
fs.rmSync(path.join(bds_dir, "telegram_token.txt"))
console.log("We finished migrating the old telegram token file")

View File

@ -11,7 +11,7 @@ module.exports.World_BAckup = () => {
if (bds.platform === "bedrock"){
dir_zip = path.join(bds.bds_dir_bedrock, "worlds") //`${require("../index").}/worlds/`
} else {
const world_name = JSON.parse(java_pro(fs.readFileSync(path.join(bds.bds_dir_java, "server.properties"), "utf-8").replaceAll("-", "_"))).level_name
const world_name = JSON.parse(java_pro(fs.readFileSync(path.join(bds.bds_dir_java, "server.properties"), "utf8").replaceAll("-", "_"))).level_name
dir_zip = path.join(bds.bds_dir_java, world_name) //`${require("../index").bds_dir_bedrock}/${world_name}/`
}
/**
@ -46,7 +46,7 @@ module.exports.Drive_backup = () => {
if (bds.platform === "bedrock"){
dir_zip = path.join(bds.bds_dir_bedrock, "worlds") //`${require("../index").}/worlds/`
} else {
const world_name = JSON.parse(java_pro(fs.readFileSync(path.join(bds.bds_dir_java, "server.properties"), "utf-8").replaceAll("-", "_"))).level_name
const world_name = JSON.parse(java_pro(fs.readFileSync(path.join(bds.bds_dir_java, "server.properties"), "utf8").replaceAll("-", "_"))).level_name
dir_zip = path.join(bds.bds_dir_java, world_name) //`${require("../index").bds_dir_bedrock}/${world_name}/`
}
/**

View File

@ -43,7 +43,7 @@ module.exports.start = () => {
const path = require("path");
require("open")("https://account.mojang.com/documents/minecraft_eula");
const eula_file = path.join(bds.bds_dir_java, "eula.txt")
const eula_make_true = fs.readFileSync(eula_file, "utf-8").replace("eula=false", "eula=true")
const eula_make_true = fs.readFileSync(eula_file, "utf8").replace("eula=false", "eula=true")
fs.writeFileSync(eula_file, eula_make_true)
const node_detect = process.argv[0]
if (node_detect.includes("node")){

View File

@ -29,10 +29,10 @@ module.exports = (Vdown) => {
var ZIP_FILE_PATH = require("path").join(bds.tmp_dir, mine_name);
var AdmZip = require("adm-zip");
const fs = require("fs")
if (fs.existsSync(`${server_DIR}/server.properties`)){var _old = true;var old1 = fs.readFileSync(`${server_DIR}/server.properties`, "utf-8");}
if (fs.existsSync(`${server_DIR}/permissions.json`)){var _old2 = true;var old2 = fs.readFileSync(`${server_DIR}/permissions.json`, "utf-8");}
if (fs.existsSync(`${server_DIR}/whitelist.json`)) {var _old3 = true;var old3 = fs.readFileSync(`${server_DIR}/whitelist.json`, "utf-8");}
if (fs.existsSync(`${server_DIR}/valid_known_packs.json`)){var _old4 = true;var old4 = fs.readFileSync(`${server_DIR}/valid_known_packs.json`, "utf-8");}
if (fs.existsSync(`${server_DIR}/server.properties`)){var _old = true;var old1 = fs.readFileSync(`${server_DIR}/server.properties`, "utf8");}
if (fs.existsSync(`${server_DIR}/permissions.json`)){var _old2 = true;var old2 = fs.readFileSync(`${server_DIR}/permissions.json`, "utf8");}
if (fs.existsSync(`${server_DIR}/whitelist.json`)) {var _old3 = true;var old3 = fs.readFileSync(`${server_DIR}/whitelist.json`, "utf8");}
if (fs.existsSync(`${server_DIR}/valid_known_packs.json`)){var _old4 = true;var old4 = fs.readFileSync(`${server_DIR}/valid_known_packs.json`, "utf8");}
// Unzip
var zip = new AdmZip(ZIP_FILE_PATH);
zip.extractAllTo(server_DIR, true);