fixed concurrently modifying the client item properties (#57)

infernalstudios · Nov 7, 2024 · 3de00ca · 3de00ca
1 parent f7a2d65
commit 3de00ca
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 36 deletions.
diff --git a/1.16/src/main/java/org/infernalstudios/nebs/NekosEnchantedBooks.java b/1.16/src/main/java/org/infernalstudios/nebs/NekosEnchantedBooks.java
@@ -53,14 +53,17 @@ private void doClientStuff(final FMLClientSetupEvent event) {
         Type type = new TypeToken<Map<String, Float>>(){}.getType();
         enchantmentMap = new Gson().fromJson(new BufferedReader(input), type);
 
-        ItemModelsProperties.register(Items.ENCHANTED_BOOK, new ResourceLocation("nebs:enchant"), (stack, world, entity) -> {
-            Map<Enchantment, Integer> map = EnchantmentHelper.getEnchantments(stack);
-            if (map.isEmpty() || enchantmentMap == null) {
-                return 0.0F;
-            }
+        // enqueue this part so we don't concurrently modify the client item properties
+        event.enqueueWork(() -> {
+            ItemModelsProperties.register(Items.ENCHANTED_BOOK, new ResourceLocation("nebs:enchant"), (stack, world, entity) -> {
+                Map<Enchantment, Integer> map = EnchantmentHelper.getEnchantments(stack);
+                if (map.isEmpty() || enchantmentMap == null) {
+                    return 0.0F;
+                }
 
-            String key = map.entrySet().iterator().next().getKey().getDescriptionId();
-            return enchantmentMap.getOrDefault(key, 0.0F);
+                String key = map.entrySet().iterator().next().getKey().getDescriptionId();
+                return enchantmentMap.getOrDefault(key, 0.0F);
+            });
         });
     }
 

diff --git a/1.17/src/main/java/org/infernalstudios/nebs/NekosEnchantedBooks.java b/1.17/src/main/java/org/infernalstudios/nebs/NekosEnchantedBooks.java
@@ -52,14 +52,17 @@ private void doClientStuff (final FMLClientSetupEvent event) {
         Type type = new TypeToken<Map<String, Float>>(){}.getType();
         enchantmentMap = new Gson().fromJson(new BufferedReader(input), type);
 
-        ItemProperties.register(Items.ENCHANTED_BOOK, new ResourceLocation("nebs:enchant"), (stack, world, entity, i) -> {
-            Map<Enchantment, Integer> map = EnchantmentHelper.getEnchantments(stack);
-            if (map.isEmpty() || enchantmentMap == null) {
-                return 0.0F;
-            }
+        // enqueue this part so we don't concurrently modify the client item properties
+        event.enqueueWork(() -> {
+            ItemProperties.register(Items.ENCHANTED_BOOK, new ResourceLocation("nebs:enchant"), (stack, world, entity, i) -> {
+                Map<Enchantment, Integer> map = EnchantmentHelper.getEnchantments(stack);
+                if (map.isEmpty() || enchantmentMap == null) {
+                    return 0.0F;
+                }
 
-            String key = map.entrySet().iterator().next().getKey().getDescriptionId();
-            return enchantmentMap.getOrDefault(key, 0.0F);
+                String key = map.entrySet().iterator().next().getKey().getDescriptionId();
+                return enchantmentMap.getOrDefault(key, 0.0F);
+            });
         });
     }
 

diff --git a/1.18/src/main/java/org/infernalstudios/nebs/NekosEnchantedBooks.java b/1.18/src/main/java/org/infernalstudios/nebs/NekosEnchantedBooks.java
@@ -52,14 +52,17 @@ private void doClientStuff (final FMLClientSetupEvent event) {
         Type type = new TypeToken<Map<String, Float>>(){}.getType();
         enchantmentMap = new Gson().fromJson(new BufferedReader(input), type);
 
-        ItemProperties.register(Items.ENCHANTED_BOOK, new ResourceLocation("nebs:enchant"), (stack, world, entity, i) -> {
-            Map<Enchantment, Integer> map = EnchantmentHelper.getEnchantments(stack);
-            if (map.isEmpty() || enchantmentMap == null) {
-                return 0.0F;
-            }
+        // enqueue this part so we don't concurrently modify the client item properties
+        event.enqueueWork(() -> {
+            ItemProperties.register(Items.ENCHANTED_BOOK, new ResourceLocation("nebs:enchant"), (stack, world, entity, i) -> {
+                Map<Enchantment, Integer> map = EnchantmentHelper.getEnchantments(stack);
+                if (map.isEmpty() || enchantmentMap == null) {
+                    return 0.0F;
+                }
 
-            String key = map.entrySet().iterator().next().getKey().getDescriptionId();
-            return enchantmentMap.getOrDefault(key, 0.0F);
+                String key = map.entrySet().iterator().next().getKey().getDescriptionId();
+                return enchantmentMap.getOrDefault(key, 0.0F);
+            });
         });
     }
 

diff --git a/1.19/src/main/java/org/infernalstudios/nebs/NekosEnchantedBooks.java b/1.19/src/main/java/org/infernalstudios/nebs/NekosEnchantedBooks.java
@@ -52,14 +52,17 @@ private void doClientStuff (final FMLClientSetupEvent event) {
         Type type = new TypeToken<Map<String, Float>>(){}.getType();
         enchantmentMap = new Gson().fromJson(new BufferedReader(input), type);
 
-        ItemProperties.register(Items.ENCHANTED_BOOK, new ResourceLocation("nebs:enchant"), (stack, world, entity, i) -> {
-            Map<Enchantment, Integer> map = EnchantmentHelper.getEnchantments(stack);
-            if (map.isEmpty() || enchantmentMap == null) {
-                return 0.0F;
-            }
+        // enqueue this part so we don't concurrently modify the client item properties
+        event.enqueueWork(() -> {
+            ItemProperties.register(Items.ENCHANTED_BOOK, new ResourceLocation("nebs:enchant"), (stack, world, entity, i) -> {
+                Map<Enchantment, Integer> map = EnchantmentHelper.getEnchantments(stack);
+                if (map.isEmpty() || enchantmentMap == null) {
+                    return 0.0F;
+                }
 
-            String key = map.entrySet().iterator().next().getKey().getDescriptionId();
-            return enchantmentMap.getOrDefault(key, 0.0F);
+                String key = map.entrySet().iterator().next().getKey().getDescriptionId();
+                return enchantmentMap.getOrDefault(key, 0.0F);
+            });
         });
     }
 

diff --git a/1.20/src/main/java/org/infernalstudios/nebs/NekosEnchantedBooks.java b/1.20/src/main/java/org/infernalstudios/nebs/NekosEnchantedBooks.java
@@ -52,17 +52,20 @@ private void doClientStuff (final FMLClientSetupEvent event) {
         Type type = new TypeToken<Map<String, Float>>(){}.getType();
         enchantmentMap = new Gson().fromJson(new BufferedReader(input), type);
 
-        ItemProperties.register(Items.ENCHANTED_BOOK, new ResourceLocation("nebs:enchant"), (stack, world, entity, i) -> {
-            Map<Enchantment, Integer> map = EnchantmentHelper.getEnchantments(stack);
-            if (map.isEmpty() || enchantmentMap == null) {
-                return 0.0F;
-            }
+        // enqueue this part so we don't concurrently modify the client item properties
+        event.enqueueWork(() -> {
+            ItemProperties.register(Items.ENCHANTED_BOOK, new ResourceLocation("nebs:enchant"), (stack, world, entity, i) -> {
+                Map<Enchantment, Integer> map = EnchantmentHelper.getEnchantments(stack);
+                if (map.isEmpty() || enchantmentMap == null) {
+                    return 0.0F;
+                }
 
-            String key = map.entrySet().iterator().next().getKey().getDescriptionId();
-            return enchantmentMap.getOrDefault(key, 0.0F);
+                String key = map.entrySet().iterator().next().getKey().getDescriptionId();
+                return enchantmentMap.getOrDefault(key, 0.0F);
+            });
         });
     }
-  
+
     private void gatherData(GatherDataEvent event) {
         DataGenerator gen = event.getGenerator();