Models (#657)

* Added ability to load .obj files * remove .mtl file * Replaced z up with y up in obj because apparently it is better * Make cubyz support blockbench models correctly * Not working changes * Segfault * Fixed bugs because i felt like it * Catch up * stuff * Stuff * Catch up * Remove unneccessary code * Changes to hopefully fix things * Remove debug log * Remove exportModel function * Updated new blocks * Fixed some std.log.err calls * aaa * I AM SO HAPPY YEEEEESSSSSSSSSSSSSSSSSSSSSSSSS * im silly * remove commented line * Remove useless code * remove thing * remove backgrounds * export function just in case i make an oopsie * add 1 to indices * final exportModel fix before i remove * remove export model * i forgor to do the uv stuff * hopefully final exportModel change * yoo * final changes * fixed memory leak
2025-09-15 07:20:09 -04:00 · 2024-09-04 16:18:45 -04:00 · 2024-09-04 16:18:45 -04:00 · 5cb12cc3ed
commit 5cb12cc3ed
parent e1d715ce1c
131 changed files with 603 additions and 197 deletions
--- a/assets/cubyz/blocks/birch_fence.json
+++ b/assets/cubyz/blocks/birch_fence.json
@ -6,7 +6,7 @@
 	],
 	"absorbedLight" : 0x202830,
 	"rotation" : "fence",
-	"model" : "fence",
+	"model" : "cubyz:fence",
 	"texture" : "cubyz:birch_fence",
 	"texture_top" : "cubyz:birch_fence_top",
 	"texture_bottom" : "cubyz:birch_fence_top"
--- a/assets/cubyz/blocks/birch_leaves.json
+++ b/assets/cubyz/blocks/birch_leaves.json
@ -8,7 +8,7 @@
 	"degradable" : true,
 	"alwaysViewThrough" : true,
 	"absorbedLight" : 0x121012,
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:birch_leaves",
 	"lodReplacement" : "cubyz:birch_leaves_opaque",
 	"opaqueVariant" : "cubyz:birch_leaves_opaque"
--- a/assets/cubyz/blocks/birch_leaves_opaque.json
+++ b/assets/cubyz/blocks/birch_leaves_opaque.json
@ -2,6 +2,6 @@
 	"class" : "leaf",
 	"hasItem" : false,
 	"absorbedLight" : 0x121012,
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:birch_leaves_opaque"
 }
--- a/assets/cubyz/blocks/birch_log.json
+++ b/assets/cubyz/blocks/birch_log.json
@ -5,7 +5,7 @@
 		"auto"
 	],
 	"rotation" : "log",
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:birch_log",
 	"texture_top" : "cubyz:birch_log_top",
 	"texture_bottom" : "cubyz:birch_log_top"
--- a/assets/cubyz/blocks/birch_planks.json
+++ b/assets/cubyz/blocks/birch_planks.json
@ -4,7 +4,7 @@
 	"drops" : [
 		"auto"
 	],
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"rotation" : "stairs",
 	"texture" : "cubyz:birch_planks"
 }
--- a/assets/cubyz/blocks/birch_top.json
+++ b/assets/cubyz/blocks/birch_top.json
@ -5,7 +5,7 @@
 		"auto"
 	],
 	"rotation" : "log",
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:birch_log",
 	"texture_top" : "cubyz:birch_log",
 	"texture_bottom" : "cubyz:birch_log_top",
--- a/assets/cubyz/blocks/cactus.json
+++ b/assets/cubyz/blocks/cactus.json
@ -4,6 +4,6 @@
 	"drops" : [
 		"auto"
 	],
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:cactus"
 }
--- a/assets/cubyz/blocks/chalk/aqua.json
+++ b/assets/cubyz/blocks/chalk/aqua.json
@ -4,7 +4,7 @@
 	"drops" : [
 		"auto"
 	],
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"rotation" : "stairs",
 	"texture" : "cubyz:chalk/aqua"
 }
--- a/assets/cubyz/blocks/chalk/black.json
+++ b/assets/cubyz/blocks/chalk/black.json
@ -4,7 +4,7 @@
 	"drops" : [
 		"auto"
 	],
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"rotation" : "stairs",
 	"texture" : "cubyz:chalk/black"
 }
