Skip to content

Commit 28f0df9

Browse files
committed
Rework out-of-jar loading so it properly logs errors
Should be more resilient to blunder of passing jar path into out-of-jar resloc
1 parent 2a15fee commit 28f0df9

File tree

1 file changed

+7
-10
lines changed

1 file changed

+7
-10
lines changed

src/main/java/com/ldtteam/blockui/util/texture/OutOfJarTexture.java

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,13 @@ public static AbstractTexture assertLoadedDefaultManagers(final ResourceLocation
8484
*/
8585
public static AbstractTexture assertLoaded(final ResourceLocation resLoc, final TextureManager textureManager, final ResourceManager resourceManager)
8686
{
87-
final AbstractTexture current = textureManager.getTexture(resLoc);
8887
if (!(resLoc instanceof final OutOfJarResourceLocation outOfJarResLoc))
8988
{
9089
// if not out-of-jar use normal vanilla systems
91-
return current;
90+
return textureManager.getTexture(resLoc);
9291
}
9392

93+
final AbstractTexture current = textureManager.getTexture(resLoc, null);
9494
if (IsOurTexture.isOur(current))
9595
{
9696
return current;
@@ -109,15 +109,12 @@ public static AbstractTexture assertLoaded(final ResourceLocation resLoc, final
109109
final OutOfJarTexture outOfJarTexture = new OutOfJarTexture(outOfJarResLoc);
110110
textureManager.register(outOfJarResLoc, outOfJarTexture); // this causes texture to load
111111

112-
if (!outOfJarTexture.redirectToSprite)
112+
if (outOfJarTexture.redirectToSprite)
113113
{
114-
return outOfJarTexture;
115-
}
116-
else
117-
{
118-
final SpriteTexture spriteTexture = new SpriteTexture(outOfJarResLoc);
119-
textureManager.register(outOfJarResLoc, spriteTexture);
120-
return spriteTexture;
114+
textureManager.register(outOfJarResLoc, new SpriteTexture(outOfJarResLoc));
121115
}
116+
117+
// do recursive resolution - cant overflow because manager is aware of path now
118+
return assertLoaded(outOfJarResLoc, textureManager, resourceManager);
122119
}
123120
}

0 commit comments

Comments
 (0)