From 58b86a98525be9eae52e81647cbb5f4d437b4b26 Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Sat, 3 Jan 2026 15:29:58 -0500 Subject: [PATCH] Restructure code --- .../dynresources/DynamicModelSystem.java | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/embeddedt/modernfix/dynresources/DynamicModelSystem.java b/src/main/java/org/embeddedt/modernfix/dynresources/DynamicModelSystem.java index c648194e..d661a4d3 100644 --- a/src/main/java/org/embeddedt/modernfix/dynresources/DynamicModelSystem.java +++ b/src/main/java/org/embeddedt/modernfix/dynresources/DynamicModelSystem.java @@ -177,20 +177,21 @@ public class DynamicModelSystem { @Override public Object load(K key) throws Exception { var unbaked = input.get(key); - if (unbaked != null) { - if (DEBUG_DYNAMIC_MODEL_LOADING) { - ModernFix.LOGGER.info("Baking {}", key); - } - var bakerResult = baker.apply(key, unbaked); - if (bakerResult == null) { - ModernFix.LOGGER.warn("Baker has returned null for {}", key); - return NULL_BAKED; - } else { - return bakerResult; - } - } else { + if (unbaked == null) { return NULL_BAKED; } + + if (DEBUG_DYNAMIC_MODEL_LOADING) { + ModernFix.LOGGER.info("Baking {}", key); + } + + var bakerResult = baker.apply(key, unbaked); + if (bakerResult == null) { + ModernFix.LOGGER.warn("Baker has returned null for {}", key); + return NULL_BAKED; + } + + return bakerResult; } }); return new DynamicRegistryMap<>(input.keySet(), k -> {