Skip to content
This repository was archived by the owner on Apr 18, 2022. It is now read-only.

Commit 70b8785

Browse files
MinimineLPMinimineLP
committed
some fixes
some fixes
1 parent 780952a commit 70b8785

152 files changed

Lines changed: 4648 additions & 3392 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.atomignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
node_modules
2+
*.7z
3+
package-lock.json
4+
*.map

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
node_modules
2-
.atomignore
32
.mcscriptStudioCodeIgnore
43
.mcscriptStudioCode
54
builds/linux/ia32/mcscriptStudioCode-linux-ia32
@@ -8,6 +7,8 @@ builds/win32/ia32/mcscriptStudioCode-win32-ia32
87
builds/win32/x64/mcscriptStudioCode-win32-x64
98
backups
109
backup-plugins.bat
10+
backup-app.bat
11+
plugins/types
1112
config.yml
1213
full
1314
minified

‎app/gulpfile.js‎

Lines changed: 79 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,46 @@
1-
const gulp = require(`gulp`),
2-
sass = require(`gulp-sass`),
3-
cleanCSS = require(`gulp-clean-css`),
4-
autoprefixer = require(`gulp-autoprefixer`),
5-
rename = require(`gulp-rename`),
6-
uglify = require(`gulp-uglify`),
7-
plumber = require(`gulp-plumber`),
8-
babel = require(`gulp-babel`),
9-
clean = require(`gulp-clean`),
10-
sourcemaps = require(`gulp-sourcemaps`),
11-
htmlmin = require(`gulp-html-minifier`)
12-
ts = require('gulp-typescript');;
13-
14-
const src = "src/",
15-
dist = "src/";
1+
const gulp = require(`gulp`),
2+
sass = require(`gulp-sass`),
3+
cleanCSS = require(`gulp-clean-css`),
4+
autoprefixer = require(`gulp-autoprefixer`),
5+
rename = require(`gulp-rename`),
6+
uglify = require(`gulp-uglify`),
7+
plumber = require(`gulp-plumber`),
8+
babel = require(`gulp-babel`),
9+
clean = require(`gulp-clean`),
10+
sourcemaps = require(`gulp-sourcemaps`),
11+
htmlmin = require(`gulp-html-minifier`)
12+
ts = require('gulp-typescript');;
13+
14+
const src = "src/",
15+
dist = "src/";
1616

