Fix UU matter recipes.

Adds a PaddedShapedRecipe to RebornCore

RebornCore/build.gradle

@@ -1 +1,5 @@
 group = 'RebornCore'
+
+minecraft {
+    accessWidener = file("src/main/resources/reborncore.accesswidener")
+}

RebornCore/src/main/java/reborncore/RebornCore.java

@@ -45,6 +45,7 @@ import reborncore.common.misc.RebornCoreTags;
 import reborncore.common.multiblock.MultiblockRegistry;
 import reborncore.common.network.ServerBoundPackets;
 import reborncore.common.powerSystem.PowerSystem;
+import reborncore.common.recipes.PaddedShapedRecipe;
 import reborncore.common.util.CalenderUtils;
 import reborncore.common.util.GenericWrenchHelper;
 
@@ -107,6 +108,7 @@ public class RebornCore implements ModInitializer {
 		RebornCoreCommands.setup();
 
 		RebornCoreTags.WATER_EXPLOSION_ITEM.toString();
+		PaddedShapedRecipe.PADDED.toString();
 		
 		/* register UnloadHandler */
 		ServerBlockEntityEvents.BLOCK_ENTITY_UNLOAD.register((blockEntity, world) -> {

RebornCore/src/main/java/reborncore/common/recipes/PaddedShapedRecipe.java

@@ -0,0 +1,62 @@
+/*
+ * This file is part of RebornCore, licensed under the MIT License (MIT).
+ *
+ * Copyright (c) 2021 TeamReborn
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package reborncore.common.recipes;
+
+import com.google.gson.JsonObject;
+import net.minecraft.item.ItemStack;
+import net.minecraft.recipe.Ingredient;
+import net.minecraft.recipe.RecipeSerializer;
+import net.minecraft.recipe.ShapedRecipe;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.JsonHelper;
+import net.minecraft.util.collection.DefaultedList;
+import net.minecraft.util.registry.Registry;
+
+import java.util.Map;
+
+public class PaddedShapedRecipe extends ShapedRecipe {
+	public static final Identifier ID = new Identifier("reborncore", "padded");
+	public static final RecipeSerializer<ShapedRecipe> PADDED = Registry.register(Registry.RECIPE_SERIALIZER, ID, new Serializer());
+
+	public PaddedShapedRecipe(Identifier id, String group, int width, int height, DefaultedList<Ingredient> input, ItemStack output) {
+		super(id, group, width, height, input, output);
+	}
+
+	private static class Serializer extends ShapedRecipe.Serializer {
+		@Override
+		public PaddedShapedRecipe read(Identifier identifier, JsonObject jsonObject) {
+			String group = JsonHelper.getString(jsonObject, "group", "");
+			Map<String, Ingredient> map = readSymbols(JsonHelper.getObject(jsonObject, "key"));
+			String[] strings = getPattern(JsonHelper.getArray(jsonObject, "pattern"));
+
+			int width = strings[0].length();
+			int height = strings.length;
+
+			DefaultedList<Ingredient> ingredients = createPatternMatrix(strings, map, width, height);
+			ItemStack output = outputFromJson(JsonHelper.getObject(jsonObject, "result"));
+			return new PaddedShapedRecipe(identifier, group, width, height, ingredients, output);
+		}
+	}
+}

RebornCore/src/main/resources/fabric.mod.json

@@ -46,5 +46,6 @@
   ],
   "custom": {
     "modmenu:api": true
-  }
+  },
+  "accessWidener": "reborncore.accesswidener"
 }

RebornCore/src/main/resources/reborncore.accesswidener

@@ -0,0 +1,5 @@
+accessWidener	v1	named
+
+accessible    method    net/minecraft/recipe/ShapedRecipe    readSymbols    (Lcom/google/gson/JsonObject;)Ljava/util/Map;
+accessible    method    net/minecraft/recipe/ShapedRecipe    getPattern    (Lcom/google/gson/JsonArray;)[Ljava/lang/String;
+accessible    method    net/minecraft/recipe/ShapedRecipe    createPatternMatrix    ([Ljava/lang/String;Ljava/util/Map;II)Lnet/minecraft/util/collection/DefaultedList;

src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/aluminum_dust.json

@@ -1,17 +1,14 @@
 {
-  "type": "minecraft:crafting_shaped",
+  "type": "reborncore:padded",
   "pattern": [
     "UUU",
-    "UXX",
+    "U  ",
-    "XXX"
+    "   "
   ],
   "key": {
     "U": {
       "item": "techreborn:uu_matter"
-    },
+    }
-	"X": {
-	  "item": "minecraft:air"
-	}
   },
   "result": {
     "item": "techreborn:aluminum_dust"

src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/bone.json

@@ -1,17 +1,14 @@
 {
-  "type": "minecraft:crafting_shaped",
+  "type": "reborncore:padded",
   "pattern": [
-    "XXX",
+    "   ",
-    "UXX",
+    "U  ",
-    "XXX"
+    "   "
   ],
   "key": {
     "U": {
       "item": "techreborn:uu_matter"
-    },
+    }
-	"X": {
-	  "item": "minecraft:air"
-	}
   },
   "result": {
     "item": "minecraft:bone"

src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/cactus.json

@@ -1,17 +1,14 @@
 {
-  "type": "minecraft:crafting_shaped",
+  "type": "reborncore:padded",
   "pattern": [
-    "UXX",
+    "U  ",
-    "XXU",
+    "  U",
-    "XXX"
+    "   "
   ],
   "key": {
     "U": {
       "item": "techreborn:uu_matter"
-    },
+    }
-	"X": {
-	  "item": "minecraft:air"
-	}
   },
   "result": {
     "item": "minecraft:cactus"

src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/chrome_dust.json

@@ -1,16 +1,13 @@
 {
-  "type": "minecraft:crafting_shaped",
+  "type": "reborncore:padded",
   "pattern": [
     "UUU",
-    "UUX",
+    "UU ",
-    "XUX"
+    " U "
   ],
   "key": {
     "U": {
       "item": "techreborn:uu_matter"
-	},
-	"X": {
-	  "item": "minecraft:air"
 	}
   },
   "result": {

src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/clay.json

@@ -1,17 +1,14 @@
 {
-  "type": "minecraft:crafting_shaped",
+  "type": "reborncore:padded",
   "pattern": [
-    "XXU",
+    "  U",
-    "XXX",
+    "   ",
-    "XXX"
+    "   "
   ],
   "key": {
     "U": {
       "item": "techreborn:uu_matter"
-    },
+    }
-	"X": {
-	  "item": "minecraft:air"
-	}
   },
   "result": {
     "item": "minecraft:clay"

src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/coal_ore.json

@@ -1,17 +1,14 @@
 {
-  "type": "minecraft:crafting_shaped",
+  "type": "reborncore:padded",
   "pattern": [
-    "UXX",
+    "U  ",
-    "XUX",
+    " U ",
-    "XXX"
+    "   "
   ],
   "key": {
     "U": {
       "item": "techreborn:uu_matter"
-    },
+    }
-	"X": {
-	  "item": "minecraft:air"
-	}
   },
   "result": {
     "item": "minecraft:coal_ore"

src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/cocoa_beans.json

@@ -1,17 +1,14 @@
 {
-  "type": "minecraft:crafting_shaped",
+  "type": "reborncore:padded",
   "pattern": [
-    "UXX",
+    "U  ",
-    "XXX",
+    "   ",
-    "UXX"
+    "U  "
   ],
   "key": {
     "U": {
       "item": "techreborn:uu_matter"
-    },
+    }
-	"X": {
-	  "item": "minecraft:air"
-	}
   },
   "result": {
     "item": "minecraft:cocoa_beans"

src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/copper_dust.json

@@ -1,17 +1,14 @@
 {
-  "type": "minecraft:crafting_shaped",
+  "type": "reborncore:padded",
   "pattern": [
-    "UXX",
+    "U  ",
-    "XXX",
+    "   ",
-    "XUX"
+    " U "
   ],
   "key": {
     "U": {
       "item": "techreborn:uu_matter"
-    },
+    }
-	"X": {
-	  "item": "minecraft:air"
-	}
   },
   "result": {
     "item": "techreborn:copper_dust"

src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/diamond_ore.json

@@ -1,17 +1,14 @@
 {
-  "type": "minecraft:crafting_shaped",
+  "type": "reborncore:padded",
   "pattern": [
-    "XUX",
+    " U ",
     "UUU",
-    "UUX"
+    "UU "
   ],
   "key": {
     "U": {
       "item": "techreborn:uu_matter"
-    },
+    }
-	"X": {
-	  "item": "minecraft:air"
-	}
   },
   "result": {
     "item": "minecraft:diamond_ore"

src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/emerald_ore.json

@@ -1,17 +1,14 @@
 {
-  "type": "minecraft:crafting_shaped",
+  "type": "reborncore:padded",
   "pattern": [
     "UUU",
-    "UXU",
+    "U U",
-    "UXX"
+    "U  "
   ],
   "key": {
     "U": {
       "item": "techreborn:uu_matter"
-    },
+    }
-	"X": {
-	  "item": "minecraft:air"
-	}
   },
   "result": {
     "item": "minecraft:emerald_ore"

src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/ender_pearl.json

@@ -1,17 +1,14 @@
 {
-  "type": "minecraft:crafting_shaped",
+  "type": "reborncore:padded",
   "pattern": [
     "UUU",
-    "XXX",
+    "   ",
-    "XXX"
+    "   "
   ],
   "key": {
     "U": {
       "item": "techreborn:uu_matter"
-    },
+    }
-	"X": {
-	  "item": "minecraft:air"
-	}
   },
   "result": {
     "item": "minecraft:ender_pearl"

src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/feather.json

@@ -1,17 +1,14 @@
 {
-  "type": "minecraft:crafting_shaped",
+  "type": "reborncore:padded",
   "pattern": [
-    "UXX",
+    "U  ",
-    "UXX",
+    "U  ",
-    "UXX"
+    "U  "
   ],
   "key": {
     "U": {
       "item": "techreborn:uu_matter"
-    },
+    }
-	"X": {
-	  "item": "minecraft:air"
-	}
   },
   "result": {
     "item": "minecraft:feather"

src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/glass.json

@@ -1,17 +1,14 @@
 {
-  "type": "minecraft:crafting_shaped",
+  "type": "reborncore:padded",
   "pattern": [
-    "UXX",
+    "U  ",
-    "XXX",
+    "   ",
-    "XXU"
+    "  U"
   ],
   "key": {
     "U": {
       "item": "techreborn:uu_matter"
-    },
+    }
-	"X": {
-	  "item": "minecraft:air"
-	}
   },
   "result": {
     "item": "minecraft:glass"

src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/glowstone.json

@@ -1,17 +1,14 @@
 {
-  "type": "minecraft:crafting_shaped",
+  "type": "reborncore:padded",
   "pattern": [
-    "UUX",
+    "UU ",
-    "XXX",
+    "   ",
-    "XXX"
+    "   "
   ],
   "key": {
     "U": {
       "item": "techreborn:uu_matter"
-    },
+    }
-	"X": {
-	  "item": "minecraft:air"
-	}
   },
   "result": {
     "item": "minecraft:glowstone"

src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/gold_ore.json

@@ -1,17 +1,14 @@
 {
-  "type": "minecraft:crafting_shaped",
+  "type": "reborncore:padded",
   "pattern": [
-    "XXX",
+    "   ",
     "UUU",
-    "XXX"
+    "   "
   ],
   "key": {
     "U": {
       "item": "techreborn:uu_matter"
-    },
+    }
-	"X": {
-	  "item": "minecraft:air"
-	}
   },
   "result": {
     "item": "minecraft:gold_ore"

src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/grass_block.json

@@ -1,17 +1,14 @@
 {
-  "type": "minecraft:crafting_shaped",
+  "type": "reborncore:padded",
   "pattern": [
-    "XXX",
+    "   ",
-    "XXX",
+    "   ",
-    "UXX"
+    "U  "
   ],
   "key": {
     "U": {
       "item": "techreborn:uu_matter"
-    },
+    }
-	"X": {
-	  "item": "minecraft:air"
-	}
   },
   "result": {
     "item": "minecraft:grass_block"

src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/gunpowder.json

@@ -1,17 +1,14 @@
 {
-  "type": "minecraft:crafting_shaped",
+  "type": "reborncore:padded",
   "pattern": [
-    "UXX",
+    "U  ",
-    "XUX",
+    " U ",
-    "XXU"
+    "  U"
   ],
   "key": {
     "U": {
       "item": "techreborn:uu_matter"
-    },
+    }
-	"X": {
-	  "item": "minecraft:air"
-	}
   },
   "result": {
     "item": "minecraft:gunpowder"

src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/ink_sac.json

@@ -1,17 +1,14 @@
 {
-  "type": "minecraft:crafting_shaped",
+  "type": "reborncore:padded",
   "pattern": [
-    "UUX",
+    "UU ",
-    "UXX",
+    "U  ",
-    "XXX"
+    "   "
   ],
   "key": {
     "U": {
       "item": "techreborn:uu_matter"
-    },
+    }
-	"X": {
-	  "item": "minecraft:air"
-	}
   },
   "result": {
     "item": "minecraft:ink_sac"

src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/iridium_ore.json

@@ -1,17 +1,14 @@
 {
-  "type": "minecraft:crafting_shaped",
+  "type": "reborncore:padded",
   "pattern": [
     "UUU",
-    "UUX",
+    "UU ",
-    "UXX"
+    "U  "
   ],
   "key": {
     "U": {
       "item": "techreborn:uu_matter"
-    },
+    }
-	"X": {
-	  "item": "minecraft:air"
-	}
   },
   "result": {
     "item": "techreborn:iridium_ore"

src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/iron_ore.json

@@ -1,17 +1,14 @@
 {
-  "type": "minecraft:crafting_shaped",
+  "type": "reborncore:padded",
   "pattern": [
-    "UXU",
+    "U U",
-    "XXX",
+    "   ",
-    "XXX"
+    "   "
   ],
   "key": {
     "U": {
       "item": "techreborn:uu_matter"
-    },
+    }
-	"X": {
-	  "item": "minecraft:air"
-	}
   },
   "result": {
     "item": "minecraft:iron_ore"

src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/lapis_ore.json

@@ -1,17 +1,14 @@
 {
-  "type": "minecraft:crafting_shaped",
+  "type": "reborncore:padded",
   "pattern": [
-    "UXX",
+    "U  ",
-    "UXX",
+    "U  ",
-    "XXX"
+    "   "
   ],
   "key": {
     "U": {
       "item": "techreborn:uu_matter"
-    },
+    }
-	"X": {
-	  "item": "minecraft:air"
-	}
   },
   "result": {
     "item": "minecraft:lapis_ore"

src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/lead_dust.json

@@ -1,17 +1,14 @@
 {
-  "type": "minecraft:crafting_shaped",
+  "type": "reborncore:padded",
   "pattern": [
-    "XXX",
+    "   ",
-    "UXX",
+    "U  ",
-    "UXX"
+    "U  "
   ],
   "key": {
     "U": {
       "item": "techreborn:uu_matter"
-    },
+    }
-	"X": {
-	  "item": "minecraft:air"
-	}
   },
   "result": {
     "item": "techreborn:lead_dust"

src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/lily_pad.json

@@ -1,17 +1,14 @@
 {
-  "type": "minecraft:crafting_shaped",
+  "type": "reborncore:padded",
   "pattern": [
-    "XUX",
+    " U ",
-    "XXU",
+    "  U",
-    "XXX"
+    "   "
   ],
   "key": {
     "U": {
       "item": "techreborn:uu_matter"
-    },
+    }
-	"X": {
-	  "item": "minecraft:air"
-	}
   },
   "result": {
     "item": "minecraft:lily_pad"

src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/oak_wood.json

@@ -1,17 +1,14 @@
 {
-  "type": "minecraft:crafting_shaped",
+  "type": "reborncore:padded",
   "pattern": [
-    "XUX",
+    " U ",
-    "XXX",
+    "   ",
-    "XXX"
+    "   "
   ],
   "key": {
     "U": {
       "item": "techreborn:uu_matter"
-    },
+    }
-	"X": {
-	  "item": "minecraft:air"
-	}
   },
   "result": {
     "item": "minecraft:oak_wood"

src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/obsidian.json

@@ -1,17 +1,14 @@
 {
-  "type": "minecraft:crafting_shaped",
+  "type": "reborncore:padded",
   "pattern": [
     "UUU",
-    "XUX",
+    " U ",
-    "XXX"
+    "   "
   ],
   "key": {
     "U": {
       "item": "techreborn:uu_matter"
-    },
+    }
-	"X": {
-	  "item": "minecraft:air"
-	}
   },
   "result": {
     "item": "minecraft:obsidian"

src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/platinum_dust.json

@@ -1,17 +1,14 @@
 {
-  "type": "minecraft:crafting_shaped",
+  "type": "reborncore:padded",
   "pattern": [
     "UUU",
-    "UUX",
+    "UU ",
-    "XXX"
+    "   "
   ],
   "key": {
     "U": {
       "item": "techreborn:uu_matter"
-    },
+    }
-	"X": {
-	  "item": "minecraft:air"
-	}
   },
   "result": {
     "item": "techreborn:platinum_dust"

src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/redstone_ore.json

@@ -1,17 +1,14 @@
 {
-  "type": "minecraft:crafting_shaped",
+  "type": "reborncore:padded",
   "pattern": [
-    "XXX",
+    "   ",
-    "XXX",
+    "   ",
-    "UXU"
+    "U U"
   ],
   "key": {
     "U": {
       "item": "techreborn:uu_matter"
-    },
+    }
-	"X": {
-	  "item": "minecraft:air"
-	}
   },
   "result": {
     "item": "minecraft:redstone_ore"

src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/snow_block.json

@@ -1,17 +1,14 @@
 {
-  "type": "minecraft:crafting_shaped",
+  "type": "reborncore:padded",
   "pattern": [
-    "XXX",
+    "   ",
-    "XXX",
+    "   ",
-    "XUX"
+    " U "
   ],
   "key": {
     "U": {
       "item": "techreborn:uu_matter"
-    },
+    }
-	"X": {
-	  "item": "minecraft:air"
-	}
   },
   "result": {
     "item": "minecraft:snow_block"

src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/stone.json

@@ -1,17 +1,14 @@
 {
-  "type": "minecraft:crafting_shaped",
+  "type": "reborncore:padded",
   "pattern": [
-    "XXX",
+    "   ",
-    "XUX",
+    " U ",
-    "XXX"
+    "   "
   ],
   "key": {
     "U": {
       "item": "techreborn:uu_matter"
-    },
+    }
-	"X": {
-	  "item": "minecraft:air"
-	}
   },
   "result": {
     "item": "minecraft:stone"

src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/sugar_cane.json

@@ -1,17 +1,14 @@
 {
-  "type": "minecraft:crafting_shaped",
+  "type": "reborncore:padded",
   "pattern": [
-    "XUX",
+    " U ",
-    "XXX",
+    "   ",
-    "UXX"
+    "U  "
   ],
   "key": {
     "U": {
       "item": "techreborn:uu_matter"
-    },
+    }
-	"X": {
-	  "item": "minecraft:air"
-	}
   },
   "result": {
     "item": "minecraft:sugar_cane"

src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/tin_dust.json

@@ -1,17 +1,14 @@
 {
-  "type": "minecraft:crafting_shaped",
+  "type": "reborncore:padded",
   "pattern": [
-    "XXX",
+    "   ",
-    "XUX",
+    " U ",
-    "XXU"
+    "  U"
   ],
   "key": {
     "U": {
       "item": "techreborn:uu_matter"
-    },
+    }
-	"X": {
-	  "item": "minecraft:air"
-	}
   },
   "result": {
     "item": "techreborn:tin_dust"

src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/titanium_dust.json

@@ -1,17 +1,14 @@
 {
-  "type": "minecraft:crafting_shaped",
+  "type": "reborncore:padded",
   "pattern": [
     "UUU",
-    "UXU",
+    "U U",
-    "XXX"
+    "   "
   ],
   "key": {
     "U": {
       "item": "techreborn:uu_matter"
-    },
+    }
-	"X": {
-	  "item": "minecraft:air"
-	}
   },
   "result": {
     "item": "techreborn:titanium_dust"

src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/tungsten_dust.json

@@ -1,17 +1,14 @@
 {
-  "type": "minecraft:crafting_shaped",
+  "type": "reborncore:padded",
   "pattern": [
     "UUU",
     "UUU",
-    "XXX"
+    "   "
   ],
   "key": {
     "U": {
       "item": "techreborn:uu_matter"
-    },
+    }
-	"X": {
-	  "item": "minecraft:air"
-	}
   },
   "result": {
     "item": "techreborn:tungsten_dust"

src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/vine.json

@@ -1,17 +1,14 @@
 {
-  "type": "minecraft:crafting_shaped",
+  "type": "reborncore:padded",
   "pattern": [
-    "XUX",
+    " U ",
-    "XUX",
+    " U ",
-    "XXX"
+    "   "
   ],
   "key": {
     "U": {
       "item": "techreborn:uu_matter"
-    },
+    }
-	"X": {
-	  "item": "minecraft:air"
-	}
   },
   "result": {
     "item": "minecraft:vine"