lint

michaljaz · michaljaz · commit c5ea1cb8fe5c · 2021-11-01T15:29:22.000+01:00
diff --git a/README.md b/README.md
@@ -3,6 +3,7 @@
 [![Discord](https://img.shields.io/badge/chat-on%20discord-brightgreen.svg)](https://discord.gg/h6DQzDx2G7)
 [![Try it on gitpod](https://img.shields.io/badge/try-on%20gitpod-brightgreen.svg)](https://gitpod.io/#https://github.com/michaljaz/web-minecraft)
 [![Build and Deploy](https://github.com/michaljaz/web-minecraft/actions/workflows/github-pages.yaml/badge.svg)](https://github.com/michaljaz/web-minecraft/actions/workflows/github-pages.yaml)
+[![JavaScript Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://standardjs.com)
 ## About
 
 **Webmc is minecraft client written in Javascript.** From web browser this client connects to websocket proxy and then to real minecraft server, so you can play minecraft in the browser.
diff --git a/lib/postinstall.js b/lib/postinstall.js
@@ -1,9 +1,9 @@
-try{
-	const decompress = require('decompress')
-	const path = require('path')
+try {
+  const decompress = require('decompress')
+  const path = require('path')
 
-	decompress(
-	  path.join(__dirname, '../assets/pack.zip'),
-	  path.join(__dirname, '../assets/pack')
-	)
-}catch(e){}
+  decompress(
+    path.join(__dirname, '../assets/pack.zip'),
+    path.join(__dirname, '../assets/pack')
+  )
+} catch (e) {}
diff --git a/lib/server.js b/lib/server.js
@@ -3,47 +3,47 @@ const app = express()
 const netApi = require('./proxy.js')
 const port = process.env.PORT || 8080
 const cors = require('cors')
-const axios = require('axios');
-const atob = require('atob');
+const axios = require('axios')
+const atob = require('atob')
 
 app.use(cors())
 app.use(netApi({ allowOrigin: '*' }))
 
-app.use("/proxyCheck",(req,res,next)=>{
-	res.send("OK")
+app.use('/proxyCheck', (req, res, next) => {
+  res.send('OK')
 })
 
-app.get("/getId",(req,res,next)=>{
-	axios.get(`https://api.mojang.com/users/profiles/minecraft/${req.query.nick}`,{responseType: 'json'})
-  .then(function (response) {
-		if(response.status==204){
-			res.send('ERR')
-		}else{
-			res.send(response.data.id)
-		}
-  })
-  .catch(function (error) {
-    res.send("ERR")
-  })
+app.get('/getId', (req, res, next) => {
+  axios.get(`https://api.mojang.com/users/profiles/minecraft/${req.query.nick}`, { responseType: 'json' })
+    .then(function (response) {
+      if (response.status === 204) {
+        res.send('ERR')
+      } else {
+        res.send(response.data.id)
+      }
+    })
+    .catch(function () {
+      res.send('ERR')
+    })
 })
 
-app.get("/getSkin",(req,res,next)=>{
-	axios.get(`https://sessionserver.mojang.com/session/minecraft/profile/${req.query.id}?legacy=true`,{responseType: 'json'})
-	  .then(function (response) {
-			var url=JSON.parse(atob(response.data.properties[0].value)).textures.SKIN.url
-			axios.get(url,{responseType: 'arraybuffer'})
-			  .then(function (response) {
-					var headers = {'Content-Type': 'image/jpeg'};
-		        res.writeHead(200, headers);
-		        res.end(response.data, 'binary');
-			  })
-			  .catch(function (error) {
-			    res.send("ERR")
-			  })
-	  })
-	  .catch(function (error) {
-	    res.send("ERR")
-	  })
+app.get('/getSkin', (req, res, next) => {
+  axios.get(`https://sessionserver.mojang.com/session/minecraft/profile/${req.query.id}?legacy=true`, { responseType: 'json' })
+    .then(function (response) {
+      const url = JSON.parse(atob(response.data.properties[0].value)).textures.SKIN.url
+      axios.get(url, { responseType: 'arraybuffer' })
+        .then(function (response) {
+          const headers = { 'Content-Type': 'image/jpeg' }
+          res.writeHead(200, headers)
+          res.end(response.data, 'binary')
+        })
+        .catch(function () {
+          res.send('ERR')
+        })
+    })
+    .catch(function () {
+      res.send('ERR')
+    })
 })
 
 app.listen(port, () => {
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -12,18 +12,16 @@
 		"postinstall": "node lib/postinstall.js",
 		"proxy": "node lib/server.js"
 	},
+	"standard": {
+		"ignore": [
+			"/src/vendor"
+		]
+	},
 	"license": "MIT",
 	"repository": {
 		"type": "git",
 		"url": "git://github.com/michaljaz/webmc.git"
 	},
-	"keywords": [
-		"minecraft",
-		"game",
-		"browser",
-		"web",
-		"client"
-	],
 	"engines": {
 		"node": "14.x"
 	},
@@ -42,12 +40,13 @@
 		"bootstrap": "^4.6.0",
 		"browserify-zlib": "^0.2.0",
 		"canvas": "^2.8.0",
-		"child_process": "^1.0.2",
 		"compression": "^1.7.4",
 		"constants-browserify": "^1.0.0",
 		"copy-webpack-plugin": "^6.3.1",
 		"crypto-browserify": "^3.12.0",
 		"css-loader": "^5.0.1",
+		"decompress": "^4.2.1",
+		"decompress-tarxz": "^3.0.0",
 		"eslint": "^7.22.0",
 		"file-loader": "^6.2.0",
 		"helmet": "^4.4.1",
@@ -78,8 +77,6 @@
 		"webpack-cli": "^4.2.0",
 		"webpack-dev-server": "^3.11.1",
 		"webpack-merge": "^5.7.3",
-		"worker-loader": "^3.0.7",
-		"decompress": "^4.2.1",
-		"decompress-tarxz": "^3.0.0"
+		"worker-loader": "^3.0.7"
 	}
 }
diff --git a/src/scripts/EventHandler.js b/src/scripts/EventHandler.js
@@ -236,7 +236,7 @@ class EventHandler {
     $('.chat').addClass('blur')
     $('.com_i').blur()
     $('.com').hide()
-		this.game.chat.hide()
+    this.game.chat.hide()
     return $('.inv_window').hide()
   }
 
@@ -258,7 +258,7 @@ class EventHandler {
         break
       case 'chat':
         if (this.gameState === 'gameLock') {
-					this.game.chat.show()
+          this.game.chat.show()
           $('.chat').addClass('focus')
           $('.chat').removeClass('blur')
           $('.gameMenu').hide()
diff --git a/src/scripts/Setup.js b/src/scripts/Setup.js
@@ -45,7 +45,7 @@ function Setup (game) {
   UrlParams(game)
   console.warn(gpuInfo())
   game.socket = new Socket(game)
-	game.pii = new PlayerInInventory(game)
+  game.pii = new PlayerInInventory(game)
   game.bb = new BlockBreak(game)
   game.bp = new BlockPlace(game)
   game.world = new World(game)
@@ -54,46 +54,45 @@ function Setup (game) {
   game.inv_bar = new InventoryBar(game)
   game.tl = new TabList(game)
   game.ls = new LoadingScreen(game)
-  game.ls.show(`Waiting for proxy...`)
-	let hostname, port, pars
-	if (game.proxy === 'local') {
-		hostname = document.location.hostname
-		port = document.location.port
-	} else if (game.proxy === 'production') {
-		pars = game.al.get('config').proxy.split(':')
-		hostname = pars[0]
-		port = pars[1]
-	} else {
-		pars = game.proxy.split(':')
-		hostname = pars[0]
-		port = pars[1]
-	}
-	fetch(`${document.location.protocol}//${hostname}:${port}/proxyCheck`)
-	  .then(response => response.text())
-	  .then(data => {
-			if(data=="OK"){
-				game.ls.show(`Connecting to ${game.server}...`)
-
-				//PLAYER UUID
-				fetch(`${document.location.protocol}//${hostname}:${port}/getId?nick=${game.nick}`)
-				  .then(response => response.text())
-				  .then(id => {
-						if(id!=="ERR"){
-							console.log(`UUID: ${id}`)
-							//SKIN
-							game.skinUrl=`${document.location.protocol}//${hostname}:${port}/getSkin?id=${id}`
-							console.log(game.skinUrl)
-							new TextureLoader().load(game.skinUrl, (texture) => {
-								game.pii.setup(texture)
-							})
+  game.ls.show('Waiting for proxy...')
+  let hostname, port, pars
+  if (game.proxy === 'local') {
+    hostname = document.location.hostname
+    port = document.location.port
+  } else if (game.proxy === 'production') {
+    pars = game.al.get('config').proxy.split(':')
+    hostname = pars[0]
+    port = pars[1]
+  } else {
+    pars = game.proxy.split(':')
+    hostname = pars[0]
+    port = pars[1]
+  }
+  window.fetch(`${document.location.protocol}//${hostname}:${port}/proxyCheck`)
+    .then(response => response.text())
+    .then(data => {
+      if (data === 'OK') {
+        game.ls.show(`Connecting to ${game.server}...`)
 
-						}else{
-							console.log("UUID not found!")
-							game.pii.setup(game.al.get('playerTex'))
-						}
-					});
-			}
-		});
+        // PLAYER UUID
+        window.fetch(`${document.location.protocol}//${hostname}:${port}/getId?nick=${game.nick}`)
+          .then(response => response.text())
+          .then(id => {
+            if (id !== 'ERR') {
+              console.log(`UUID: ${id}`)
+              // SKIN
+              game.skinUrl = `${document.location.protocol}//${hostname}:${port}/getSkin?id=${id}`
+              console.log(game.skinUrl)
+              new TextureLoader().load(game.skinUrl, (texture) => {
+                game.pii.setup(texture)
+              })
+            } else {
+              console.log('UUID not found!')
+              game.pii.setup(game.al.get('playerTex'))
+            }
+          })
+      }
+    })
 
   game.distanceBasedFog.addShaderToMaterials([
     game.world.material,
diff --git a/src/scripts/gui/Chat.js b/src/scripts/gui/Chat.js
@@ -7,7 +7,7 @@ class Chat {
     this.listen()
     this.history = ['']
     this.histState = 0
-		this.fadeTimeout=10000
+    this.fadeTimeout = 10000
   }
 
   chatGoBack () {
@@ -55,35 +55,34 @@ class Chat {
     elem.innerHTML = message + '<br>'
     this.chatDiv.append(elem)
     this.scrollToBottom(this.chatDiv)
-		setTimeout(()=>{
-			if(this.game.eh.gameState=="chat"){
-				elem.hidd=true;
-			}else{
-				$(elem).fadeOut(1000,()=>{
-					elem.hidd=true;
-					this.scrollToBottom(this.chatDiv)
-				})
-			}
-
-		},this.fadeTimeout)
+    setTimeout(() => {
+      if (this.game.eh.gameState === 'chat') {
+        elem.hidd = true
+      } else {
+        $(elem).fadeOut(1000, () => {
+          elem.hidd = true
+          this.scrollToBottom(this.chatDiv)
+        })
+      }
+    }, this.fadeTimeout)
   }
 
-	show (){
-		const children=[].slice.call(this.chatDiv.children)
-		for(var i=0;i<children.length;i++){
-			$(children[i]).show()
-		}
-		this.scrollToBottom(this.chatDiv)
-	}
+  show () {
+    const children = [].slice.call(this.chatDiv.children)
+    for (let i = 0; i < children.length; i++) {
+      $(children[i]).show()
+    }
+    this.scrollToBottom(this.chatDiv)
+  }
 
-	hide (){
-		const children=[].slice.call(this.chatDiv.children)
-		for(var i=0;i<children.length;i++){
-			if(children[i].hidd){
-				$(children[i]).hide()
-			}
-		}
-	}
+  hide () {
+    const children = [].slice.call(this.chatDiv.children)
+    for (let i = 0; i < children.length; i++) {
+      if (children[i].hidd) {
+        $(children[i]).hide()
+      }
+    }
+  }
 
   command (com) {
     if (com !== '') {
diff --git a/src/scripts/gui/PlayerInInventory.js b/src/scripts/gui/PlayerInInventory.js
@@ -21,8 +21,8 @@ class PlayerInInventory {
     this.scene.add(light)
   }
 
-	setup (texture) {
-		const player = this.game.al.get('player')
+  setup (texture) {
+    const player = this.game.al.get('player')
     texture.magFilter = NearestFilter
     player.children[0].material.map = texture
     this.scene.add(player)
@@ -52,7 +52,7 @@ class PlayerInInventory {
                     wychX * top)
       }
     })
-	}
+  }
 
   render () {
     return this.renderer.render(this.scene, this.camera)
diff --git a/src/scripts/rendering/DistanceBasedFog.js b/src/scripts/rendering/DistanceBasedFog.js
@@ -10,7 +10,7 @@ class DistanceBasedFog {
   }
 
   updateDistance (val) {
-    this.farnear.x = (Math.sqrt(val-1.5)) * 16
+    this.farnear.x = (Math.sqrt(val - 1.5)) * 16
     this.farnear.y = (val - 1) * 16
   }
 

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ class DistanceBasedFog {`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`updateDistance (val) {`
`13`		`- this.farnear.x = (Math.sqrt(val-1.5)) * 16`
	`13`	`+ this.farnear.x = (Math.sqrt(val - 1.5)) * 16`
`14`	`14`	`this.farnear.y = (val - 1) * 16`
`15`	`15`	`}`
`16`	`16`