Better block parsing

Author: michaljaz

coffee/client/module/Block/Block_mod.coffee

@@ -0,0 +1 @@
+Block=require("prismarine-block")("1.16.3")

coffee/client/module/World/ChunkWorker.coffee

@@ -1,7 +1,7 @@
 import {CellTerrain} from './CellTerrain.js'
-
+import {Block} from './../Block/Block.js'
 console.log "CHUNK WORKER STARTED!"
-
+console.log Block
 class TerrainManager
 	constructor: (options)->
 		@toxelSize=options.toxelSize
@@ -27,15 +27,20 @@ class TerrainManager
 			[x2,y2]
 		]
 	genBlockFace: (type,voxel,pos)->
-		# toxX=@blocksMapping["debug"]["x"]
-		# toxY=28-@blocksMapping["debug"]["y"]
-		if @blocks[voxel] is undefined
+		xd=new Block.fromStateId voxel
+		try
+			toxX=@blocksMapping[xd.name]["x"]
+			toxY=@blocksMapping[xd.name]["y"]
+		catch
 			toxX=@blocksMapping["debug"]["x"]
 			toxY=28-@blocksMapping["debug"]["y"]
-		else
-			blockName=@blocks[voxel]["faces"][type]
-			toxX=@blocksMapping[blockName]["x"]
-			toxY=@blocksMapping[blockName]["y"]
+		# if @blocks[voxel] is undefined
+		# 	toxX=@blocksMapping["debug"]["x"]
+		# 	toxY=28-@blocksMapping["debug"]["y"]
+		# else
+		# 	blockName=@blocks[voxel]["faces"][type]
+		# 	toxX=@blocksMapping[blockName]["x"]
+		# 	toxY=@blocksMapping[blockName]["y"]
 
 		uv=@getToxel toxX,toxY
 		switch type

coffee/client/module/index.coffee

@@ -10,7 +10,6 @@ import {AssetLoader} from './AssetLoader.js'
 import {InventoryBar} from './InventoryBar.js'
 import {RandomNick} from './RandomNick.js'
 import {GUI} from './jsm/libs/dat.gui.module.js'
-
 init = ()->
 	canvas=document.querySelector '#c'
 	renderer=new THREE.WebGLRenderer {

src/client/index.html

@@ -19,7 +19,6 @@
 
 
     <!-- JS -->
-    <script type="text/javascript" src="/cdn/js/Block.js"></script>
     <script type="text/javascript" src="/cdn/js/tween.umd.js"></script>
     <script type="text/javascript" src="/cdn/js/jq.js"></script>
     <script type="text/javascript" src="/cdn/js/popper.min.js"></script>

src/client/cdn/js/Block.js src/client/module/Block/Block.jssrc/client/cdn/js/Block.js renamed to src/client/module/Block/Block.js

@@ -1,3 +1,4 @@
+function Block(){}
 (function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
 module.exports =
 {
@@ -660527,7 +660528,7 @@ module.exports={
 module.exports={
     "$id": "https://example.com/person.schema.json",
     "$schema": "http://json-schema.org/draft-07/schema#",
-  
+
     "definitions": {
 
         "RootNode" : {
@@ -660600,14 +660601,14 @@ module.exports={
                             {"$ref": "#/definitions/ArgumentNode"}
                         ]
                     }
-                }, 
+                },
 
                 "parser" : {
                     "type" : "object",
-                    "properties" : { 
+                    "properties" : {
                         "parser" : {
                             "type" : "string"
-                        }, 
+                        },
                         "modifier" : {
                             "type" : ["object","null"]
                         }
@@ -660645,12 +660646,12 @@ module.exports={
     "type" : "object",
     "properties": {
         "graph" : {
-            "$ref": "#/definitions/RootNode" 
+            "$ref": "#/definitions/RootNode"
         },
         "parsers" : {
             "type" : "array",
             "items" : {
-                "$ref": "#/definitions/ParserInfo" 
+                "$ref": "#/definitions/ParserInfo"
             }
         }
     },
@@ -660849,13 +660850,13 @@ module.exports={
             "additionalProperties":false
           }
         }
-  
+
       },
       "required": ["id", "displayName", "stackSize", "name", "foodPoints", "saturation", "effectiveQuality", "saturationRatio"],
       "additionalProperties":false
     }
   }
-  
+
 },{}],297:[function(require,module,exports){
 module.exports={
   "title": "instruments",
@@ -661428,6 +661429,9 @@ function provider ({ Biome, blocks, blocksByStateId, toolMultipliers, shapes, ma
 }
 
 },{"minecraft-data":2,"prismarine-biome":305}],307:[function(require,module,exports){
-Block=require("prismarine-block")("1.16.3");
+// Generated by CoffeeScript 2.5.1
+
+Block = require("prismarine-block")("1.16.3");
 
 },{"prismarine-block":306}]},{},[307]);
+export {Block}