From 0129df97c8806ac75af28d8d096134153fad9067 Mon Sep 17 00:00:00 2001
From: ToCraft <piminecraft492@gmail.com>
Date: Sat, 2 Mar 2024 11:51:08 +0100
Subject: [PATCH] make displayVariants functional again

---
 common/src/main/java/tocraft/remorphed/RemorphedClient.java   | 2 --
 .../main/java/tocraft/remorphed/screen/RemorphedScreen.java   | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/common/src/main/java/tocraft/remorphed/RemorphedClient.java b/common/src/main/java/tocraft/remorphed/RemorphedClient.java
index aef876f..cf500b5 100644
--- a/common/src/main/java/tocraft/remorphed/RemorphedClient.java
+++ b/common/src/main/java/tocraft/remorphed/RemorphedClient.java
@@ -23,7 +23,5 @@ public void initialize() {
         // Register event handlers
         ClientTickEvent.CLIENT_PRE.register(new KeyPressHandler());
         ClientNetworking.registerPacketHandlers();
-
-        ClientPlayerEvent.CLIENT_PLAYER_JOIN.register(player -> new Thread(RemorphedScreen::populateRenderEntities).start());
     }
 }
diff --git a/common/src/main/java/tocraft/remorphed/screen/RemorphedScreen.java b/common/src/main/java/tocraft/remorphed/screen/RemorphedScreen.java
index d4330fe..9aecac1 100644
--- a/common/src/main/java/tocraft/remorphed/screen/RemorphedScreen.java
+++ b/common/src/main/java/tocraft/remorphed/screen/RemorphedScreen.java
@@ -35,7 +35,7 @@
 @Environment(EnvType.CLIENT)
 public class RemorphedScreen extends Screen {
     private final List<ShapeType<?>> unlocked = new ArrayList<>();
-    private static final Map<ShapeType<?>, Mob> renderEntities = new LinkedHashMap<>();
+    private final Map<ShapeType<?>, Mob> renderEntities = new LinkedHashMap<>();
     private final List<EntityWidget<?>> entityWidgets = new ArrayList<>();
     private final SearchWidget searchBar = createSearchBar();
     private final Button helpButton = createHelpButton();
@@ -192,7 +192,7 @@ private void populateEntityWidgets(List<ShapeType<?>> rendered) {
         }
     }
 
-    public static void populateRenderEntities() {
+    private void populateRenderEntities() {
         if (renderEntities.isEmpty()) {
             List<ShapeType<?>> types = ShapeType.getAllTypes(Minecraft.getInstance().level, Remorphed.displayVariantsInMenu);
             for (ShapeType<?> type : types) {