--- a/assets/cubyz/blocks/chalk/blue.json
+++ b/assets/cubyz/blocks/chalk/blue.json
@ -4,7 +4,7 @@
 	"drops" : [
 		"auto"
 	],
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"rotation" : "stairs",
 	"texture" : "cubyz:chalk/blue"
 }
--- a/assets/cubyz/blocks/chalk/brown.json
+++ b/assets/cubyz/blocks/chalk/brown.json
@ -4,7 +4,7 @@
 	"drops" : [
 		"auto"
 	],
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"rotation" : "stairs",
 	"texture" : "cubyz:chalk/brown"
 }
--- a/assets/cubyz/blocks/chalk/crimson.json
+++ b/assets/cubyz/blocks/chalk/crimson.json
@ -4,7 +4,7 @@
 	"drops" : [
 		"auto"
 	],
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"rotation" : "stairs",
 	"texture" : "cubyz:chalk/crimson"
 }
--- a/assets/cubyz/blocks/chalk/cyan.json
+++ b/assets/cubyz/blocks/chalk/cyan.json
@ -4,7 +4,7 @@
 	"drops" : [
 		"auto"
 	],
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"rotation" : "stairs",
 	"texture" : "cubyz:chalk/cyan"
 }
--- a/assets/cubyz/blocks/chalk/dark_grey.json
+++ b/assets/cubyz/blocks/chalk/dark_grey.json
@ -4,7 +4,7 @@
 	"drops" : [
 		"auto"
 	],
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"rotation" : "stairs",
 	"texture" : "cubyz:chalk/dark_grey"
 }
--- a/assets/cubyz/blocks/chalk/green.json
+++ b/assets/cubyz/blocks/chalk/green.json
@ -4,7 +4,7 @@
 	"drops" : [
 		"auto"
 	],
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"rotation" : "stairs",
 	"texture" : "cubyz:chalk/green"
 }
--- a/assets/cubyz/blocks/chalk/grey.json
+++ b/assets/cubyz/blocks/chalk/grey.json
@ -4,7 +4,7 @@
 	"drops" : [
 		"auto"
 	],
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"rotation" : "stairs",
 	"texture" : "cubyz:chalk/grey"
 }
--- a/assets/cubyz/blocks/chalk/indigo.json
+++ b/assets/cubyz/blocks/chalk/indigo.json
@ -4,7 +4,7 @@
 	"drops" : [
 		"auto"
 	],
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"rotation" : "stairs",
 	"texture" : "cubyz:chalk/indigo"
 }
--- a/assets/cubyz/blocks/chalk/lime.json
+++ b/assets/cubyz/blocks/chalk/lime.json
@ -4,7 +4,7 @@
 	"drops" : [
 		"auto"
 	],
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"rotation" : "stairs",
 	"texture" : "cubyz:chalk/lime"
 }
--- a/assets/cubyz/blocks/chalk/magenta.json
+++ b/assets/cubyz/blocks/chalk/magenta.json
@ -4,7 +4,7 @@
 	"drops" : [
 		"auto"
 	],
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"rotation" : "stairs",
 	"texture" : "cubyz:chalk/magenta"
 }
--- a/assets/cubyz/blocks/chalk/orange.json
+++ b/assets/cubyz/blocks/chalk/orange.json
@ -4,7 +4,7 @@
 	"drops" : [
 		"auto"
 	],
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"rotation" : "stairs",
 	"texture" : "cubyz:chalk/orange"
 }
--- a/assets/cubyz/blocks/chalk/pink.json
+++ b/assets/cubyz/blocks/chalk/pink.json
@ -4,7 +4,7 @@
 	"drops" : [
 		"auto"
 	],
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"rotation" : "stairs",
 	"texture" : "cubyz:chalk/pink"
 }
--- a/assets/cubyz/blocks/chalk/purple.json
+++ b/assets/cubyz/blocks/chalk/purple.json
@ -4,7 +4,7 @@
 	"drops" : [
 		"auto"
 	],
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"rotation" : "stairs",
 	"texture" : "cubyz:chalk/purple"
 }
