From dc216b974de7572533b91d35f57fa735dca3dcc9 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Wed, 2 Jun 2021 21:25:15 +0100 Subject: [PATCH] Fix UU matter recipes. Adds a PaddedShapedRecipe to RebornCore --- RebornCore/build.gradle | 6 +- .../src/main/java/reborncore/RebornCore.java | 2 + .../common/recipes/PaddedShapedRecipe.java | 62 +++++++++++++++++++ RebornCore/src/main/resources/fabric.mod.json | 3 +- .../main/resources/reborncore.accesswidener | 5 ++ .../uu_matter/aluminum_dust.json | 11 ++-- .../crafting_table/uu_matter/bone.json | 13 ++-- .../crafting_table/uu_matter/cactus.json | 13 ++-- .../crafting_table/uu_matter/chrome_dust.json | 9 +-- .../crafting_table/uu_matter/clay.json | 13 ++-- .../crafting_table/uu_matter/coal_ore.json | 13 ++-- .../crafting_table/uu_matter/cocoa_beans.json | 13 ++-- .../crafting_table/uu_matter/copper_dust.json | 13 ++-- .../crafting_table/uu_matter/diamond_ore.json | 11 ++-- .../crafting_table/uu_matter/emerald_ore.json | 11 ++-- .../crafting_table/uu_matter/ender_pearl.json | 11 ++-- .../crafting_table/uu_matter/feather.json | 13 ++-- .../crafting_table/uu_matter/glass.json | 13 ++-- .../crafting_table/uu_matter/glowstone.json | 13 ++-- .../crafting_table/uu_matter/gold_ore.json | 11 ++-- .../crafting_table/uu_matter/grass_block.json | 13 ++-- .../crafting_table/uu_matter/gunpowder.json | 13 ++-- .../crafting_table/uu_matter/ink_sac.json | 13 ++-- .../crafting_table/uu_matter/iridium_ore.json | 11 ++-- .../crafting_table/uu_matter/iron_ore.json | 13 ++-- .../crafting_table/uu_matter/lapis_ore.json | 13 ++-- .../crafting_table/uu_matter/lead_dust.json | 13 ++-- .../crafting_table/uu_matter/lily_pad.json | 13 ++-- .../crafting_table/uu_matter/oak_wood.json | 13 ++-- .../crafting_table/uu_matter/obsidian.json | 11 ++-- .../uu_matter/platinum_dust.json | 11 ++-- .../uu_matter/redstone_ore.json | 13 ++-- .../crafting_table/uu_matter/snow_block.json | 13 ++-- .../crafting_table/uu_matter/stone.json | 13 ++-- .../crafting_table/uu_matter/sugar_cane.json | 13 ++-- .../crafting_table/uu_matter/tin_dust.json | 13 ++-- .../uu_matter/titanium_dust.json | 11 ++-- .../uu_matter/tungsten_dust.json | 9 +-- .../crafting_table/uu_matter/vine.json | 13 ++-- 39 files changed, 233 insertions(+), 261 deletions(-) create mode 100644 RebornCore/src/main/java/reborncore/common/recipes/PaddedShapedRecipe.java create mode 100644 RebornCore/src/main/resources/reborncore.accesswidener diff --git a/RebornCore/build.gradle b/RebornCore/build.gradle index 3abcd9254..af3a5b00a 100644 --- a/RebornCore/build.gradle +++ b/RebornCore/build.gradle @@ -1 +1,5 @@ -group = 'RebornCore' \ No newline at end of file +group = 'RebornCore' + +minecraft { + accessWidener = file("src/main/resources/reborncore.accesswidener") +} \ No newline at end of file diff --git a/RebornCore/src/main/java/reborncore/RebornCore.java b/RebornCore/src/main/java/reborncore/RebornCore.java index 49a1b02de..aad3920d4 100644 --- a/RebornCore/src/main/java/reborncore/RebornCore.java +++ b/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) -> { diff --git a/RebornCore/src/main/java/reborncore/common/recipes/PaddedShapedRecipe.java b/RebornCore/src/main/java/reborncore/common/recipes/PaddedShapedRecipe.java new file mode 100644 index 000000000..9ca912680 --- /dev/null +++ b/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 PADDED = Registry.register(Registry.RECIPE_SERIALIZER, ID, new Serializer()); + + public PaddedShapedRecipe(Identifier id, String group, int width, int height, DefaultedList 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 map = readSymbols(JsonHelper.getObject(jsonObject, "key")); + String[] strings = getPattern(JsonHelper.getArray(jsonObject, "pattern")); + + int width = strings[0].length(); + int height = strings.length; + + DefaultedList ingredients = createPatternMatrix(strings, map, width, height); + ItemStack output = outputFromJson(JsonHelper.getObject(jsonObject, "result")); + return new PaddedShapedRecipe(identifier, group, width, height, ingredients, output); + } + } +} diff --git a/RebornCore/src/main/resources/fabric.mod.json b/RebornCore/src/main/resources/fabric.mod.json index b54fdf1f2..b14f7c107 100644 --- a/RebornCore/src/main/resources/fabric.mod.json +++ b/RebornCore/src/main/resources/fabric.mod.json @@ -46,5 +46,6 @@ ], "custom": { "modmenu:api": true - } + }, + "accessWidener": "reborncore.accesswidener" } \ No newline at end of file diff --git a/RebornCore/src/main/resources/reborncore.accesswidener b/RebornCore/src/main/resources/reborncore.accesswidener new file mode 100644 index 000000000..56e702394 --- /dev/null +++ b/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; \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/aluminum_dust.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/aluminum_dust.json index 7f2b4e50a..f055f71aa 100644 --- a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/aluminum_dust.json +++ b/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", - "XXX" + "U ", + " " ], "key": { "U": { "item": "techreborn:uu_matter" - }, - "X": { - "item": "minecraft:air" - } + } }, "result": { "item": "techreborn:aluminum_dust" diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/bone.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/bone.json index 3d81d2f49..429624954 100644 --- a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/bone.json +++ b/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", - "XXX" + " ", + "U ", + " " ], "key": { "U": { "item": "techreborn:uu_matter" - }, - "X": { - "item": "minecraft:air" - } + } }, "result": { "item": "minecraft:bone" diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/cactus.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/cactus.json index 070185769..2963a65d9 100644 --- a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/cactus.json +++ b/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", - "XXU", - "XXX" + "U ", + " U", + " " ], "key": { "U": { "item": "techreborn:uu_matter" - }, - "X": { - "item": "minecraft:air" - } + } }, "result": { "item": "minecraft:cactus" diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/chrome_dust.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/chrome_dust.json index a27b0005a..b700d511a 100644 --- a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/chrome_dust.json +++ b/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", - "XUX" + "UU ", + " U " ], "key": { "U": { "item": "techreborn:uu_matter" - }, - "X": { - "item": "minecraft:air" } }, "result": { diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/clay.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/clay.json index 10adfa632..94c56e2e2 100644 --- a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/clay.json +++ b/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", - "XXX", - "XXX" + " U", + " ", + " " ], "key": { "U": { "item": "techreborn:uu_matter" - }, - "X": { - "item": "minecraft:air" - } + } }, "result": { "item": "minecraft:clay" diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/coal_ore.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/coal_ore.json index 433bfb68a..bc7c7d831 100644 --- a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/coal_ore.json +++ b/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", - "XUX", - "XXX" + "U ", + " U ", + " " ], "key": { "U": { "item": "techreborn:uu_matter" - }, - "X": { - "item": "minecraft:air" - } + } }, "result": { "item": "minecraft:coal_ore" diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/cocoa_beans.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/cocoa_beans.json index bc6426ee4..b279115f1 100644 --- a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/cocoa_beans.json +++ b/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", - "XXX", - "UXX" + "U ", + " ", + "U " ], "key": { "U": { "item": "techreborn:uu_matter" - }, - "X": { - "item": "minecraft:air" - } + } }, "result": { "item": "minecraft:cocoa_beans" diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/copper_dust.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/copper_dust.json index 41487518d..5dfb37eaf 100644 --- a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/copper_dust.json +++ b/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", - "XXX", - "XUX" + "U ", + " ", + " U " ], "key": { "U": { "item": "techreborn:uu_matter" - }, - "X": { - "item": "minecraft:air" - } + } }, "result": { "item": "techreborn:copper_dust" diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/diamond_ore.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/diamond_ore.json index 26e424949..6888f34b8 100644 --- a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/diamond_ore.json +++ b/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" diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/emerald_ore.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/emerald_ore.json index f2f1db8ee..a25993a94 100644 --- a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/emerald_ore.json +++ b/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", - "UXX" + "U U", + "U " ], "key": { "U": { "item": "techreborn:uu_matter" - }, - "X": { - "item": "minecraft:air" - } + } }, "result": { "item": "minecraft:emerald_ore" diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/ender_pearl.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/ender_pearl.json index 66cdf2008..b6670cf60 100644 --- a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/ender_pearl.json +++ b/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" diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/feather.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/feather.json index 0ac487b79..8babf723a 100644 --- a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/feather.json +++ b/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", - "UXX", - "UXX" + "U ", + "U ", + "U " ], "key": { "U": { "item": "techreborn:uu_matter" - }, - "X": { - "item": "minecraft:air" - } + } }, "result": { "item": "minecraft:feather" diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/glass.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/glass.json index 339d3d41d..2676b1c7f 100644 --- a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/glass.json +++ b/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", - "XXX", - "XXU" + "U ", + " ", + " U" ], "key": { "U": { "item": "techreborn:uu_matter" - }, - "X": { - "item": "minecraft:air" - } + } }, "result": { "item": "minecraft:glass" diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/glowstone.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/glowstone.json index 09b6a37cf..a602ec5ae 100644 --- a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/glowstone.json +++ b/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", - "XXX", - "XXX" + "UU ", + " ", + " " ], "key": { "U": { "item": "techreborn:uu_matter" - }, - "X": { - "item": "minecraft:air" - } + } }, "result": { "item": "minecraft:glowstone" diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/gold_ore.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/gold_ore.json index 6d05b0634..12d6881c2 100644 --- a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/gold_ore.json +++ b/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" diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/grass_block.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/grass_block.json index 60ce7b273..0c6638a3e 100644 --- a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/grass_block.json +++ b/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" diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/gunpowder.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/gunpowder.json index 6244ab4c7..6947aa322 100644 --- a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/gunpowder.json +++ b/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", - "XUX", - "XXU" + "U ", + " U ", + " U" ], "key": { "U": { "item": "techreborn:uu_matter" - }, - "X": { - "item": "minecraft:air" - } + } }, "result": { "item": "minecraft:gunpowder" diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/ink_sac.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/ink_sac.json index 5d58ab0ee..5dc28f332 100644 --- a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/ink_sac.json +++ b/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", - "UXX", - "XXX" + "UU ", + "U ", + " " ], "key": { "U": { "item": "techreborn:uu_matter" - }, - "X": { - "item": "minecraft:air" - } + } }, "result": { "item": "minecraft:ink_sac" diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/iridium_ore.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/iridium_ore.json index 777afbc63..ce0576c35 100644 --- a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/iridium_ore.json +++ b/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", - "UXX" + "UU ", + "U " ], "key": { "U": { "item": "techreborn:uu_matter" - }, - "X": { - "item": "minecraft:air" - } + } }, "result": { "item": "techreborn:iridium_ore" diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/iron_ore.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/iron_ore.json index 3bf64762b..46af2dbc2 100644 --- a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/iron_ore.json +++ b/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", - "XXX", - "XXX" + "U U", + " ", + " " ], "key": { "U": { "item": "techreborn:uu_matter" - }, - "X": { - "item": "minecraft:air" - } + } }, "result": { "item": "minecraft:iron_ore" diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/lapis_ore.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/lapis_ore.json index 9db2ebdba..6dc859c09 100644 --- a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/lapis_ore.json +++ b/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", - "UXX", - "XXX" + "U ", + "U ", + " " ], "key": { "U": { "item": "techreborn:uu_matter" - }, - "X": { - "item": "minecraft:air" - } + } }, "result": { "item": "minecraft:lapis_ore" diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/lead_dust.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/lead_dust.json index c2eca1a16..df9382af2 100644 --- a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/lead_dust.json +++ b/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", - "UXX" + " ", + "U ", + "U " ], "key": { "U": { "item": "techreborn:uu_matter" - }, - "X": { - "item": "minecraft:air" - } + } }, "result": { "item": "techreborn:lead_dust" diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/lily_pad.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/lily_pad.json index b5e3c561f..4e4b04942 100644 --- a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/lily_pad.json +++ b/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", - "XXU", - "XXX" + " U ", + " U", + " " ], "key": { "U": { "item": "techreborn:uu_matter" - }, - "X": { - "item": "minecraft:air" - } + } }, "result": { "item": "minecraft:lily_pad" diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/oak_wood.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/oak_wood.json index 4994b22ea..e33cc7146 100644 --- a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/oak_wood.json +++ b/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", - "XXX", - "XXX" + " U ", + " ", + " " ], "key": { "U": { "item": "techreborn:uu_matter" - }, - "X": { - "item": "minecraft:air" - } + } }, "result": { "item": "minecraft:oak_wood" diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/obsidian.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/obsidian.json index 14a5f1475..0d2a8f71c 100644 --- a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/obsidian.json +++ b/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", - "XXX" + " U ", + " " ], "key": { "U": { "item": "techreborn:uu_matter" - }, - "X": { - "item": "minecraft:air" - } + } }, "result": { "item": "minecraft:obsidian" diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/platinum_dust.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/platinum_dust.json index e8bd48aec..28c7b6797 100644 --- a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/platinum_dust.json +++ b/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", - "XXX" + "UU ", + " " ], "key": { "U": { "item": "techreborn:uu_matter" - }, - "X": { - "item": "minecraft:air" - } + } }, "result": { "item": "techreborn:platinum_dust" diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/redstone_ore.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/redstone_ore.json index 3e2f1a41a..783396565 100644 --- a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/redstone_ore.json +++ b/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" diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/snow_block.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/snow_block.json index 5f23dce6a..df810a80c 100644 --- a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/snow_block.json +++ b/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" diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/stone.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/stone.json index 55a642059..714773d27 100644 --- a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/stone.json +++ b/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", - "XXX" + " ", + " U ", + " " ], "key": { "U": { "item": "techreborn:uu_matter" - }, - "X": { - "item": "minecraft:air" - } + } }, "result": { "item": "minecraft:stone" diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/sugar_cane.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/sugar_cane.json index eac8549e4..cadd6ab1a 100644 --- a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/sugar_cane.json +++ b/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", - "XXX", - "UXX" + " U ", + " ", + "U " ], "key": { "U": { "item": "techreborn:uu_matter" - }, - "X": { - "item": "minecraft:air" - } + } }, "result": { "item": "minecraft:sugar_cane" diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/tin_dust.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/tin_dust.json index 7ad61af64..771e0f6ef 100644 --- a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/tin_dust.json +++ b/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", - "XXU" + " ", + " U ", + " U" ], "key": { "U": { "item": "techreborn:uu_matter" - }, - "X": { - "item": "minecraft:air" - } + } }, "result": { "item": "techreborn:tin_dust" diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/titanium_dust.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/titanium_dust.json index edc2ffb09..855f9d979 100644 --- a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/titanium_dust.json +++ b/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", - "XXX" + "U U", + " " ], "key": { "U": { "item": "techreborn:uu_matter" - }, - "X": { - "item": "minecraft:air" - } + } }, "result": { "item": "techreborn:titanium_dust" diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/tungsten_dust.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/tungsten_dust.json index 477c2e810..649b79ce5 100644 --- a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/tungsten_dust.json +++ b/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" diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/vine.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/vine.json index 622c9babf..ec2a89cb7 100644 --- a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/vine.json +++ b/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", - "XUX", - "XXX" + " U ", + " U ", + " " ], "key": { "U": { "item": "techreborn:uu_matter" - }, - "X": { - "item": "minecraft:air" - } + } }, "result": { "item": "minecraft:vine"