1717
/**
1818
* SASS Task
1919
*/
2020
gulp.task("sass", function() {
21-
gulp.src(dist+'css/*.css').pipe(clean());
22-
gulp.src(dist+'css/*.css.map').pipe(clean());
21+
gulp.src(dist + 'css/*.css').pipe(clean());
22+
gulp.src(dist + 'css/*.css.map').pipe(clean());
2323

2424
// compile sass to normal files
2525
gulp.src(src + 'sass/*.sass')
2626
.pipe(plumber())
2727
.pipe(sourcemaps.init())
28-
.pipe(sass())
29-
.pipe(autoprefixer())
28+
.pipe(sass())
29+
.pipe(autoprefixer())
3030
.pipe(sourcemaps.write('.'))
31-
.pipe(gulp.dest(dist+'css/'));
31+
.pipe(gulp.dest(dist + 'css/'));
3232
// compile sass to minified files
3333
gulp.src(src + 'sass/*.sass')
3434
.pipe(plumber())
3535
.pipe(sourcemaps.init())
36-
.pipe(sass())
37-
.pipe(autoprefixer())
38-
.pipe(cleanCSS())
39-
.pipe(rename({suffix: '.min'}))
36+
.pipe(sass())
37+
.pipe(autoprefixer())
38+
.pipe(cleanCSS())
39+
.pipe(rename({
40+
suffix: '.min'
41+
}))
4042
.pipe(sourcemaps.write('.'))
41-
.pipe(gulp.dest(dist+'css/'));
43+
.pipe(gulp.dest(dist + 'css/'));
4244
});
4345
/*
4446
gulp.task("typescript1", function() {
@@ -70,14 +72,13 @@ gulp.task("typescript2", function() {
7072

7173
gulp.src(src + 'scripts/*.ts')
7274
.pipe(plumber())
73-
.pipe(sourcemaps.init())
74-
.pipe(tsProject({}))
75-
.on("error", console.log)
76-
.pipe(babel({presets: ["babel-preset-env"].map(require.resolve)}))
77-
.pipe(uglify())
78-
//.pipe(rename({suffix: '.min'}))
79-
.pipe(sourcemaps.write('.'))
80-
.pipe(gulp.dest(dist+'scripts/'));
75+
.pipe(tsProject({}))
76+
.on("error", console.log)
77+
.pipe(babel({
78+
presets: ["babel-preset-env"].map(require.resolve)
79+
}))
80+
.pipe(uglify())
81+
.pipe(gulp.dest(dist + 'scripts/'));
8182
});
8283

8384

@@ -90,12 +91,12 @@ gulp.task("types", function() {
9091

9192
gulp.src('types/mcscriptstudiocode/*.ts')
9293
.pipe(plumber())
93-
.pipe(sourcemaps.init())
94-
.pipe(tsProject({}))
95-
.on("error", console.log)
96-
.pipe(babel({presets: ["babel-preset-env"].map(require.resolve)}))
97-
.pipe(uglify())
98-
.pipe(sourcemaps.write('.'))
94+
.pipe(tsProject({}))
95+
.on("error", console.log)
96+
.pipe(babel({
97+
presets: ["babel-preset-env"].map(require.resolve)
98+
}))
99+
.pipe(uglify())
99100
.pipe(gulp.dest('types/mcscriptstudiocode/'));
100101

101102
tsProject = ts.createProject('tsconfig.json');
@@ -105,43 +106,43 @@ gulp.task("types", function() {
105106

106107
gulp.src('types/@mcscriptstudiocode/mcscriptstudiocode/*.ts')
107108
.pipe(plumber())
108-
.pipe(sourcemaps.init())
109-
.pipe(tsProject({}))
110-
.on("error", console.log)
111-
.pipe(babel({presets: ["babel-preset-env"].map(require.resolve)}))
112-
.pipe(uglify())
113-
.pipe(sourcemaps.write('.'))
109+
.pipe(tsProject({}))
110+
.on("error", console.log)
111+
.pipe(babel({
112+
presets: ["babel-preset-env"].map(require.resolve)
113+
}))
114+
.pipe(uglify())
114115
.pipe(gulp.dest('types/@mcscriptstudiocode/mcscriptstudiocode/'));
115116

116-
tsProject = ts.createProject('tsconfig.json');
117-
118-
gulp.src('types/@mcscriptstudiocode/pluginmanager/*.js').pipe(clean());
119-
gulp.src('types/@mcscriptstudiocode/pluginmanager/*.js.map').pipe(clean());
120-
121-
gulp.src('types/@mcscriptstudiocode/pluginmanager/*.ts')
122-
.pipe(plumber())
123-
.pipe(sourcemaps.init())
124-
.pipe(tsProject({}))
125-
.on("error", console.log)
126-
.pipe(babel({presets: ["babel-preset-env"].map(require.resolve)}))
127-
.pipe(uglify())
128-
.pipe(sourcemaps.write('.'))
129-
.pipe(gulp.dest('types/@mcscriptstudiocode/pluginmanager/'));
130-
131-
tsProject = ts.createProject('tsconfig.json');
132-
133-
gulp.src('types/@mcscriptstudiocode/config/*.js').pipe(clean());
134-
gulp.src('types/@mcscriptstudiocode/config/*.js.map').pipe(clean());
135-
136-
gulp.src('types/@mcscriptstudiocode/config/*.ts')
137-
.pipe(plumber())
138-
.pipe(sourcemaps.init())
139-
.pipe(tsProject({}))
140-
.on("error", console.log)
141-
.pipe(babel({presets: ["babel-preset-env"].map(require.resolve)}))
142-
.pipe(uglify())
143-
.pipe(sourcemaps.write('.'))
144-
.pipe(gulp.dest('types/@mcscriptstudiocode/config/'));
117+
tsProject = ts.createProject('tsconfig.json');
118+
119+
gulp.src('types/@mcscriptstudiocode/pluginmanager/*.js').pipe(clean());
120+
gulp.src('types/@mcscriptstudiocode/pluginmanager/*.js.map').pipe(clean());
121+
122+
gulp.src('types/@mcscriptstudiocode/pluginmanager/*.ts')
123+
.pipe(plumber())
124+
.pipe(tsProject({}))
125+
.on("error", console.log)
126+
.pipe(babel({
127+
presets: ["babel-preset-env"].map(require.resolve)
128+
}))
129+
.pipe(uglify())
130+
.pipe(gulp.dest('types/@mcscriptstudiocode/pluginmanager/'));
131+
132+
tsProject = ts.createProject('tsconfig.json');
133+
134+
gulp.src('types/@mcscriptstudiocode/config/*.js').pipe(clean());
135+
gulp.src('types/@mcscriptstudiocode/config/*.js.map').pipe(clean());
136+
137+
gulp.src('types/@mcscriptstudiocode/config/*.ts')
138+
.pipe(plumber())
139+
.pipe(tsProject({}))
140+
.on("error", console.log)
141+
.pipe(babel({
142+
presets: ["babel-preset-env"].map(require.resolve)
143+
}))
144+
.pipe(uglify())
145+
.pipe(gulp.dest('types/@mcscriptstudiocode/config/'));
145146
});
146147

147148

@@ -150,10 +151,10 @@ gulp.task("types", function() {
150151
/**
151152
* Default Task
152153
*/
153-
gulp.task("default", function(){
154+
gulp.task("default", function() {
154155
gulp.start("sass");
155156
gulp.start("typescript2");
156157

157-
gulp.watch([src + 'sass/*.sass'],['sass']);
158-
gulp.watch([src + 'scripts/*.ts'],['typescript2']);
159-
});
158+
gulp.watch([src + 'sass/*.sass'], ['sass']);
159+
gulp.watch([src + 'scripts/*.ts'], ['typescript2']);
160+
});

