some blocks colors :)

Author: michaljaz

.gitignore

@@ -1,5 +1,4 @@
 node_modules
 src/client/dist
 src/client/assets/blocks
-src/client/assets/items
-src/world
+src/client/assets/items

README.md

@@ -28,11 +28,6 @@ npm i
 <summary>Minecraft server setup</summary>
 To run this game you need to start real minecraft server (by default it is 1.16.1 offline mode java edition on ip localhost:25565) you can also define it in */src/server.json* file.
 
-```bash
-#Optionally you can run lite minecraft server (flying-squid)
-npm run server
-
-``` 
 </details>
 
 
@@ -56,6 +51,7 @@ npm run clean
 
 #Building app bundle
 npm run build
+
 #Start node server and serve bundle files
 npm start
 

index.js

@@ -7,6 +7,4 @@ if(process.argv[2]==="dev"){
     require("./src/prebuild.coffee");
 }else if(process.argv[2]==="items"){
     require("./src/itemDump.coffee");
-}else if(process.argv[2]==="server"){
-    require("./src/minecraft.coffee");
 }

package-lock.json

@@ -7,8 +7,7 @@
     "build": "cd src/client && webpack --config webpack.prod.coffee",
     "prebuild": "node index.js preb",
     "clean": "rimraf src/client/dist/*",
-    "items": "node index.js items",
-    "server": "node index.js server"
+    "items": "node index.js items"
   },
   "dependencies": {
     "@tweenjs/tween.js": "^18.6.4",
@@ -18,7 +17,6 @@
     "canvas": "^2.6.1",
     "dat.gui": "^0.7.7",
     "express": "^4.17.1",
-    "flying-squid": "^1.4.0",
     "helmet": "^4.4.1",
     "html-webpack-plugin": "^4.5.1",
     "http": "0.0.1-security",

package.json

@@ -122,7 +122,8 @@ class TerrainManager
 			else
 				return [0.3,0.3,0.3]
 		addFace=(type,pos)->
-			faceVertex=_this.genBlockFace type,_this.cellTerrain.getBlock(pos...),pos
+			block=_this.cellTerrain.getBlock pos...
+			faceVertex=_this.genBlockFace type,block,pos
 			# _this.cellTerrain.getBlock(pos[0],pos[1],pos[2])
 			loaded={}
 			for x in [-1..1]
@@ -166,6 +167,38 @@ class TerrainManager
 				col4=aoColor(loaded["0:1:-1"]+loaded["-1:1:-1"]+loaded["-1:0:-1"])
 				col1=aoColor(loaded["0:-1:-1"]+loaded["1:-1:-1"]+loaded["1:0:-1"])
 				col2=aoColor(loaded["0:1:-1"]+loaded["1:1:-1"]+loaded["1:0:-1"])
+
+			if block.name is "water"
+				ile=4
+				col1[0]/=ile
+				col1[1]/=ile
+				col2[0]/=ile
+				col2[1]/=ile
+				col3[0]/=ile
+				col3[1]/=ile
+				col4[0]/=ile
+				col4[1]/=ile
+			else if block.name is "grass_block" and type is "py"
+				ile=4
+				col1[0]/=ile
+				col1[2]/=ile
+				col2[0]/=ile
+				col2[2]/=ile
+				col3[0]/=ile
+				col3[2]/=ile
+				col4[0]/=ile
+				col4[2]/=ile
+			else if block.name.includes "leaves"
+				ile=4
+				col1[0]/=ile
+				col1[2]/=ile
+				col2[0]/=ile
+				col2[2]/=ile
+				col3[0]/=ile
+				col3[2]/=ile
+				col4[0]/=ile
+				col4[2]/=ile
+			
 			if _this.cellTerrain.getBlock(pos...).transparent
 				t_positions.push faceVertex.pos...
 				t_normals.push faceVertex.norm...