From dbea25c0ad950f819a20d2ee8bf6fa51654b79c7 Mon Sep 17 00:00:00 2001 From: DancingSnow <1121149616@qq.com> Date: Thu, 11 Apr 2024 16:19:42 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E6=89=8B=E6=8C=81?= =?UTF-8?q?=E7=A3=81=E9=93=81=E9=85=8D=E6=96=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/src/main/java/dev/dubhe/anvilcraft/init/ModItems.java | 4 ++-- .../src/generated/resources/assets/anvilcraft/lang/en_ud.json | 2 +- .../src/generated/resources/assets/anvilcraft/lang/en_us.json | 2 +- .../generated/resources/data/anvilcraft/recipes/magnet.json | 4 ++-- .../src/generated/resources/assets/anvilcraft/lang/en_ud.json | 2 +- .../src/generated/resources/assets/anvilcraft/lang/en_us.json | 2 +- .../generated/resources/data/anvilcraft/recipes/magnet.json | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/common/src/main/java/dev/dubhe/anvilcraft/init/ModItems.java b/common/src/main/java/dev/dubhe/anvilcraft/init/ModItems.java index 9e637da1b..61325078f 100644 --- a/common/src/main/java/dev/dubhe/anvilcraft/init/ModItems.java +++ b/common/src/main/java/dev/dubhe/anvilcraft/init/ModItems.java @@ -48,8 +48,8 @@ public class ModItems { .pattern("BCB") .pattern(" A ") .define('A', Items.REDSTONE) - .define('B', ModItems.MAGNET_INGOT) - .define('C', Items.ENDER_PEARL) + .define('B', Items.ENDER_PEARL) + .define('C', ModItems.MAGNET_INGOT) .unlockedBy("hasitem", RegistrateRecipeProvider.has(ModItems.MAGNET_INGOT)) .save(provider) ) diff --git a/fabric/src/generated/resources/assets/anvilcraft/lang/en_ud.json b/fabric/src/generated/resources/assets/anvilcraft/lang/en_ud.json index 3e777e7e1..916501c5a 100644 --- a/fabric/src/generated/resources/assets/anvilcraft/lang/en_ud.json +++ b/fabric/src/generated/resources/assets/anvilcraft/lang/en_ud.json @@ -105,4 +105,4 @@ "text.autoconfig.anvilcraft.option.redstoneEmpRadius": "snıpɐᴚ ԀWƎ ǝuoʇspǝᴚ", "text.autoconfig.anvilcraft.option.redstoneEmpRadius.@Tooltip": "ןıʌuɐ ǝɥʇ ʎq pǝddoɹp ʞɔoןq ɹǝd pǝʇɐɹǝuǝb ǝɔuɐʇsıp ԀWƎ ǝuoʇspǝᴚ", "text.autoconfig.anvilcraft.title": "bıɟuoƆ ʇɟɐɹƆןıʌuⱯ" -} +} \ No newline at end of file diff --git a/fabric/src/generated/resources/assets/anvilcraft/lang/en_us.json b/fabric/src/generated/resources/assets/anvilcraft/lang/en_us.json index b163814f2..a97466a4b 100644 --- a/fabric/src/generated/resources/assets/anvilcraft/lang/en_us.json +++ b/fabric/src/generated/resources/assets/anvilcraft/lang/en_us.json @@ -105,4 +105,4 @@ "text.autoconfig.anvilcraft.option.redstoneEmpRadius": "Redstone EMP Radius", "text.autoconfig.anvilcraft.option.redstoneEmpRadius.@Tooltip": "Redstone EMP distance generated per block dropped by the anvil", "text.autoconfig.anvilcraft.title": "AnvilCraft Config" -} +} \ No newline at end of file diff --git a/fabric/src/generated/resources/data/anvilcraft/recipes/magnet.json b/fabric/src/generated/resources/data/anvilcraft/recipes/magnet.json index 4f57c8cdf..14d9256c1 100644 --- a/fabric/src/generated/resources/data/anvilcraft/recipes/magnet.json +++ b/fabric/src/generated/resources/data/anvilcraft/recipes/magnet.json @@ -6,10 +6,10 @@ "item": "minecraft:redstone" }, "B": { - "item": "anvilcraft:magnet_ingot" + "item": "minecraft:ender_pearl" }, "C": { - "item": "minecraft:ender_pearl" + "item": "anvilcraft:magnet_ingot" } }, "pattern": [ diff --git a/forge/src/generated/resources/assets/anvilcraft/lang/en_ud.json b/forge/src/generated/resources/assets/anvilcraft/lang/en_ud.json index 3e777e7e1..916501c5a 100644 --- a/forge/src/generated/resources/assets/anvilcraft/lang/en_ud.json +++ b/forge/src/generated/resources/assets/anvilcraft/lang/en_ud.json @@ -105,4 +105,4 @@ "text.autoconfig.anvilcraft.option.redstoneEmpRadius": "snıpɐᴚ ԀWƎ ǝuoʇspǝᴚ", "text.autoconfig.anvilcraft.option.redstoneEmpRadius.@Tooltip": "ןıʌuɐ ǝɥʇ ʎq pǝddoɹp ʞɔoןq ɹǝd pǝʇɐɹǝuǝb ǝɔuɐʇsıp ԀWƎ ǝuoʇspǝᴚ", "text.autoconfig.anvilcraft.title": "bıɟuoƆ ʇɟɐɹƆןıʌuⱯ" -} +} \ No newline at end of file diff --git a/forge/src/generated/resources/assets/anvilcraft/lang/en_us.json b/forge/src/generated/resources/assets/anvilcraft/lang/en_us.json index b163814f2..a97466a4b 100644 --- a/forge/src/generated/resources/assets/anvilcraft/lang/en_us.json +++ b/forge/src/generated/resources/assets/anvilcraft/lang/en_us.json @@ -105,4 +105,4 @@ "text.autoconfig.anvilcraft.option.redstoneEmpRadius": "Redstone EMP Radius", "text.autoconfig.anvilcraft.option.redstoneEmpRadius.@Tooltip": "Redstone EMP distance generated per block dropped by the anvil", "text.autoconfig.anvilcraft.title": "AnvilCraft Config" -} +} \ No newline at end of file diff --git a/forge/src/generated/resources/data/anvilcraft/recipes/magnet.json b/forge/src/generated/resources/data/anvilcraft/recipes/magnet.json index 4f57c8cdf..14d9256c1 100644 --- a/forge/src/generated/resources/data/anvilcraft/recipes/magnet.json +++ b/forge/src/generated/resources/data/anvilcraft/recipes/magnet.json @@ -6,10 +6,10 @@ "item": "minecraft:redstone" }, "B": { - "item": "anvilcraft:magnet_ingot" + "item": "minecraft:ender_pearl" }, "C": { - "item": "minecraft:ender_pearl" + "item": "anvilcraft:magnet_ingot" } }, "pattern": [ From a2b3cdd85feda3e155b9cfdf3b3b3040df3965ec Mon Sep 17 00:00:00 2001 From: DancingSnow <1121149616@qq.com> Date: Thu, 11 Apr 2024 16:22:47 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E6=89=8B=E6=8C=81?= =?UTF-8?q?=E7=A3=81=E9=93=81=E9=85=8D=E6=96=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/dev/dubhe/anvilcraft/init/ModItems.java | 6 +++--- .../generated/resources/data/anvilcraft/recipes/magnet.json | 6 +++--- .../generated/resources/data/anvilcraft/recipes/magnet.json | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/common/src/main/java/dev/dubhe/anvilcraft/init/ModItems.java b/common/src/main/java/dev/dubhe/anvilcraft/init/ModItems.java index 61325078f..b1a363830 100644 --- a/common/src/main/java/dev/dubhe/anvilcraft/init/ModItems.java +++ b/common/src/main/java/dev/dubhe/anvilcraft/init/ModItems.java @@ -47,9 +47,9 @@ public class ModItems { .pattern(" A ") .pattern("BCB") .pattern(" A ") - .define('A', Items.REDSTONE) - .define('B', Items.ENDER_PEARL) - .define('C', ModItems.MAGNET_INGOT) + .define('A', Items.ENDER_PEARL) + .define('B', ModItems.MAGNET_INGOT) + .define('C', Items.REDSTONE) .unlockedBy("hasitem", RegistrateRecipeProvider.has(ModItems.MAGNET_INGOT)) .save(provider) ) diff --git a/fabric/src/generated/resources/data/anvilcraft/recipes/magnet.json b/fabric/src/generated/resources/data/anvilcraft/recipes/magnet.json index 14d9256c1..d807e305e 100644 --- a/fabric/src/generated/resources/data/anvilcraft/recipes/magnet.json +++ b/fabric/src/generated/resources/data/anvilcraft/recipes/magnet.json @@ -3,13 +3,13 @@ "category": "equipment", "key": { "A": { - "item": "minecraft:redstone" + "item": "minecraft:ender_pearl" }, "B": { - "item": "minecraft:ender_pearl" + "item": "anvilcraft:magnet_ingot" }, "C": { - "item": "anvilcraft:magnet_ingot" + "item": "minecraft:redstone" } }, "pattern": [ diff --git a/forge/src/generated/resources/data/anvilcraft/recipes/magnet.json b/forge/src/generated/resources/data/anvilcraft/recipes/magnet.json index 14d9256c1..d807e305e 100644 --- a/forge/src/generated/resources/data/anvilcraft/recipes/magnet.json +++ b/forge/src/generated/resources/data/anvilcraft/recipes/magnet.json @@ -3,13 +3,13 @@ "category": "equipment", "key": { "A": { - "item": "minecraft:redstone" + "item": "minecraft:ender_pearl" }, "B": { - "item": "minecraft:ender_pearl" + "item": "anvilcraft:magnet_ingot" }, "C": { - "item": "anvilcraft:magnet_ingot" + "item": "minecraft:redstone" } }, "pattern": [