--- a/assets/cubyz/blocks/chalk/red.json
+++ b/assets/cubyz/blocks/chalk/red.json
@ -4,7 +4,7 @@
 	"drops" : [
 		"auto"
 	],
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"rotation" : "stairs",
 	"texture" : "cubyz:chalk/red"
 }
--- a/assets/cubyz/blocks/chalk/violet.json
+++ b/assets/cubyz/blocks/chalk/violet.json
@ -4,7 +4,7 @@
 	"drops" : [
 		"auto"
 	],
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"rotation" : "stairs",
 	"texture" : "cubyz:chalk/violet"
 }
--- a/assets/cubyz/blocks/chalk/viridian.json
+++ b/assets/cubyz/blocks/chalk/viridian.json
@ -4,7 +4,7 @@
 	"drops" : [
 		"auto"
 	],
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"rotation" : "stairs",
 	"texture" : "cubyz:chalk/viridian"
 }
--- a/assets/cubyz/blocks/chalk/white.json
+++ b/assets/cubyz/blocks/chalk/white.json
@ -4,7 +4,7 @@
 	"drops" : [
 		"auto"
 	],
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"rotation" : "stairs",
 	"texture" : "cubyz:chalk/white"
 }
--- a/assets/cubyz/blocks/chalk/yellow.json
+++ b/assets/cubyz/blocks/chalk/yellow.json
@ -4,7 +4,7 @@
 	"drops" : [
 		"auto"
 	],
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"rotation" : "stairs",
 	"texture" : "cubyz:chalk/yellow"
 }
--- a/assets/cubyz/blocks/coal_ore.json
+++ b/assets/cubyz/blocks/coal_ore.json
@ -14,6 +14,6 @@
 	"drops" : [
 		"cubyz:coal"
 	],
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:coal_ore"
 }
--- a/assets/cubyz/blocks/cobblestone.json
+++ b/assets/cubyz/blocks/cobblestone.json
@ -15,7 +15,7 @@
 	"drops" : [
 		"auto"
 	],
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:cobblestone",

 	"rotation" : "stairs",
--- a/assets/cubyz/blocks/diamond_ore.json
+++ b/assets/cubyz/blocks/diamond_ore.json
@ -14,6 +14,6 @@
 	"drops" : [
 		"cubyz:diamond"
 	],
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:diamond_ore"
 }
--- a/assets/cubyz/blocks/dirt.json
+++ b/assets/cubyz/blocks/dirt.json
@ -4,6 +4,6 @@
 	"drops" : [
 		"auto"
 	],
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:dirt"
 }
--- a/assets/cubyz/blocks/ferrock.json
+++ b/assets/cubyz/blocks/ferrock.json
@ -5,7 +5,7 @@
 	"drops" : [
 		"auto"
 	],
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"rotation" : "stairs",
 	"texture" : "cubyz:ferrock"
 }
--- a/assets/cubyz/blocks/ferrock_bricks.json
+++ b/assets/cubyz/blocks/ferrock_bricks.json
@ -6,6 +6,6 @@
 		"auto"
 	],
 	"rotation" : "stairs",
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:ferrock_bricks"
 }
--- a/assets/cubyz/blocks/fog/blue.json
+++ b/assets/cubyz/blocks/fog/blue.json
@ -11,7 +11,7 @@
 	"collide": false,
 	"absorbedLight" : 0x010100,

