Moved from 'res' to 'assets/cubyz'

cubyz-client/res/models/UFO.mtl

@@ -1,58 +0,0 @@
-# Blender MTL File: 'UFO2.blend'
-# Material Count: 6
-
-newmtl Material.001
-Ns 96.078431
-Ka 0.000000 0.000000 0.000000
-Kd 0.149646 0.177695 1.000000
-Ks 0.000000 0.000000 0.000000
-Ni 1.000000
-d 1.000000
-illum 0
-
-newmtl Material.002
-Ns 96.078431
-Ka 0.000000 0.000000 0.000000
-Kd 0.800000 0.000000 0.000000
-Ks 0.003268 0.003268 0.003268
-Ni 1.000000
-d 1.000000
-illum 0
-
-newmtl Material.003
-Ns 96.078431
-Ka 0.000000 0.000000 0.000000
-Kd 0.000000 0.983498 1.000000
-Ks 0.000000 0.000000 0.000000
-Ni 1.000000
-d 1.000000
-illum 0
-
-newmtl Material.005
-Ns 96.078431
-Ka 0.000000 0.000000 0.000000
-Kd 1.000000 1.000000 1.000000
-Ks 0.000000 0.000000 0.000000
-Ni 1.000000
-d 1.000000
-illum 0
-
-newmtl Material.006
-Ns 96.078431
-Ka 0.000000 0.000000 0.000000
-Kd 1.000000 1.000000 1.000000
-Ks 0.000000 0.000000 0.000000
-Ni 1.000000
-d 1.000000
-illum 0
-map_Kd 931377098.jpg
-
-newmtl Material.008
-Ns 96.078431
-Ka 0.000000 0.000000 0.000000
-Kd 0.800000 0.800000 0.800000
-Ks 0.450450 0.450450 0.450450
-Ni 1.000000
-d 1.000000
-illum 2
-map_Kd 931377098.jpg

cubyz-client/src/io/cubyz/client/Cubyz.java

@@ -150,7 +150,7 @@ public class Cubyz implements IGameLogic {
 		log.info("Version " + Constants.GAME_VERSION + " of brand " + Constants.GAME_BRAND);
 		log.info("LWJGL Version: " + Version.VERSION_MAJOR + "." + Version.VERSION_MINOR + "." + Version.VERSION_REVISION);
 		log.info("Jungle Version: " + Jungle.getVersion());
-		renderer.setShaderFolder("res/shaders/default");
+		renderer.setShaderFolder("assets/cubyz/shaders/default");
 		try {
 			renderer.init(window);
 		} catch (Exception e) {
@@ -184,14 +184,14 @@ public class Cubyz implements IGameLogic {
 		ClientOnly.createBlockMesh = (block) -> {
 			try {
 				if (block.isTextureConverted()) { // block.texConverted
-					block.getBlockPair().set("textureCache", new Texture("res/textures/blocks/" + block.getTexture() + ".png"));
+					block.getBlockPair().set("textureCache", new Texture("assets/cubyz/textures/blocks/" + block.getTexture() + ".png"));
 				} else {
 					block.getBlockPair().set("textureCache", new Texture(TextureConverter.fromBufferedImage(
-							TextureConverter.convert(ImageIO.read(new File("res/textures/blocks/" + block.getTexture() + ".png")),
+							TextureConverter.convert(ImageIO.read(new File("assets/cubyz/textures/blocks/" + block.getTexture() + ".png")),
 									block.getTexture()))));
 				}
 				// Assuming mesh too is empty
-				block.getBlockPair().set("meshCache", OBJLoader.loadMesh("res/models/cube.obj"));
+				block.getBlockPair().set("meshCache", OBJLoader.loadMesh("assets/cubyz/models/cube.obj"));
 				((Mesh) block.getBlockPair().get("meshCache")).setBoundingRadius(2.0F);
 				Material material = new Material((Texture) block.getBlockPair().get("textureCache"), 1.0F);
 				((Mesh) block.getBlockPair().get("meshCache")).setMaterial(material);

cubyz-client/src/io/cubyz/ui/UISystem.java

@@ -54,7 +54,7 @@ public class UISystem extends Hud {
 	    if (nvg == NULL) {
 	        throw new Exception("Could not init nanovg");
 	    }
-		Font.register("OpenSans Bold", "res/fonts/opensans/OpenSans-Bold.ttf", nvg);
+		Font.register("OpenSans Bold", "assets/cubyz/fonts/opensans/OpenSans-Bold.ttf", nvg);
 		NGraphics.setNanoID(nvg);
 		inited = true;
 	}

cubyz-common/src/io/cubyz/api/base/BaseMod.java

@@ -1,4 +1,4 @@
-package io.cubyz.api.base;
+ package io.cubyz.api.base;
 
 import io.cubyz.api.EventHandler;
 import io.cubyz.api.Mod;