‎app/index.js‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,27 @@ var SiteAPI = require("./src/scripts/SiteApi");
66
var electron = require("electron");
77
var node_console = require("console");
88
document.write("<!DOCTYPE html><html lang=\"en\" dir=\"ltr\"><head><meta charset=\"utf-8\"><title>MCScript Studio Code</title></head><body></body></html>\"");
9-
global.working_dir = electron.ipcRenderer.sendSync('get_folder', "get_folder")[0];
9+
global.working_dir = electron.ipcRenderer.sendSync("get_folder", "get_folder")[0];
1010
window.alert = function (content) {
11-
return electron.ipcRenderer.sendSync('alert', content.toString());
11+
return electron.ipcRenderer.sendSync("alert", content.toString());
1212
};
1313
window.prompt = function (title, val) {
14-
return electron.ipcRenderer.sendSync('prompt', { title: title, val: val });
14+
return electron.ipcRenderer.sendSync("prompt", { title: title, val: val });
1515
};
16-
var datafolder = (process.env.APPDATA || (process.platform == 'darwin' ? process.env.HOME + 'Library/Preferences' : '/var/local')) + "/mcscriptStudioCode";
17-
var assets = __dirname.replace(/\\/g, "/") + '/../assets';
16+
var datafolder = (process.env.APPDATA ||
17+
(process.platform == "darwin"
18+
? process.env.HOME + "Library/Preferences"
19+
: "/var/local")) + "/mcscriptStudioCode";
1820
if (!fs.existsSync(datafolder))
1921
fs.mkdirSync(datafolder);
2022
var manager = new PluginManager_1.PluginManager();
2123
console.log(datafolder + "/plugins");
2224
manager.loadPlugins(datafolder + "/plugins");
23-
SiteAPI.loadSite({ host: "raw.githubusercontent.com", path: '/MinimineLP/MCScriptStudioCode-core-plugins/master/plugins-core.json', protocoll: 'https' }, function (ret) {
25+
SiteAPI.loadSite({
26+
host: "raw.githubusercontent.com",
27+
path: "/MinimineLP/MCScriptStudioCode-core-plugins/master/plugins-core.json",
28+
protocoll: "https"
29+
}, function (ret) {
2430
for (var _i = 0, _a = JSON.parse(ret); _i < _a.length; _i++) {
2531
var url = _a[_i];
2632
manager.installPlugin(url, datafolder + "/plugins");
@@ -29,7 +35,7 @@ SiteAPI.loadSite({ host: "raw.githubusercontent.com", path: '/MinimineLP/MCScrip
2935
manager.api.addStylesheet(__dirname + "/src/css/style.css");
3036
manager.setupPlugins();
3137
manager.startPlugins();
32-
window.addEventListener('unload', function (event) {
38+
window.addEventListener("unload", function () {
3339
manager.stopPlugins();
3440
node_console.log("window closes");
3541
});

‎app/index.ts‎

Lines changed: 42 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,60 @@
1-
import * as fs from 'fs';
2-
import {PluginManager} from './src/scripts/PluginManager';
3-
import * as SiteAPI from './src/scripts/SiteApi';
4-
import * as electron from 'electron';
5-
import * as node_console from 'console';
1+
import * as fs from "fs";
2+
import { PluginManager } from "./src/scripts/PluginManager";
3+
import * as SiteAPI from "./src/scripts/SiteApi";
4+
import * as electron from "electron";
5+
import * as node_console from "console";
66

7-
declare let window:any;
8-
declare let global:any;
7+
declare let window: any;
8+
declare let global: any;
99

10-
document.write(`<!DOCTYPE html><html lang="en" dir="ltr"><head><meta charset="utf-8"><title>MCScript Studio Code</title></head><body></body></html>"`);
10+
document.write(
11+
`<!DOCTYPE html><html lang="en" dir="ltr"><head><meta charset="utf-8"><title>MCScript Studio Code</title></head><body></body></html>"`
12+
);
1113

12-
global.working_dir = electron.ipcRenderer.sendSync('get_folder', "get_folder")[0];
14+
global.working_dir = electron.ipcRenderer.sendSync(
15+
"get_folder",
16+
"get_folder"
17+
)[0];
1318

14-
window.alert = function(content:any) {
15-
return electron.ipcRenderer.sendSync('alert', content.toString());
16-
}
19+
window.alert = function(content: any) {
20+
return electron.ipcRenderer.sendSync("alert", content.toString());
21+
};
1722

18-
window.prompt = function(title, val){
19-
return electron.ipcRenderer.sendSync('prompt', {title, val})
20-
}
23+
window.prompt = function(title, val) {
24+
return electron.ipcRenderer.sendSync("prompt", { title, val });
25+
};
2126

22-
let datafolder:string = (process.env.APPDATA || (process.platform == 'darwin' ? process.env.HOME + 'Library/Preferences' : '/var/local')) + "/mcscriptStudioCode";
23-
let assets:string = __dirname.replace(/\\/g, "/") + '/../assets';
27+
let datafolder: string =
28+
(process.env.APPDATA ||
29+
(process.platform == "darwin"
30+
? process.env.HOME + "Library/Preferences"
31+
: "/var/local")) + "/mcscriptStudioCode";
2432

25-
if(!fs.existsSync(datafolder))fs.mkdirSync(datafolder);
33+
if (!fs.existsSync(datafolder)) fs.mkdirSync(datafolder);
2634

27-
const manager:PluginManager = new PluginManager();
35+
const manager: PluginManager = new PluginManager();
2836

2937
console.log(datafolder + "/plugins");
3038

3139
manager.loadPlugins(datafolder + "/plugins");
32-
SiteAPI.loadSite({host: "raw.githubusercontent.com", path: '/MinimineLP/MCScriptStudioCode-core-plugins/master/plugins-core.json', protocoll: 'https'}, function(ret) {
33-
for(let url of JSON.parse(ret)) manager.installPlugin(url,`${datafolder}/plugins`);
34-
});
40+
SiteAPI.loadSite(
41+
{
42+
host: "raw.githubusercontent.com",
43+
path:
44+
"/MinimineLP/MCScriptStudioCode-core-plugins/master/plugins-core.json",
45+
protocoll: "https"
46+
},
47+
function(ret) {
48+
for (let url of JSON.parse(ret))
49+
manager.installPlugin(url, `${datafolder}/plugins`);
50+
}
51+
);
3552

3653
manager.api.addStylesheet(`${__dirname}/src/css/style.css`);
3754
manager.setupPlugins();
3855
manager.startPlugins();
3956

40-
window.addEventListener('unload', function(event) {
57+
window.addEventListener("unload", function() {
4158
manager.stopPlugins();
42-
node_console.log("window closes")
43-
})
59+
node_console.log("window closes");
60+
});

0 commit comments

Comments
 (0)