From 7e53a8bc73889afb1993e1b6aef5eb42de8e3af5 Mon Sep 17 00:00:00 2001 From: Fury_Phoenix <64714532+Phoenix-Starlight@users.noreply.github.com> Date: Thu, 28 Dec 2023 06:38:54 -0800 Subject: [PATCH] Eliminate extraneous casts (#327) --- .../modernfix/dynamicresources/ModelBakeryHelpers.java | 2 +- .../java/org/embeddedt/modernfix/registry/RegistryStorage.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/common/src/main/java/org/embeddedt/modernfix/dynamicresources/ModelBakeryHelpers.java b/common/src/main/java/org/embeddedt/modernfix/dynamicresources/ModelBakeryHelpers.java index 17150999..21b0ede2 100644 --- a/common/src/main/java/org/embeddedt/modernfix/dynamicresources/ModelBakeryHelpers.java +++ b/common/src/main/java/org/embeddedt/modernfix/dynamicresources/ModelBakeryHelpers.java @@ -350,7 +350,7 @@ public class ModelBakeryHelpers { } private static > T getValueHelper(Property property, String value) { - return property.getValue(value).orElse((T) null); + return property.getValue(value).orElse(null); } private static final Splitter COMMA_SPLITTER = Splitter.on(','); diff --git a/common/src/main/java/org/embeddedt/modernfix/registry/RegistryStorage.java b/common/src/main/java/org/embeddedt/modernfix/registry/RegistryStorage.java index 252676d2..5d2fb207 100644 --- a/common/src/main/java/org/embeddedt/modernfix/registry/RegistryStorage.java +++ b/common/src/main/java/org/embeddedt/modernfix/registry/RegistryStorage.java @@ -15,9 +15,8 @@ public class RegistryStorage { public static BiMap, DirectStorageRegistryObject> createKeyStorage(ResourceKey> registryKey, BiMap storage) { if(storage instanceof DirectStorageBiMap) { - DirectStorageBiMap directStorageBiMap = (DirectStorageBiMap)storage; // silently ignore put/putAll calls on this map - return new TransformingBiMap, DirectStorageRegistryObject>(directStorageBiMap, loc -> ResourceKey.create(registryKey, loc), ResourceKey::location, Function.identity(), Function.identity()) { + return new TransformingBiMap, DirectStorageRegistryObject>(storage, loc -> ResourceKey.create(registryKey, loc), ResourceKey::location, Function.identity(), Function.identity()) { @Override public DirectStorageRegistryObject put(ResourceKey key, DirectStorageRegistryObject value) { return null;