Fix running dedicated server

Author: Rover656

.gitignore

@@ -26,6 +26,7 @@ build
 # other
 eclipse
 run
+run-server
 
 # Files from Forge MDK
 forge*changelog.txt

build.gradle

@@ -107,7 +107,7 @@ minecraft {
         }
 
         server {
-            workingDirectory project.file('run')
+            workingDirectory project.file('run-server')
 
             property 'forge.logging.markers', 'REGISTRIES'
             property 'forge.logging.console.level', 'debug'

src/machines/java/com/enderio/machines/common/recipe/SoulBindingRecipe.java

@@ -217,15 +217,19 @@ public SoulBindingRecipe fromNetwork(ResourceLocation recipeId, FriendlyByteBuf
                 int exp = buffer.readInt();
 
                 ResourceLocation entityType = null;
-                try { //fails if not present
-                    entityType = buffer.readResourceLocation();
-                } catch (Exception ignored) {
+                if (buffer.readBoolean()) {
+                    try { //fails if not present
+                        entityType = buffer.readResourceLocation();
+                    } catch (Exception ignored) {
+                    }
                 }
 
                 MobCategory mobCategory = null;
-                try { //fails if not present
-                    mobCategory = MobCategory.byName(buffer.readUtf());
-                } catch (Exception ignored) {
+                if (buffer.readBoolean()) {
+                    try { //fails if not present
+                        mobCategory = MobCategory.byName(buffer.readUtf());
+                    } catch (Exception ignored) {
+                    }
                 }
 
                 return new SoulBindingRecipe(recipeId, output, input, energy, exp, entityType, mobCategory);
@@ -242,9 +246,13 @@ public void toNetwork(FriendlyByteBuf buffer, SoulBindingRecipe recipe) {
                 recipe.input.toNetwork(buffer);
                 buffer.writeInt(recipe.energy);
                 buffer.writeInt(recipe.exp);
+
+                buffer.writeBoolean(recipe.entityType != null);
                 if (recipe.entityType != null) { //don't write null
                     buffer.writeResourceLocation(recipe.entityType);
                 }
+
+                buffer.writeBoolean(recipe.mobCategory != null);
                 if (recipe.mobCategory != null) { //don't write null
                     buffer.writeUtf(recipe.mobCategory.getName());
                 }

src/main/java/com/enderio/base/common/recipe/ShapedEntityStorageRecipe.java

@@ -28,7 +28,7 @@ public class ShapedEntityStorageRecipe extends ShapedRecipe {
 
     public ShapedEntityStorageRecipe(ShapedRecipe recipe) {
         super(recipe.getId(), recipe.getGroup(), recipe.category(), recipe.getRecipeWidth(), recipe.getRecipeHeight(), recipe.getIngredients(),
-            recipe.getResultItem(Minecraft.getInstance().level != null ? Minecraft.getInstance().level.registryAccess() : null)); // Gross, but better than always passing null
+            recipe.result); // Gross, but better than always passing null
 
         REGISTERED_RECIPES.add(recipe.getId());
     }

src/main/resources/META-INF/accesstransformer.cfg

@@ -27,3 +27,6 @@ public-f net.minecraft.client.renderer.MultiBufferSource$BufferSource f_109905_
 public net.minecraft.data.recipes.SimpleCookingRecipeBuilder m_247292_(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/item/crafting/CookingBookCategory; # determineSmeltingRecipeCategory
 public net.minecraft.data.recipes.SimpleCookingRecipeBuilder m_246122_(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/item/crafting/CookingBookCategory; # determineBlastingRecipeCategory
 public net.minecraft.data.recipes.SimpleCookingRecipeBuilder m_246784_(Lnet/minecraft/world/item/crafting/RecipeSerializer;Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/item/crafting/CookingBookCategory; # determineRecipeCategory
+
+# For passing to our wrapped recipe
+public-f net.minecraft.world.item.crafting.ShapedRecipe f_44149_ # result