fix: small tweak to item icon rendering

FTBTeam · Jun 17, 2024 · f958e79 · f958e79
1 parent 4b08c0d
commit f958e79
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/common/src/main/java/dev/ftb/mods/ftblibrary/icon/ItemIcon.java b/common/src/main/java/dev/ftb/mods/ftblibrary/icon/ItemIcon.java
@@ -3,6 +3,7 @@
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import dev.architectury.registry.registries.RegistrarManager;
+import dev.ftb.mods.ftblibrary.FTBLibrary;
 import dev.ftb.mods.ftblibrary.ui.GuiHelper;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
@@ -60,9 +61,10 @@ public static Icon getItemIcon(String lazyStackString) {
 			if (s.length >= 4 && !s[3].equals("null")) {
 				try {
 					DataComponentMap.CODEC.parse(NbtOps.INSTANCE, TagParser.parseTag(s[3]))
-							.ifSuccess(stack::applyComponents);
+							.resultOrPartial(err -> FTBLibrary.LOGGER.error("can't parse data component map for {}: {}", s[3], err))
+							.ifPresent(stack::applyComponents);
 				} catch (CommandSyntaxException ex) {
-					ex.printStackTrace();
+					FTBLibrary.LOGGER.error("can't parse data component tag for item icon: {} ({})", lazyStackString, ex.getMessage());
 				}
 			}
 
@@ -94,11 +96,11 @@ public ItemStack getStack() {
 	public void draw(GuiGraphics graphics, int x, int y, int w, int h) {
 		PoseStack poseStack = graphics.pose();
 		poseStack.pushPose();
-		poseStack.translate(x + w / 2D, y + h / 2D, 100);
+		poseStack.translate(x + w / 2D, y + h / 2D, 0);
 
 		if (w != 16 || h != 16) {
-			int s = Math.min(w, h);
-			poseStack.scale(s / 16F, s / 16F, s / 16F);
+			float s = Math.min(w, h) / 16F;
+			poseStack.scale(s, s, s);
 		}
 
 		GuiHelper.drawItem(graphics, getStack(), 0, true, null);
@@ -110,11 +112,11 @@ public void draw(GuiGraphics graphics, int x, int y, int w, int h) {
 	public void drawStatic(GuiGraphics graphics, int x, int y, int w, int h) {
 		PoseStack poseStack = graphics.pose();
 		poseStack.pushPose();
-		poseStack.translate(x + w / 2D, y + h / 2D, 100);
+		poseStack.translate(x + w / 2D, y + h / 2D, 0);
 
 		if (w != 16 || h != 16) {
-			int s = Math.min(w, h);
-			poseStack.scale(s / 16F, s / 16F, s / 16F);
+			float s = Math.min(w, h) / 16F;
+			poseStack.scale(s, s, s);
 		}
 
 		GuiHelper.drawItem(graphics, getStack(), 0, false, null);