Skip to content

Commit

Permalink
Merge branch '1.20' into feat/entity_action_types/show_toast
Browse files Browse the repository at this point in the history
  • Loading branch information
eggohito committed Dec 14, 2023
2 parents 7799508 + 4ac3968 commit 7284b98
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public static DataResult<Identifier> tryLoadingTexture(Identifier id, Function<I
public static DataResult<Identifier> tryLoadingSprite(Identifier spriteId, Identifier atlasId) {

TextureManagerAccessor textureManagerAccessor = (TextureManagerAccessor) MinecraftClient.getInstance().getTextureManager();
DataResult<Identifier> atlasResult = tryLoadingTexture(atlasId, _id -> "", _id -> "");
DataResult<Identifier> atlasResult = tryLoadingTexture(atlasId, _id -> "Texture \"" + _id + "\" does not exist!", _id -> "\n");

if (atlasResult.result().isEmpty()) {
return atlasResult.mapError(err -> "Failed to load atlas \"%s\": %s".formatted(atlasId, err));
Expand Down

0 comments on commit 7284b98

Please sign in to comment.