-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:fog/blue"
 	"item": {
 		"texture" : "fog/blue.png",
--- a/assets/cubyz/blocks/fog/cyan.json
+++ b/assets/cubyz/blocks/fog/cyan.json
@ -11,7 +11,7 @@
 	"collide": false,
 	"absorbedLight" : 0x010000,

-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:fog/cyan"
 	"item": {
 		"texture" : "fog/cyan.png",
--- a/assets/cubyz/blocks/fog/green.json
+++ b/assets/cubyz/blocks/fog/green.json
@ -11,7 +11,7 @@
 	"collide": false,
 	"absorbedLight" : 0x010001,

-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:fog/green"
 	"item": {
 		"texture" : "fog/green.png",
--- a/assets/cubyz/blocks/fog/magenta.json
+++ b/assets/cubyz/blocks/fog/magenta.json
@ -11,7 +11,7 @@
 	"collide": false,
 	"absorbedLight" : 0x000100,

-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:fog/magenta"
 	"item": {
 		"texture" : "fog/magenta.png",
--- a/assets/cubyz/blocks/fog/red.json
+++ b/assets/cubyz/blocks/fog/red.json
@ -11,7 +11,7 @@
 	"collide": false,
 	"absorbedLight" : 0x000101,

-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:fog/red"
 	"item": {
 		"texture" : "fog/red.png",
--- a/assets/cubyz/blocks/fog/yellow.json
+++ b/assets/cubyz/blocks/fog/yellow.json
@ -11,7 +11,7 @@
 	"collide": false,
 	"absorbedLight" : 0x000001,

-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:fog/yellow"
 	"item": {
 		"texture" : "fog/yellow.png",
--- a/assets/cubyz/blocks/frost.json
+++ b/assets/cubyz/blocks/frost.json
@ -4,7 +4,7 @@
 	"drops" : [
 		"auto"
 	],
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:frost",
 	"blockEntity" : "cubyz.modding.base.MeltableBlockEntity"
 }
--- a/assets/cubyz/blocks/glacite.json
+++ b/assets/cubyz/blocks/glacite.json
@ -6,6 +6,6 @@
 		"auto"
 	],
 	"rotation" : "stairs",
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:glacite"
 }
--- a/assets/cubyz/blocks/glacite_bricks.json
+++ b/assets/cubyz/blocks/glacite_bricks.json
@ -6,6 +6,6 @@
 		"auto"
 	],
 	"rotation" : "stairs",
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:glacite_bricks"
 }
--- a/assets/cubyz/blocks/glass/aqua.json
+++ b/assets/cubyz/blocks/glass/aqua.json
@ -7,6 +7,6 @@
 	"transparent" : true,
 	"hasBackFace" : true,
 	"absorbedLight" : 0xe95825,
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:glass/aqua"
 }
--- a/assets/cubyz/blocks/glass/black.json
+++ b/assets/cubyz/blocks/glass/black.json
@ -7,6 +7,6 @@
 	"transparent" : true,
 	"hasBackFace" : true,
 	"absorbedLight" : 0xe6e6e6,
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:glass/black"
 }
--- a/assets/cubyz/blocks/glass/blue.json
+++ b/assets/cubyz/blocks/glass/blue.json
@ -7,6 +7,6 @@
 	"transparent" : true,
 	"hasBackFace" : true,
 	"absorbedLight" : 0xdc923c,
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:glass/blue"
 }
--- a/assets/cubyz/blocks/glass/brown.json
+++ b/assets/cubyz/blocks/glass/brown.json
@ -7,6 +7,6 @@
 	"transparent" : true,
 	"hasBackFace" : true,
 	"absorbedLight" : 0x96bdd8,
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:glass/brown"
 }
--- a/assets/cubyz/blocks/glass/crimson.json
+++ b/assets/cubyz/blocks/glass/crimson.json
@ -7,6 +7,6 @@
 	"transparent" : true,
 	"hasBackFace" : true,
 	"absorbedLight" : 0x69e4e1,
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:glass/crimson"
 }
--- a/assets/cubyz/blocks/glass/cyan.json
+++ b/assets/cubyz/blocks/glass/cyan.json
@ -7,6 +7,6 @@
 	"transparent" : true,
 	"hasBackFace" : true,
 	"absorbedLight" : 0xc62031,
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:glass/cyan"
 }
--- a/assets/cubyz/blocks/glass/dark_grey.json
+++ b/assets/cubyz/blocks/glass/dark_grey.json
@ -7,6 +7,6 @@
 	"transparent" : true,
 	"hasBackFace" : true,
 	"absorbedLight" : 0xacacac,
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:glass/dark_grey"
 }
