Replace old ore(coal, iron, diamond) textures with procedurally gener…

…ated ones. Also remove ugly grass(I don't want this in the release. It can be easily readded once graphics and textures exist.
PixelGuys · Feb 10, 2021 · c9fa918 · c9fa918
1 parent 4030ab1
commit c9fa918
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 292 deletions.
diff --git a/cubyz-client/addons/cubyz/blocks/grass_vegetation b/cubyz-client/addons/cubyz/blocks/grass_vegetation
diff --git a/cubyz-client/addons/cubyz/blocks/textures/coal_ore.png b/cubyz-client/addons/cubyz/blocks/textures/coal_ore.png
diff --git a/cubyz-client/addons/cubyz/blocks/textures/diamond_ore.png b/cubyz-client/addons/cubyz/blocks/textures/diamond_ore.png
diff --git a/cubyz-client/addons/cubyz/blocks/textures/grass_herb.png b/cubyz-client/addons/cubyz/blocks/textures/grass_herb.png
diff --git a/cubyz-client/addons/cubyz/blocks/textures/iron_ore.png b/cubyz-client/addons/cubyz/blocks/textures/iron_ore.png
diff --git a/cubyz-client/assets/cubyz/models/3d/grass_herb.obj b/cubyz-client/assets/cubyz/models/3d/grass_herb.obj
diff --git a/cubyz-common/src/io/cubyz/entity/ItemEntityManager.java b/cubyz-common/src/io/cubyz/entity/ItemEntityManager.java
@@ -4,6 +4,7 @@
 
 import org.joml.Vector3f;
 
+import io.cubyz.CubyzLogger;
 import io.cubyz.blocks.Block;
 import io.cubyz.items.Item;
 import io.cubyz.items.ItemStack;
@@ -58,7 +59,10 @@ public ItemEntityManager(Surface surface, NormalChunk chunk, byte[] data, Palett
 		int length = Bits.getInt(data, index);
 		index += 4;
 		// Check if the length is right:
-		if(data.length-index != length*4*9) throw new IllegalStateException("Save file is corrupted.");
+		if(data.length-index != length*4*9) {
+			CubyzLogger.logger.warning("Save file is corrupted. Skipping item entites for chunk "+chunk.getWorldX()+" "+chunk.getWorldZ());
+			length = 0;
+		}
 		// Init variables:
 		capacity = (length+63) & ~63;
 		posxyz = new float[3 * capacity];