diff --git a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java index 107ccc88f..05fce7470 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java @@ -41,6 +41,7 @@ import java.io.IOException; import java.io.InputStreamReader; import java.net.URL; import java.nio.charset.StandardCharsets; +import java.util.Collections; import java.util.HashMap; import java.util.Locale; import java.util.Map; @@ -48,7 +49,7 @@ import java.util.Properties; public final class ContributorFancinessHandler extends LayerRenderer> { - public static final Map flowerMap = new HashMap<>(); + private static volatile Map flowerMap = Collections.emptyMap(); private static boolean startedLoading = false; private static final ImmutableMap LEGACY_FLOWER_NAMES = ImmutableMap.builder() @@ -80,8 +81,12 @@ public final class ContributorFancinessHandler extends LayerRenderer m = new HashMap<>(); for(String key : props.stringPropertyNames()) { String value = props.getProperty(key); @@ -107,7 +116,7 @@ public final class ContributorFancinessHandler extends LayerRenderer= 16) throw new NumberFormatException(); - flowerMap.put(key, new ItemStack(ModBlocks.getFlower(DyeColor.byId(i)))); + m.put(key, new ItemStack(ModBlocks.getFlower(DyeColor.byId(i)))); } catch (NumberFormatException e) { String rawName = value.toLowerCase(Locale.ROOT); String flowerName = LEGACY_FLOWER_NAMES.getOrDefault(rawName, rawName); @@ -115,9 +124,10 @@ public final class ContributorFancinessHandler extends LayerRenderer flower.getRegistryName().getPath().equals(flowerName)) .findFirst().orElse(Items.POPPY); - flowerMap.put(key, new ItemStack(item)); + m.put(key, new ItemStack(item)); } } + flowerMap = m; } private static void renderGoldfish(PlayerEntity player) { diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java index d153c1a33..5d6cbca7a 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java @@ -289,8 +289,8 @@ public class RenderTileTinyPotato extends TileEntityRenderer { GlStateManager.translatef(1.25F, -1.25F, 2.25F); mc.textureManager.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE); renderBlock(Blocks.CAKE); - } else if (ContributorFancinessHandler.flowerMap.containsKey(name)) { - ItemStack icon = ContributorFancinessHandler.flowerMap.getOrDefault(name, ItemStack.EMPTY); + } else { + ItemStack icon = ContributorFancinessHandler.getFlower(name); if (!icon.isEmpty()) { mc.textureManager.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE); GlStateManager.rotatef(180F, 1F, 0F, 0F);