--- a/assets/cubyz/blocks/glass/green.json
+++ b/assets/cubyz/blocks/glass/green.json
@ -7,6 +7,6 @@
 	"transparent" : true,
 	"hasBackFace" : true,
 	"absorbedLight" : 0xd966d9,
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:glass/green"
 }
--- a/assets/cubyz/blocks/glass/grey.json
+++ b/assets/cubyz/blocks/glass/grey.json
@ -7,6 +7,6 @@
 	"transparent" : true,
 	"hasBackFace" : true,
 	"absorbedLight" : 0x656565,
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:glass/grey"
 }
--- a/assets/cubyz/blocks/glass/indigo.json
+++ b/assets/cubyz/blocks/glass/indigo.json
@ -7,6 +7,6 @@
 	"transparent" : true,
 	"hasBackFace" : true,
 	"absorbedLight" : 0xd0c16d,
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:glass/indigo"
 }
--- a/assets/cubyz/blocks/glass/lime.json
+++ b/assets/cubyz/blocks/glass/lime.json
@ -7,6 +7,6 @@
 	"transparent" : true,
 	"hasBackFace" : true,
 	"absorbedLight" : 0xa03ed0,
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:glass/lime"
 }
--- a/assets/cubyz/blocks/glass/magenta.json
+++ b/assets/cubyz/blocks/glass/magenta.json
@ -7,6 +7,6 @@
 	"transparent" : true,
 	"hasBackFace" : true,
 	"absorbedLight" : 0x0d9f35,
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:glass/magenta"
 }
--- a/assets/cubyz/blocks/glass/orange.json
+++ b/assets/cubyz/blocks/glass/orange.json
@ -7,6 +7,6 @@
 	"transparent" : true,
 	"hasBackFace" : true,
 	"absorbedLight" : 0x1183ee,
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:glass/orange"
 }
--- a/assets/cubyz/blocks/glass/pink.json
+++ b/assets/cubyz/blocks/glass/pink.json
@ -7,6 +7,6 @@
 	"transparent" : true,
 	"hasBackFace" : true,
 	"absorbedLight" : 0x056830,
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:glass/pink"
 }
--- a/assets/cubyz/blocks/glass/purple.json
+++ b/assets/cubyz/blocks/glass/purple.json
@ -7,6 +7,6 @@
 	"transparent" : true,
 	"hasBackFace" : true,
 	"absorbedLight" : 0x83d66a,
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:glass/purple"
 }
--- a/assets/cubyz/blocks/glass/red.json
+++ b/assets/cubyz/blocks/glass/red.json
@ -7,6 +7,6 @@
 	"transparent" : true,
 	"hasBackFace" : true,
 	"absorbedLight" : 0x2ad6d6,
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:glass/red"
 }
--- a/assets/cubyz/blocks/glass/uranium.json
+++ b/assets/cubyz/blocks/glass/uranium.json
@ -8,6 +8,6 @@
 	"hasBackFace" : true,
 	"absorbedLight" : 0x4001ff,
 	"emittedLight" : 0x80ff00,
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:glass/uranium"
 }
--- a/assets/cubyz/blocks/glass/violet.json
+++ b/assets/cubyz/blocks/glass/violet.json
@ -7,6 +7,6 @@
 	"transparent" : true,
 	"hasBackFace" : true,
 	"absorbedLight" : 0x46c345,
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:glass/violet"
 }
--- a/assets/cubyz/blocks/glass/viridian.json
+++ b/assets/cubyz/blocks/glass/viridian.json
@ -7,6 +7,6 @@
 	"transparent" : true,
 	"hasBackFace" : true,
 	"absorbedLight" : 0xf09ad6,
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:glass/viridian"
 }
--- a/assets/cubyz/blocks/glass/white.json
+++ b/assets/cubyz/blocks/glass/white.json
@ -7,6 +7,6 @@
 	"transparent" : true,
 	"hasBackFace" : true,
 	"absorbedLight" : 0x0f0f0f,
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:glass/white"
 }
