Enqueue some client setup to prevent CME (#5123)

SlimeKnights · Apr 27, 2023 · 31c2430 · 31c2430
1 parent 9d79ac1
commit 31c2430
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 42 deletions.
diff --git a/src/main/java/slimeknights/tconstruct/plugin/jsonthings/PluginClient.java b/src/main/java/slimeknights/tconstruct/plugin/jsonthings/PluginClient.java
@@ -16,14 +16,16 @@ public static void init() {
   }
 
   private static void clientSetup(FMLClientSetupEvent event) {
-    for (Item item : FlexItemTypes.TOOL_ITEMS) {
-      TinkerItemProperties.registerToolProperties(item);
-    }
-    for (Item item : FlexItemTypes.BOW_ITEMS) {
-      TinkerItemProperties.registerBowProperties(item);
-    }
-    for (Item item : FlexItemTypes.CROSSBOW_ITEMS) {
-      TinkerItemProperties.registerCrossbowProperties(item);
-    }
+    event.enqueueWork(() -> {
+      for (Item item : FlexItemTypes.TOOL_ITEMS) {
+        TinkerItemProperties.registerToolProperties(item);
+      }
+      for (Item item : FlexItemTypes.BOW_ITEMS) {
+        TinkerItemProperties.registerBowProperties(item);
+      }
+      for (Item item : FlexItemTypes.CROSSBOW_ITEMS) {
+        TinkerItemProperties.registerCrossbowProperties(item);
+      }
+    });
   }
 }
diff --git a/src/main/java/slimeknights/tconstruct/tools/ToolClientEvents.java b/src/main/java/slimeknights/tconstruct/tools/ToolClientEvents.java
@@ -128,41 +128,43 @@ static void clientSetupEvent(FMLClientSetupEvent event) {
     ArmorModelHelper.init();
 
     // keybinds
-    ClientRegistry.registerKeyBinding(HELMET_INTERACT);
-    ClientRegistry.registerKeyBinding(LEGGINGS_INTERACT);
+    event.enqueueWork(() -> {
+      ClientRegistry.registerKeyBinding(HELMET_INTERACT);
+      ClientRegistry.registerKeyBinding(LEGGINGS_INTERACT);
 
-    // screens
-    MenuScreens.register(TinkerTools.toolContainer.get(), ToolContainerScreen::new);
+      // screens
+      MenuScreens.register(TinkerTools.toolContainer.get(), ToolContainerScreen::new);
 
-    // properties
-    // stone
-    TinkerItemProperties.registerToolProperties(TinkerTools.pickaxe.asItem());
-    TinkerItemProperties.registerToolProperties(TinkerTools.sledgeHammer.asItem());
-    TinkerItemProperties.registerToolProperties(TinkerTools.veinHammer.asItem());
-    // dirt
-    TinkerItemProperties.registerToolProperties(TinkerTools.mattock.asItem());
-    TinkerItemProperties.registerToolProperties(TinkerTools.pickadze.asItem());
-    TinkerItemProperties.registerToolProperties(TinkerTools.excavator.asItem());
-    // axe
-    TinkerItemProperties.registerToolProperties(TinkerTools.handAxe.asItem());
-    TinkerItemProperties.registerToolProperties(TinkerTools.broadAxe.asItem());
-    // leaves
-    TinkerItemProperties.registerToolProperties(TinkerTools.kama.asItem());
-    TinkerItemProperties.registerToolProperties(TinkerTools.scythe.asItem());
-    // sword
-    TinkerItemProperties.registerToolProperties(TinkerTools.dagger.asItem());
-    TinkerItemProperties.registerToolProperties(TinkerTools.sword.asItem());
-    TinkerItemProperties.registerToolProperties(TinkerTools.cleaver.asItem());
-    // bow
-    TinkerItemProperties.registerCrossbowProperties(TinkerTools.crossbow.asItem());
-    TinkerItemProperties.registerBowProperties(TinkerTools.longbow.asItem());
-    // misc
-    TinkerItemProperties.registerToolProperties(TinkerTools.flintAndBrick.asItem());
-    TinkerItemProperties.registerToolProperties(TinkerTools.skyStaff.asItem());
-    TinkerItemProperties.registerToolProperties(TinkerTools.earthStaff.asItem());
-    TinkerItemProperties.registerToolProperties(TinkerTools.ichorStaff.asItem());
-    TinkerItemProperties.registerToolProperties(TinkerTools.travelersShield.asItem());
-    TinkerItemProperties.registerToolProperties(TinkerTools.plateShield.asItem());
+      // properties
+      // stone
+      TinkerItemProperties.registerToolProperties(TinkerTools.pickaxe.asItem());
+      TinkerItemProperties.registerToolProperties(TinkerTools.sledgeHammer.asItem());
+      TinkerItemProperties.registerToolProperties(TinkerTools.veinHammer.asItem());
+      // dirt
+      TinkerItemProperties.registerToolProperties(TinkerTools.mattock.asItem());
+      TinkerItemProperties.registerToolProperties(TinkerTools.pickadze.asItem());
+      TinkerItemProperties.registerToolProperties(TinkerTools.excavator.asItem());
+      // axe
+      TinkerItemProperties.registerToolProperties(TinkerTools.handAxe.asItem());
+      TinkerItemProperties.registerToolProperties(TinkerTools.broadAxe.asItem());
+      // leaves
+      TinkerItemProperties.registerToolProperties(TinkerTools.kama.asItem());
+      TinkerItemProperties.registerToolProperties(TinkerTools.scythe.asItem());
+      // sword
+      TinkerItemProperties.registerToolProperties(TinkerTools.dagger.asItem());
+      TinkerItemProperties.registerToolProperties(TinkerTools.sword.asItem());
+      TinkerItemProperties.registerToolProperties(TinkerTools.cleaver.asItem());
+      // bow
+      TinkerItemProperties.registerCrossbowProperties(TinkerTools.crossbow.asItem());
+      TinkerItemProperties.registerBowProperties(TinkerTools.longbow.asItem());
+      // misc
+      TinkerItemProperties.registerToolProperties(TinkerTools.flintAndBrick.asItem());
+      TinkerItemProperties.registerToolProperties(TinkerTools.skyStaff.asItem());
+      TinkerItemProperties.registerToolProperties(TinkerTools.earthStaff.asItem());
+      TinkerItemProperties.registerToolProperties(TinkerTools.ichorStaff.asItem());
+      TinkerItemProperties.registerToolProperties(TinkerTools.travelersShield.asItem());
+      TinkerItemProperties.registerToolProperties(TinkerTools.plateShield.asItem());
+    });
   }
 
   @SubscribeEvent