From 00eb0e8d687ed6772901cf7659765c3d21651d67 Mon Sep 17 00:00:00 2001 From: 3944Realms Date: Sun, 17 Nov 2024 11:52:49 +0800 Subject: [PATCH] =?UTF-8?q?2024/11/17=20=E4=BF=AE=E5=A4=8D=E4=BA=86?= =?UTF-8?q?=E9=83=A8=E5=88=86=E7=BA=B0=E6=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/.cache/a1129211d3ad6d65c101bb152ae8c66c8256bccb | 4 ++-- .../resources/.cache/ed628fd843215c1bf29a07b9cbd1b26a6af0636d | 4 ++-- src/generated/resources/assets/leashedplayer/lang/zh_cn.json | 2 +- src/generated/resources/assets/leashedplayer/lang/zh_tw.json | 2 +- .../com/r3944realms/leashedplayer/CommonEventHandler.java | 4 +++- .../datagen/LanguageAndOtherData/ModLangKeyValue.java | 2 +- 6 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/generated/resources/.cache/a1129211d3ad6d65c101bb152ae8c66c8256bccb b/src/generated/resources/.cache/a1129211d3ad6d65c101bb152ae8c66c8256bccb index 1a592c8..62ec897 100644 --- a/src/generated/resources/.cache/a1129211d3ad6d65c101bb152ae8c66c8256bccb +++ b/src/generated/resources/.cache/a1129211d3ad6d65c101bb152ae8c66c8256bccb @@ -1,2 +1,2 @@ -// 1.21 2024-11-16T17:00:44.8607047 Languages: zh_cn for mod: leashedplayer -6fa0fb8fbf5c92e73690f7743a2c9ee7a535b868 assets/leashedplayer/lang/zh_cn.json +// 1.21 2024-11-16T21:56:30.3223474 Languages: zh_cn for mod: leashedplayer +4ee98b29b6ba49637275aeeeb939f179e121b60a assets/leashedplayer/lang/zh_cn.json diff --git a/src/generated/resources/.cache/ed628fd843215c1bf29a07b9cbd1b26a6af0636d b/src/generated/resources/.cache/ed628fd843215c1bf29a07b9cbd1b26a6af0636d index 9b0ab4a..449cc30 100644 --- a/src/generated/resources/.cache/ed628fd843215c1bf29a07b9cbd1b26a6af0636d +++ b/src/generated/resources/.cache/ed628fd843215c1bf29a07b9cbd1b26a6af0636d @@ -1,2 +1,2 @@ -// 1.21 2024-11-16T17:00:44.8557665 Languages: zh_tw for mod: leashedplayer -6be17f8a16fb8abefaa660484e2ceb853485731c assets/leashedplayer/lang/zh_tw.json +// 1.21 2024-11-16T21:56:30.3223474 Languages: zh_tw for mod: leashedplayer +6fc9463fd8d30efe4e30a2c3584623d458c320a0 assets/leashedplayer/lang/zh_tw.json diff --git a/src/generated/resources/assets/leashedplayer/lang/zh_cn.json b/src/generated/resources/assets/leashedplayer/lang/zh_cn.json index ee3af8e..9fb28cd 100644 --- a/src/generated/resources/assets/leashedplayer/lang/zh_cn.json +++ b/src/generated/resources/assets/leashedplayer/lang/zh_cn.json @@ -38,7 +38,7 @@ "item.leash_rope_arrow.desc.2": "§c1.§r 若击中栅栏或生物时，将持有者拴在其上并已普通箭形式掉落;", "item.leash_rope_arrow.desc.3": "§c2.§r 靠近该箭下蹲可以更快拾取该箭，如果该箭持有者不是自己，则持有者将被拾取者拴住;", "item.leash_rope_arrow.desc.4": "§c3.§r 当前其发射器里发射，第一个射中的生物将成为此箭的持有者并随箭飞行;", - "item.leash_rope_arrow.desc.5": "§c4.§r 在§c§l禁拴§7(§c§rcno_leash§7)§r效果下，射出的箭行为同发射器。", + "item.leash_rope_arrow.desc.5": "§c4.§r 在§c§l禁拴§7(§c§lno_leash§7)§r效果下，射出的箭行为同发射器。", "item.leash_rope_arrow.description": "带有拴绳的箭矢？", "item.leashedplayer.amethyst_shears": "紫水晶剪刀", "item.leashedplayer.fabric": "Fabric", diff --git a/src/generated/resources/assets/leashedplayer/lang/zh_tw.json b/src/generated/resources/assets/leashedplayer/lang/zh_tw.json index 67fa2dd..77e2441 100644 --- a/src/generated/resources/assets/leashedplayer/lang/zh_tw.json +++ b/src/generated/resources/assets/leashedplayer/lang/zh_tw.json @@ -38,7 +38,7 @@ "item.leash_rope_arrow.desc.2": "§c1.§r 若擊中柵欄或生物時，將持有者拴在其上並以普通箭的形式掉落;", "item.leash_rope_arrow.desc.3": "§c2.§r 靠近該箭下蹲可以更快拾取該箭，如果該箭的持有者不是自己，則持有者將被拾取者拴住;", "item.leash_rope_arrow.desc.4": "§c3.§r 當箭從發射器發射時，第一個射中的生物將成為此箭的持有者並隨箭飛行;", - "item.leash_rope_arrow.desc.5": "§c4.§r 在§c§l禁拴§7(§c§rcno_leash§7)§r效果下，射出的箭行為將與發射器的行為相同。", + "item.leash_rope_arrow.desc.5": "§c4.§r 在§c§l禁拴§7(§c§lno_leash§7)§r效果下，射出的箭行為將與發射器的行為相同。", "item.leash_rope_arrow.description": "帶有拴繩的箭矢？", "item.leashedplayer.amethyst_shears": "紫水晶剪刀", "item.leashedplayer.fabric": "Fabric", diff --git a/src/main/java/com/r3944realms/leashedplayer/CommonEventHandler.java b/src/main/java/com/r3944realms/leashedplayer/CommonEventHandler.java index 81a77fd..1ad3a00 100644 --- a/src/main/java/com/r3944realms/leashedplayer/CommonEventHandler.java +++ b/src/main/java/com/r3944realms/leashedplayer/CommonEventHandler.java @@ -70,12 +70,14 @@ public class CommonEventHandler { public static void OnAnvilUpdated(AnvilUpdateEvent event) { String name = event.getName(); ItemStack left = event.getLeft(); - if (left.is(Items.ANVIL) && name != null && name.equals("NeoForge")) { + if (left.is(Items.ANVIL) && name != null && name.equals("NeoForge")) { + event.setCost(1); event.setOutput(ModItemRegister.NEOFORGE.get().getDefaultInstance()); } else if (left.is(ModItemRegister.NEOFORGE.get().asItem()) && name != null && name.equals("Forge")) { ItemStack instance = Items.ANVIL.getDefaultInstance(); instance.set(DataComponents.CUSTOM_NAME, Component.literal("Forge").withStyle(ChatFormatting.BOLD).withStyle(ChatFormatting.AQUA)); event.setOutput(instance); + event.setCost(1); } } diff --git a/src/main/java/com/r3944realms/leashedplayer/datagen/LanguageAndOtherData/ModLangKeyValue.java b/src/main/java/com/r3944realms/leashedplayer/datagen/LanguageAndOtherData/ModLangKeyValue.java index 1683a58..96ff072 100644 --- a/src/main/java/com/r3944realms/leashedplayer/datagen/LanguageAndOtherData/ModLangKeyValue.java +++ b/src/main/java/com/r3944realms/leashedplayer/datagen/LanguageAndOtherData/ModLangKeyValue.java @@ -43,7 +43,7 @@ public enum ModLangKeyValue { DESC_ITEM_LEASH_R_ARROW_TWO(LeashRopeArrowItem.DESC_2, ModPartEnum.DESCRIPTION, "§c1.§r If it hits a fence or an entity, it will leash the owner to it and drop as a normal arrow.", "§c1.§r 若击中栅栏或生物时，将持有者拴在其上并已普通箭形式掉落;", "§c1.§r 若擊中柵欄或生物時，將持有者拴在其上並以普通箭的形式掉落;", false), DESC_ITEM_LEASH_R_ARROW_THREE(LeashRopeArrowItem.DESC_3, ModPartEnum.DESCRIPTION,"§c2.§r Crouching near the arrow allows for faster retrieval. If the arrow's owner is not the player, the owner will be leashed to the player who picks it up.", "§c2.§r 靠近该箭下蹲可以更快拾取该箭，如果该箭持有者不是自己，则持有者将被拾取者拴住;", "§c2.§r 靠近該箭下蹲可以更快拾取該箭，如果該箭的持有者不是自己，則持有者將被拾取者拴住;", false), DESC_ITEM_LEASH_R_ARROW_FOUR(LeashRopeArrowItem.DESC_4, ModPartEnum.DESCRIPTION, "§c3.§r When fired from its launcher, the first entity hit will become the arrow's owner and will fly along with it.", "§c3.§r 当前其发射器里发射，第一个射中的生物将成为此箭的持有者并随箭飞行;", "§c3.§r 當箭從發射器發射時，第一個射中的生物將成為此箭的持有者並隨箭飛行;", false), - DESC_ITEM_LEASH_R_ARROW_FIVE(LeashRopeArrowItem.DESC_5, ModPartEnum.DESCRIPTION, "§c4.§r Under the §c§l\"no_leash\"§r effect, the behavior of the arrow when fired will follow the launcher’s behavior.", "§c4.§r 在§c§l禁拴§7(§c§rcno_leash§7)§r效果下，射出的箭行为同发射器。","§c4.§r 在§c§l禁拴§7(§c§rcno_leash§7)§r效果下，射出的箭行為將與發射器的行為相同。", false), + DESC_ITEM_LEASH_R_ARROW_FIVE(LeashRopeArrowItem.DESC_5, ModPartEnum.DESCRIPTION, "§c4.§r Under the §c§l\"no_leash\"§r effect, the behavior of the arrow when fired will follow the launcher’s behavior.", "§c4.§r 在§c§l禁拴§7(§c§lno_leash§7)§r效果下，射出的箭行为同发射器。","§c4.§r 在§c§l禁拴§7(§c§lno_leash§7)§r效果下，射出的箭行為將與發射器的行為相同。", false), DESC_ITEM_LEASH_ROPE_ARROW(LeashRopeArrowItem.descKey, ModPartEnum.DESCRIPTION, "Arrows with ropes attached?","带有拴绳的箭矢？", "帶有拴繩的箭矢？", false), DESC_ITEM_V_LEASH_R_ARROW_ONE(LeashRopeArrowItem.DESC_V_1, ModPartEnum.DESCRIPTION, "§7A variant of Leash Rope Arrow", "§7拴绳箭的一个变种", "§7拴繩箭矢的一個變種", false), DESC_ITEM_V_LEASH_R_ARROW_TWO(LeashRopeArrowItem.DESC_V_2, ModPartEnum.DESCRIPTION, "§c1.§r The function is the same as its original one。", "§c1.§r 功能同其本体;", "§c1.§r 功能與本體一致;", false),