--- a/assets/cubyz/blocks/glass/yellow.json
+++ b/assets/cubyz/blocks/glass/yellow.json
@ -7,6 +7,6 @@
 	"transparent" : true,
 	"hasBackFace" : true,
 	"absorbedLight" : 0x0d36f1,
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:glass/yellow"
 }
--- a/assets/cubyz/blocks/glow_crystal/black.json
+++ b/assets/cubyz/blocks/glow_crystal/black.json
@ -5,6 +5,6 @@
 		"none"
 	],
 	"emittedLight" : 0x111111,
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:glow_crystal/black"
 }
--- a/assets/cubyz/blocks/glow_crystal/blue.json
+++ b/assets/cubyz/blocks/glow_crystal/blue.json
@ -5,6 +5,6 @@
 		"none"
 	],
 	"emittedLight" : 0x0000ff,
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:glow_crystal/blue"
 }
--- a/assets/cubyz/blocks/glow_crystal/brown.json
+++ b/assets/cubyz/blocks/glow_crystal/brown.json
@ -5,6 +5,6 @@
 		"none"
 	],
 	"emittedLight" : 0x804000,
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:glow_crystal/brown"
 }
--- a/assets/cubyz/blocks/glow_crystal/cyan.json
+++ b/assets/cubyz/blocks/glow_crystal/cyan.json
@ -5,6 +5,6 @@
 		"none"
 	],
 	"emittedLight" : 0x00ffb0,
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:glow_crystal/cyan"
 }
--- a/assets/cubyz/blocks/glow_crystal/dark_gray.json
+++ b/assets/cubyz/blocks/glow_crystal/dark_gray.json
@ -5,6 +5,6 @@
 		"none"
 	],
 	"emittedLight" : 0x444444,
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:glow_crystal/dark_gray"
 }
--- a/assets/cubyz/blocks/glow_crystal/dark_green.json
+++ b/assets/cubyz/blocks/glow_crystal/dark_green.json
@ -5,6 +5,6 @@
 		"none"
 	],
 	"emittedLight" : 0x008000,
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:glow_crystal/dark_green"
 }
--- a/assets/cubyz/blocks/glow_crystal/dark_red.json
+++ b/assets/cubyz/blocks/glow_crystal/dark_red.json
@ -5,6 +5,6 @@
 		"none"
 	],
 	"emittedLight" : 0x800000,
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:glow_crystal/dark_red"
 }
--- a/assets/cubyz/blocks/glow_crystal/gray.json
+++ b/assets/cubyz/blocks/glow_crystal/gray.json
@ -5,6 +5,6 @@
 		"none"
 	],
 	"emittedLight" : 0x808080,
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:glow_crystal/gray"
 }
--- a/assets/cubyz/blocks/glow_crystal/green.json
+++ b/assets/cubyz/blocks/glow_crystal/green.json
@ -5,6 +5,6 @@
 		"none"
 	],
 	"emittedLight" : 0x00ff00,
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:glow_crystal/green"
 }
--- a/assets/cubyz/blocks/glow_crystal/light_blue.json
+++ b/assets/cubyz/blocks/glow_crystal/light_blue.json
@ -5,6 +5,6 @@
 		"none"
 	],
 	"emittedLight" : 0x4040ff,
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:glow_crystal/light_blue"
 }
--- a/assets/cubyz/blocks/glow_crystal/orange.json
+++ b/assets/cubyz/blocks/glow_crystal/orange.json
@ -5,6 +5,6 @@
 		"none"
 	],
 	"emittedLight" : 0xff8000,
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:glow_crystal/orange"
 }
--- a/assets/cubyz/blocks/glow_crystal/purple.json
+++ b/assets/cubyz/blocks/glow_crystal/purple.json
@ -5,6 +5,6 @@
 		"none"
 	],
 	"emittedLight" : 0xff00ff,
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:glow_crystal/purple"
 }
--- a/assets/cubyz/blocks/glow_crystal/red.json
+++ b/assets/cubyz/blocks/glow_crystal/red.json
@ -5,6 +5,6 @@
 		"none"
 	],
 	"emittedLight" : 0xff0000,
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:glow_crystal/red"
 }
