From b462109fba94cbb368b93f039ea30d3fe0f78143 Mon Sep 17 00:00:00 2001 From: Ayutac Date: Sun, 20 Nov 2022 17:49:48 +0100 Subject: [PATCH] Fix for #3047 (#3067) * fixed the calcite recipes * removed symmetry from padded shaped recipes * removed unneeded accesswidener Co-authored-by: ayutac --- .../common/recipes/PaddedShapedRecipe.java | 14 ++++++++++++++ .../src/main/resources/reborncore.accesswidener | 2 +- .../uu_matter/{calcium => calcite}/bone.json | 2 +- .../uu_matter/{calcium => calcite}/calcite.json | 2 +- .../{calcium => calcite}/nautilus_shell.json | 2 +- .../uu_matter/{calcium => calcite}/scute.json | 2 +- src/main/resources/techreborn.accesswidener | 3 ++- 7 files changed, 21 insertions(+), 6 deletions(-) rename src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/{calcium => calcite}/bone.json (87%) rename src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/{calcium => calcite}/calcite.json (87%) rename src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/{calcium => calcite}/nautilus_shell.json (88%) rename src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/{calcium => calcite}/scute.json (87%) diff --git a/RebornCore/src/main/java/reborncore/common/recipes/PaddedShapedRecipe.java b/RebornCore/src/main/java/reborncore/common/recipes/PaddedShapedRecipe.java index 9ca912680..0053447b4 100644 --- a/RebornCore/src/main/java/reborncore/common/recipes/PaddedShapedRecipe.java +++ b/RebornCore/src/main/java/reborncore/common/recipes/PaddedShapedRecipe.java @@ -25,6 +25,7 @@ package reborncore.common.recipes; import com.google.gson.JsonObject; +import net.minecraft.inventory.CraftingInventory; import net.minecraft.item.ItemStack; import net.minecraft.recipe.Ingredient; import net.minecraft.recipe.RecipeSerializer; @@ -33,6 +34,7 @@ import net.minecraft.util.Identifier; import net.minecraft.util.JsonHelper; import net.minecraft.util.collection.DefaultedList; import net.minecraft.util.registry.Registry; +import net.minecraft.world.World; import java.util.Map; @@ -59,4 +61,16 @@ public class PaddedShapedRecipe extends ShapedRecipe { return new PaddedShapedRecipe(identifier, group, width, height, ingredients, output); } } + + @Override + public boolean matches(CraftingInventory craftingInventory, World world) { + for(int i = 0; i <= craftingInventory.getWidth() - this.getWidth(); ++i) { + for(int j = 0; j <= craftingInventory.getHeight() - this.getHeight(); ++j) { + if (this.matchesPattern(craftingInventory, i, j, false)) { + return true; + } + } + } + return false; + } } diff --git a/RebornCore/src/main/resources/reborncore.accesswidener b/RebornCore/src/main/resources/reborncore.accesswidener index b72e1c3a9..eb0df9c30 100644 --- a/RebornCore/src/main/resources/reborncore.accesswidener +++ b/RebornCore/src/main/resources/reborncore.accesswidener @@ -22,4 +22,4 @@ accessible field net/minecraft/block/FluidBlock fluid Lnet/minecraft accessible method net/minecraft/world/gen/foliage/FoliagePlacerType register (Ljava/lang/String;Lcom/mojang/serialization/Codec;)Lnet/minecraft/world/gen/foliage/FoliagePlacerType; accessible method net/minecraft/recipe/RecipeManager getAllOfType (Lnet/minecraft/recipe/RecipeType;)Ljava/util/Map; accessible field net/minecraft/screen/ScreenHandler listeners Ljava/util/List; -accessible field net/minecraft/entity/LivingEntity jumping Z \ No newline at end of file +accessible method net/minecraft/recipe/ShapedRecipe matchesPattern (Lnet/minecraft/inventory/CraftingInventory;IIZ)Z diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/calcium/bone.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/calcite/bone.json similarity index 87% rename from src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/calcium/bone.json rename to src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/calcite/bone.json index 4724306e2..099c29813 100644 --- a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/calcium/bone.json +++ b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/calcite/bone.json @@ -7,7 +7,7 @@ ], "key": { "C": { - "tag": "c:calcium_dusts" + "tag": "c:calcite_dusts" }, "U": { "item": "techreborn:uu_matter" diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/calcium/calcite.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/calcite/calcite.json similarity index 87% rename from src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/calcium/calcite.json rename to src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/calcite/calcite.json index 27d90ce4f..6c3d77a77 100644 --- a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/calcium/calcite.json +++ b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/calcite/calcite.json @@ -7,7 +7,7 @@ ], "key": { "C": { - "tag": "c:calcium_dusts" + "tag": "c:calcite_dusts" }, "U": { "item": "techreborn:uu_matter" diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/calcium/nautilus_shell.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/calcite/nautilus_shell.json similarity index 88% rename from src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/calcium/nautilus_shell.json rename to src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/calcite/nautilus_shell.json index f80fa58bc..7f3aaa935 100644 --- a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/calcium/nautilus_shell.json +++ b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/calcite/nautilus_shell.json @@ -7,7 +7,7 @@ ], "key": { "C": { - "tag": "c:calcium_dusts" + "tag": "c:calcite_dusts" }, "U": { "item": "techreborn:uu_matter" diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/calcium/scute.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/calcite/scute.json similarity index 87% rename from src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/calcium/scute.json rename to src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/calcite/scute.json index 4d799c537..80d8dd279 100644 --- a/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/calcium/scute.json +++ b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/calcite/scute.json @@ -7,7 +7,7 @@ ], "key": { "C": { - "tag": "c:calcium_dusts" + "tag": "c:calcite_dusts" }, "U": { "item": "techreborn:uu_matter" diff --git a/src/main/resources/techreborn.accesswidener b/src/main/resources/techreborn.accesswidener index fb6b8519f..6a1963772 100644 --- a/src/main/resources/techreborn.accesswidener +++ b/src/main/resources/techreborn.accesswidener @@ -22,6 +22,7 @@ accessible field net/minecraft/block/FluidBlock fluid Lnet/minecraft accessible method net/minecraft/world/gen/foliage/FoliagePlacerType register (Ljava/lang/String;Lcom/mojang/serialization/Codec;)Lnet/minecraft/world/gen/foliage/FoliagePlacerType; accessible method net/minecraft/recipe/RecipeManager getAllOfType (Lnet/minecraft/recipe/RecipeType;)Ljava/util/Map; accessible field net/minecraft/screen/ScreenHandler listeners Ljava/util/List; -accessible field net/minecraft/entity/LivingEntity jumping Z +accessible method net/minecraft/recipe/ShapedRecipe matchesPattern (Lnet/minecraft/inventory/CraftingInventory;IIZ)Z + # DO NOT EDIT THIS FILE, edit the RebornCore AW, it will automatically be coped to this one. \ No newline at end of file