Skip to content

Commit c9fa918

Browse files
Replace old ore(coal, iron, diamond) textures with procedurally generated ones.
Also remove ugly grass(I don't want this in the release. It can be easily readded once graphics and textures exist.
1 parent 4030ab1 commit c9fa918

File tree

7 files changed

+5
-292
lines changed

7 files changed

+5
-292
lines changed

cubyz-client/addons/cubyz/blocks/grass_vegetation

Lines changed: 0 additions & 9 deletions
This file was deleted.
-405 Bytes
Loading
-187 Bytes
Loading
-986 Bytes
Binary file not shown.
-337 Bytes
Loading

cubyz-client/assets/cubyz/models/3d/grass_herb.obj

Lines changed: 0 additions & 282 deletions
This file was deleted.

cubyz-common/src/io/cubyz/entity/ItemEntityManager.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
import org.joml.Vector3f;
66

7+
import io.cubyz.CubyzLogger;
78
import io.cubyz.blocks.Block;
89
import io.cubyz.items.Item;
910
import io.cubyz.items.ItemStack;
@@ -58,7 +59,10 @@ public ItemEntityManager(Surface surface, NormalChunk chunk, byte[] data, Palett
5859
int length = Bits.getInt(data, index);
5960
index += 4;
6061
// Check if the length is right:
61-
if(data.length-index != length*4*9) throw new IllegalStateException("Save file is corrupted.");
62+
if(data.length-index != length*4*9) {
63+
CubyzLogger.logger.warning("Save file is corrupted. Skipping item entites for chunk "+chunk.getWorldX()+" "+chunk.getWorldZ());
64+
length = 0;
65+
}
6266
// Init variables:
6367
capacity = (length+63) & ~63;
6468
posxyz = new float[3 * capacity];

0 commit comments

Comments
 (0)