--- a/assets/cubyz/blocks/glow_crystal/violet.json
+++ b/assets/cubyz/blocks/glow_crystal/violet.json
@ -5,6 +5,6 @@
 		"none"
 	],
 	"emittedLight" : 0x8000ff,
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:glow_crystal/violet"
 }
--- a/assets/cubyz/blocks/glow_crystal/white.json
+++ b/assets/cubyz/blocks/glow_crystal/white.json
@ -5,6 +5,6 @@
 		"none"
 	],
 	"emittedLight" : 0xffffff,
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:glow_crystal/white"
 }
--- a/assets/cubyz/blocks/glow_crystal/yellow.json
+++ b/assets/cubyz/blocks/glow_crystal/yellow.json
@ -5,6 +5,6 @@
 		"none"
 	],
 	"emittedLight" : 0xffff00,
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:glow_crystal/yellow"
 }
--- a/assets/cubyz/blocks/grass.json
+++ b/assets/cubyz/blocks/grass.json
@ -4,7 +4,7 @@
 	"drops" : [
 		"cubyz:soil"
 	],
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:grass_top",
 	"texture_bottom" : "cubyz:soil"
 }
--- a/assets/cubyz/blocks/grass_vegetation.json
+++ b/assets/cubyz/blocks/grass_vegetation.json
@ -8,7 +8,7 @@
 	"viewThrough" : true,
 	"absorbedLight" : 0x121012,
 	"collide": false,
-	"model" : "cross",
+	"model" : "cubyz:cross",
 	"texture" : "cubyz:grass_vegetation",
 	"item": {
 		"texture" : "grass.png",
--- a/assets/cubyz/blocks/gravel.json
+++ b/assets/cubyz/blocks/gravel.json
@ -4,6 +4,6 @@
 	"drops" : [
 		"auto"
 	],
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:gravel"
 }
--- a/assets/cubyz/blocks/ice.json
+++ b/assets/cubyz/blocks/ice.json
@ -7,7 +7,7 @@
 	"transparent" : true,
 	"hasBackFace" : true,
 	"absorbedLight" : 0xe95825,
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:ice",
 	"blockEntity" : "cubyz.modding.base.MeltableBlockEntity"
 }
--- a/assets/cubyz/blocks/iron_block.json
+++ b/assets/cubyz/blocks/iron_block.json
@ -6,6 +6,6 @@
 		"auto"
 	],
 	"rotation" : "stairs",
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:iron_block"
 }
--- a/assets/cubyz/blocks/iron_ore.json
+++ b/assets/cubyz/blocks/iron_ore.json
@ -14,6 +14,6 @@
 	"drops" : [
 		"auto"
 	],
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:iron_ore"
 }
--- a/assets/cubyz/blocks/lava.json
+++ b/assets/cubyz/blocks/lava.json
@ -11,6 +11,6 @@
 	"collide": false,
 	"absorbedLight" : 0x0084ff,
 	"emittedLight" : 0xff7b00,
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:lava"
 }
--- a/assets/cubyz/blocks/limestone.json
+++ b/assets/cubyz/blocks/limestone.json
@ -6,6 +6,6 @@
 		"auto"
 	],
 	"rotation" : "stairs",
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:limestone"
 }
--- a/assets/cubyz/blocks/limestone_bricks.json
+++ b/assets/cubyz/blocks/limestone_bricks.json
@ -5,6 +5,6 @@
 		"auto"
 	],
 	"rotation": "stairs",
-	"model": "cube",
+	"model": "cubyz:cube",
 	"texture": "cubyz:limestone_bricks"
 }
--- a/assets/cubyz/blocks/magma.json
+++ b/assets/cubyz/blocks/magma.json
@ -5,6 +5,6 @@
 		"auto"
 	],
 	"emittedLight" : 0x884928,
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:magma"
 }
--- a/assets/cubyz/blocks/mahogany_fence.json
+++ b/assets/cubyz/blocks/mahogany_fence.json
@ -6,7 +6,7 @@
 	],
 	"absorbedLight" : 0x202830,
 	"rotation" : "fence",
