Don't limit texture count + fix loading screen

minecraft8997 · Nov 22, 2023 · 483125c · 483125c
1 parent a681362
commit 483125c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/core/src/ru/mclord/classic/LoadingScreen.java b/core/src/ru/mclord/classic/LoadingScreen.java
@@ -61,6 +61,7 @@ public void render(float delta) {
 
             int x = i * TextureManager.getInstance().getTextureSize();
             if (x >= width) break;
+            System.out.println("Drawing at " + x + " " + PROGRESS_BAR_HEIGHT);
             batch.draw(blockTexture, x, PROGRESS_BAR_HEIGHT);
         }
         double percentage = progress / 100.0D;

diff --git a/core/src/ru/mclord/classic/TextureManager.java b/core/src/ru/mclord/classic/TextureManager.java
@@ -87,17 +87,11 @@ public void load(String path, boolean allowNet, boolean allowFileSystem) {
         int width = image.getWidth();
         int height = image.getHeight();
 
-        int textureSize;
-        int textureCount = -1;
-        if (height == width) {
-            textureCount = 256;
-        } else if (height == width * 2) {
-            textureCount = 512;
-        } else {
-            illegalTerrainDimensions();
-        }
+        int textureCount;
         if (width % 16 != 0) illegalTerrainDimensions();
         textureSize = width / 16;
+        if (height % textureSize != 0) illegalTerrainDimensions();
+        textureCount = (height / textureSize) * 16;
 
         textures = new Texture[textureCount];