From 78aa76280257172beae73f6228938dd0c74b4ee2 Mon Sep 17 00:00:00 2001 From: UnlikePaladin <36827970+UnlikePaladin@users.noreply.github.com> Date: Mon, 2 Oct 2023 18:24:58 -0600 Subject: [PATCH] Fix set_primary_texture and set_secondary_texture not being able to receive nil as a first argument. --- .../org/figuramc/figura/model/FiguraModelPart.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/org/figuramc/figura/model/FiguraModelPart.java b/common/src/main/java/org/figuramc/figura/model/FiguraModelPart.java index 647a755f8..550900680 100644 --- a/common/src/main/java/org/figuramc/figura/model/FiguraModelPart.java +++ b/common/src/main/java/org/figuramc/figura/model/FiguraModelPart.java @@ -772,7 +772,12 @@ public Object getSecondaryDefinedTextures(Integer value) { ) public FiguraModelPart setPrimaryTexture(String type, Object x) { try { - FiguraTextureSet.OverrideType overrideType = FiguraTextureSet.OverrideType.valueOf(type.toUpperCase()); + FiguraTextureSet.OverrideType overrideType; + if (type == null) { + overrideType = FiguraTextureSet.OverrideType.PRIMARY; + } else { + overrideType = FiguraTextureSet.OverrideType.valueOf(type.toUpperCase()); + } checkTexture(overrideType, x); this.customization.primaryTexture = type == null ? null : new TextureCustomization(overrideType, x); return this; @@ -802,7 +807,12 @@ public FiguraModelPart setPrimaryTexture(String type, Object x) { ) public FiguraModelPart setSecondaryTexture(String type, Object x) { try { - FiguraTextureSet.OverrideType overrideType = FiguraTextureSet.OverrideType.valueOf(type.toUpperCase()); + FiguraTextureSet.OverrideType overrideType; + if (type == null) { + overrideType = FiguraTextureSet.OverrideType.SECONDARY; + } else { + overrideType = FiguraTextureSet.OverrideType.valueOf(type.toUpperCase()); + } checkTexture(overrideType, x); this.customization.secondaryTexture = type == null ? null : new TextureCustomization(overrideType, x); return this;