-	"model" : "fence",
+	"model" : "cubyz:fence",
 	"texture" : "cubyz:mahogany_fence",
 	"texture_top" : "cubyz:mahogany_fence_top",
 	"texture_bottom" : "cubyz:mahogany_fence_top"
--- a/assets/cubyz/blocks/mahogany_leaves.json
+++ b/assets/cubyz/blocks/mahogany_leaves.json
@ -8,7 +8,7 @@
 	"degradable" : true,
 	"alwaysViewThrough" : true,
 	"absorbedLight" : 0x121012,
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:mahogany_leaves",
 	"lodReplacement" : "cubyz:mahogany_leaves_opaque",
 	"opaqueVariant" : "cubyz:mahogany_leaves_opaque"
--- a/assets/cubyz/blocks/mahogany_leaves_opaque.json
+++ b/assets/cubyz/blocks/mahogany_leaves_opaque.json
@ -2,6 +2,6 @@
 	"class" : "leaf",
 	"hasItem" : false,
 	"absorbedLight" : 0x121012,
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:mahogany_leaves_opaque"
 }
--- a/assets/cubyz/blocks/mahogany_log.json
+++ b/assets/cubyz/blocks/mahogany_log.json
@ -5,7 +5,7 @@
 		"auto"
 	],
 	"rotation" : "log",
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:mahogany_log",
 	"texture_top" : "cubyz:mahogany_log_top",
 	"texture_bottom" : "cubyz:mahogany_log_top"
--- a/assets/cubyz/blocks/mahogany_planks.json
+++ b/assets/cubyz/blocks/mahogany_planks.json
@ -4,7 +4,7 @@
 	"drops" : [
 		"auto"
 	],
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"rotation" : "stairs",
 	"texture" : "cubyz:mahogany_planks"
 }
--- a/assets/cubyz/blocks/mahogany_top.json
+++ b/assets/cubyz/blocks/mahogany_top.json
@ -5,7 +5,7 @@
 		"auto"
 	],
 	"rotation" : "log",
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:mahogany_log",
 	"texture_top" : "cubyz:mahogany_log",
 	"texture_bottom" : "cubyz:mahogany_log_top"
--- a/assets/cubyz/blocks/marble.json
+++ b/assets/cubyz/blocks/marble.json
@ -5,6 +5,6 @@
 		"auto"
 	],
 	"rotation": "stairs",
-	"model": "cube",
+	"model": "cubyz:cube",
 	"texture": "cubyz:marble"
 }
--- a/assets/cubyz/blocks/marble_bricks.json
+++ b/assets/cubyz/blocks/marble_bricks.json
@ -5,6 +5,6 @@
 		"auto"
 	],
 	"rotation": "stairs",
-	"model": "cube",
+	"model": "cubyz:cube",
 	"texture": "cubyz:marble_bricks"
 }
--- a/assets/cubyz/blocks/mossy_cobblestone.json
+++ b/assets/cubyz/blocks/mossy_cobblestone.json
@ -4,7 +4,7 @@
 	"drops" : [
 		"auto"
 	],
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:mossy_cobblestone",

 	"rotation" : "stairs",
--- a/assets/cubyz/blocks/non_degradable_oak_leaves.json
+++ b/assets/cubyz/blocks/non_degradable_oak_leaves.json
@ -9,6 +9,6 @@
 	"degradable" : false,
 	"alwaysViewThrough" : true,
 	"absorbedLight" : 0x121012,
-	"model" : "cube",
+	"model" : "cubyz:cube",
 	"texture" : "cubyz:oak_leaves"
 }
--- a/assets/cubyz/blocks/oak_fence.json
+++ b/assets/cubyz/blocks/oak_fence.json
@ -6,7 +6,7 @@
 	],
 	"absorbedLight" : 0x202830,
 	"rotation" : "fence",
-	"model" : "fence",
+	"model" : "cubyz:fence",
 	"texture" : "cubyz:oak_fence",
 	"texture_top" : "cubyz:oak_fence_top",
 	"texture_bottom" : "cubyz:oak_fence_top"
--- a/Show More
+++ b/Show More