From 694f9f5e8d762de982f52e22e62673942d9e424f Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Sun, 27 Nov 2016 13:29:58 +0100 Subject: [PATCH] make this a bit nicer --- .../mod/misc/special/SpecialRenderInit.java | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/special/SpecialRenderInit.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/special/SpecialRenderInit.java index 32acbaaa5..37b81f3b0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/special/SpecialRenderInit.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/special/SpecialRenderInit.java @@ -21,12 +21,12 @@ import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import java.util.HashMap; -import java.util.Map; +import java.util.Locale; import java.util.Properties; public class SpecialRenderInit{ - public static final HashMap SPECIAL_LIST = new HashMap(); + private static final HashMap SPECIAL_LIST = new HashMap(); public SpecialRenderInit(){ new ThreadSpecialFetcher(); @@ -61,7 +61,7 @@ public class SpecialRenderInit{ //Add a new Special Renderer to the list if(StackUtil.isValid(stack)){ - SPECIAL_LIST.put(key, new RenderSpecial(stack)); + SPECIAL_LIST.put(key.toLowerCase(Locale.ROOT), new RenderSpecial(stack)); } } } @@ -69,15 +69,14 @@ public class SpecialRenderInit{ @SubscribeEvent(priority = EventPriority.HIGHEST) public void onPlayerRender(RenderPlayerEvent.Pre event){ - if(!SPECIAL_LIST.isEmpty()){ - for(Map.Entry entry : SPECIAL_LIST.entrySet()){ - //Does the player have one of the names from the list? - String playerName = event.getEntityPlayer().getName(); - if(entry.getKey() != null && playerName != null){ - if(entry.getKey().equalsIgnoreCase(playerName)){ - //Render the special Item/Block - entry.getValue().render(event.getEntityPlayer(), event.getPartialRenderTick()); - break; + if(event.getEntityPlayer() != null){ + String name = event.getEntityPlayer().getName(); + if(name != null){ + String lower = name.toLowerCase(Locale.ROOT); + if(SPECIAL_LIST.containsKey(lower)){ + RenderSpecial render = SPECIAL_LIST.get(lower); + if(render != null){ + render.render(event.getEntityPlayer(), event.getPartialRenderTick()); } } }