HOPEFULLY fixes netowrk packet issues.

Author: Waterpicker

common/src/main/java/generations/gg/generations/core/generationscore/common/world/recipe/ShapedRksRecipe.java

@@ -229,50 +229,29 @@ public record Serializer() implements RecipeSerializer<ShapedRksRecipe> {
 
         @Override
         public @NotNull ShapedRksRecipe fromNetwork(@NotNull ResourceLocation recipeId, FriendlyByteBuf buffer) {
-            int i = buffer.readVarInt();
-            int j = buffer.readVarInt();
-            String string = buffer.readUtf();
-            NonNullList<GenerationsIngredient> nonNullList = NonNullList.withSize(i * j, GenerationsIngredient.EmptyIngredient.INSTANCE);
-            nonNullList.replaceAll(ignored -> GenerationsIngredidents.fromNetwork(buffer));
-
-
+            var width = buffer.readVarInt();
+            var height = buffer.readVarInt();
+            var group = buffer.readUtf();
+            var recipeItems = buffer.readCollection(size -> NonNullList.withSize(size, GenerationsIngredient.EmptyIngredient.INSTANCE), GenerationsIngredidents::fromNetwork);
             var result = RksResultType.RKS_RESULT.get(buffer.readResourceLocation()).fromBuffer().apply(buffer);
-
             var consumesTimeCapsules = buffer.readBoolean();
+            var key = buffer.readNullable(TimeCapsuleIngredientKt::readSpeciesKey);
+            var experience = buffer.readFloat();
+            var processingTime = buffer.readInt();
+            var showNotification = buffer.readBoolean();
 
-            var speciesKey = buffer.readNullable(buf -> {
-                var location = buf.readResourceLocation();
-                var aspects = buf.readNullable((FriendlyByteBuf.Reader<Set<String>>) buf1 -> buf1.readCollection(HashSet::new, FriendlyByteBuf::readUtf));
-
-                return new SpeciesKey(location, aspects);
-            });
-
-            float experience = buffer.readFloat();
-            int weavingTime = buffer.readInt();
-            boolean bl = buffer.readBoolean();
-
-            return new ShapedRksRecipe(recipeId, string, i, j, nonNullList, result, consumesTimeCapsules, speciesKey, experience, weavingTime, bl);
+            return new ShapedRksRecipe(recipeId, group, width, height, recipeItems, result, consumesTimeCapsules, key, experience, processingTime, showNotification);
         }
 
         @Override
         public void toNetwork(FriendlyByteBuf buffer, ShapedRksRecipe recipe) {
             buffer.writeVarInt(recipe.width);
             buffer.writeVarInt(recipe.height);
             buffer.writeUtf(recipe.group);
-
-            for (GenerationsIngredient generationsIngredient : recipe.recipeItems) {
-                GenerationsIngredidents.toNetwork(buffer, generationsIngredient);
-            }
-
+            buffer.writeCollection(recipe.recipeItems, GenerationsIngredidents::toNetwork);
             recipe.result.toBuffer(buffer);
-
             buffer.writeBoolean(recipe.consumesTimeCapsules);
-
-            buffer.writeNullable(recipe.key, (buf, speciesKey) -> {
-                buffer.writeResourceLocation(speciesKey.species());
-                buffer.writeNullable(speciesKey.aspects(), (buf1, strings) -> buf1.writeCollection(strings, FriendlyByteBuf::writeUtf));
-            });
-
+            buffer.writeNullable(recipe.key, TimeCapsuleIngredientKt::writeSpeciesKey);
             buffer.writeFloat(recipe.experience());
             buffer.writeInt(recipe.processingTime());
             buffer.writeBoolean(recipe.showNotification);

common/src/main/java/generations/gg/generations/core/generationscore/common/world/recipe/ShapelessRksRecipe.java

@@ -123,49 +123,25 @@ private static NonNullList<GenerationsIngredient> itemsFromJson(JsonArray ingred
 
         @Override
         public @NotNull ShapelessRksRecipe fromNetwork(@NotNull ResourceLocation recipeId, FriendlyByteBuf buffer) {
-            String string = buffer.readUtf();
-
-            int i = buffer.readInt();
-            NonNullList<GenerationsIngredient> nonNullList = NonNullList.withSize(i, GenerationsIngredient.EmptyIngredient.INSTANCE);
-            nonNullList.replaceAll(ignored -> GenerationsIngredidents.fromNetwork(buffer));
-
-
+            var group = buffer.readUtf();
+            var ingredients = buffer.readCollection(size -> NonNullList.withSize(size, GenerationsIngredient.EmptyIngredient.INSTANCE), GenerationsIngredidents::fromNetwork);
             var result = RksResultType.RKS_RESULT.get(buffer.readResourceLocation()).fromBuffer().apply(buffer);
-
             var consumesTimeCapsules = buffer.readBoolean();
-
-            var speciesKey = buffer.readNullable(buf -> {
-                var location = buf.readResourceLocation();
-                var aspects = buf.readNullable((FriendlyByteBuf.Reader<Set<String>>) buf1 -> buf1.readCollection(HashSet::new, FriendlyByteBuf::readUtf));
-
-                return new SpeciesKey(location, aspects);
-            });
-
+            var key = buffer.readNullable(TimeCapsuleIngredientKt::readSpeciesKey);
             float experience = buffer.readFloat();
-            int weavingTime = buffer.readInt();
-            boolean bl = buffer.readBoolean();
+            int processingTime = buffer.readInt();
+            boolean showNotification = buffer.readBoolean();
 
-            return new ShapelessRksRecipe(recipeId, string, result, nonNullList, consumesTimeCapsules, speciesKey, experience, weavingTime, bl);
+            return new ShapelessRksRecipe(recipeId, group, result, ingredients, consumesTimeCapsules, key, experience, processingTime, showNotification);
         }
 
         @Override
         public void toNetwork(FriendlyByteBuf buffer, ShapelessRksRecipe recipe) {
             buffer.writeUtf(recipe.group);
-
-            buffer.writeVarInt(recipe.ingredients.size());
-            for (GenerationsIngredient generationsIngredient : recipe.ingredients) {
-                GenerationsIngredidents.toNetwork(buffer, generationsIngredient);
-            }
-
+            buffer.writeCollection(recipe.ingredients, GenerationsIngredidents::toNetwork);
             recipe.result.toBuffer(buffer);
-
             buffer.writeBoolean(recipe.consumesTimeCapsules);
-
-            buffer.writeNullable(recipe.key, (buf, speciesKey) -> {
-                buffer.writeResourceLocation(speciesKey.species());
-                buffer.writeNullable(speciesKey.aspects(), (buf1, strings) -> buf1.writeCollection(strings, FriendlyByteBuf::writeUtf));
-            });
-
+            buffer.writeNullable(recipe.key, TimeCapsuleIngredientKt::writeSpeciesKey);
             buffer.writeFloat(recipe.experience());
             buffer.writeInt(recipe.processingTime());
             buffer.writeBoolean(recipe.showNotification);

common/src/main/java/generations/gg/generations/core/generationscore/common/world/recipe/TimeCapsuleIngredient.kt

@@ -52,9 +52,9 @@ object TimeCapsuleIngredientSerializer : GenerationsIngredientSerializer<TimeCap
     }
 }
 
-private fun FriendlyByteBuf.readSpeciesKey(): SpeciesKey =
+fun FriendlyByteBuf.readSpeciesKey(): SpeciesKey =
     SpeciesKey(
         this.readResourceLocation(),
         this.readCollection<String, HashSet<String>>(::HashSet, FriendlyByteBuf::readUtf)
     )
-private fun FriendlyByteBuf.writeSpeciesKey(key: SpeciesKey): FriendlyByteBuf = this.writeResourceLocation(key.species).writeCollection(key.aspects, FriendlyByteBuf::writeUtf).let { this }
+fun FriendlyByteBuf.writeSpeciesKey(key: SpeciesKey): FriendlyByteBuf = this.writeResourceLocation(key.species).writeCollection(key.aspects, FriendlyByteBuf::writeUtf).let { this }