diff --git a/README.md b/README.md index 8e3b588..78fb61b 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# 版本 0.0.3.9.9.9 提前介绍c[最终版本对于0.0.4] 【注意:本解釋簡繁混寫,因爲趕時間,所以並不怎麽規範,請諒解】 +# 版本 0.0.4.0.0 提前介绍c[没有BUG的话,TeaCon最终版本将会是0.0.4] 【注意:本解釋簡繁混寫,因爲趕時間,所以並不怎麽規範,請諒解】 ## 简介 现在开始你可以用拴绳拴住玩家,也可以拴住自己了,不如尝试拴住彼此来通关我的世界吧( diff --git a/gradle.properties b/gradle.properties index 93ac77b..efc83ed 100644 --- a/gradle.properties +++ b/gradle.properties @@ -35,7 +35,7 @@ mod_name=Leashed Player # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. mod_license=MIT # The mod version. See https://semver.org/ -mod_version=0.0.3.9.9.9 +mod_version=0.0.4.0.0 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. # This should match the base package used for the mod sources. # See https://maven.apache.org/guides/mini/guide-naming-conventions.html diff --git a/src/generated/resources/.cache/211976637bfb5e111401ad2bfb58570ef2fb3dff b/src/generated/resources/.cache/211976637bfb5e111401ad2bfb58570ef2fb3dff index 0634279..ee18130 100644 --- a/src/generated/resources/.cache/211976637bfb5e111401ad2bfb58570ef2fb3dff +++ b/src/generated/resources/.cache/211976637bfb5e111401ad2bfb58570ef2fb3dff @@ -1,2 +1,2 @@ -// 1.21 2024-12-07T16:59:56.8625511 Languages: en_us for mod: leashedplayer -b307f81b4c4d1f4ab0e3520c4028c9addd42b840 assets/leashedplayer/lang/en_us.json +// 1.21 2024-12-15T17:40:40.0369665 Languages: en_us for mod: leashedplayer +d88b57505584fdfde48b00652789cb078b469830 assets/leashedplayer/lang/en_us.json diff --git a/src/generated/resources/.cache/a1129211d3ad6d65c101bb152ae8c66c8256bccb b/src/generated/resources/.cache/a1129211d3ad6d65c101bb152ae8c66c8256bccb index e6fb3a7..829e558 100644 --- a/src/generated/resources/.cache/a1129211d3ad6d65c101bb152ae8c66c8256bccb +++ b/src/generated/resources/.cache/a1129211d3ad6d65c101bb152ae8c66c8256bccb @@ -1,2 +1,2 @@ -// 1.21 2024-12-07T16:59:56.8605492 Languages: zh_cn for mod: leashedplayer -4099d0ec30ba8cf765f5e9d492644b2fb8a60b30 assets/leashedplayer/lang/zh_cn.json +// 1.21 2024-12-15T17:48:33.0549249 Languages: zh_cn for mod: leashedplayer +72797aa9107025df7d91eaff3ea51745d410261c assets/leashedplayer/lang/zh_cn.json diff --git a/src/generated/resources/.cache/ed628fd843215c1bf29a07b9cbd1b26a6af0636d b/src/generated/resources/.cache/ed628fd843215c1bf29a07b9cbd1b26a6af0636d index b7ffc0a..37928ad 100644 --- a/src/generated/resources/.cache/ed628fd843215c1bf29a07b9cbd1b26a6af0636d +++ b/src/generated/resources/.cache/ed628fd843215c1bf29a07b9cbd1b26a6af0636d @@ -1,2 +1,2 @@ -// 1.21 2024-12-07T16:59:56.8583125 Languages: zh_tw for mod: leashedplayer -b031b47a2ec98923235e85b63310b71e5f2b0d86 assets/leashedplayer/lang/zh_tw.json +// 1.21 2024-12-15T17:48:33.0539432 Languages: zh_tw for mod: leashedplayer +a01c64ca969974766c47baadd465b24b6fb5803b assets/leashedplayer/lang/zh_tw.json diff --git a/src/generated/resources/assets/leashedplayer/lang/en_us.json b/src/generated/resources/assets/leashedplayer/lang/en_us.json index 6f29d4a..9e34b42 100644 --- a/src/generated/resources/assets/leashedplayer/lang/en_us.json +++ b/src/generated/resources/assets/leashedplayer/lang/en_us.json @@ -59,8 +59,8 @@ "item.minecraft.splash_potion.effect.no_leash": "Splash No Leash Potion", "item.minecraft.tipped_arrow.effect.no_leash": "Arrow of No Leash", "item.nestle_rope_arrow.desc.1": "§7This arrow will carry the owner along with its flight:", - "item.nestle_rope_arrow.desc.2": "§c1.§r If it hits an entity, it will leash the owner with the entity and drop as a normal arrow.", - "item.nestle_rope_arrow.desc.3": "", + "item.nestle_rope_arrow.desc.2": "§c1.§r If it hits an entity, it will leash the owner with the entity and drop as a normal arrow;", + "item.nestle_rope_arrow.desc.3": "§c2.§r When fired from its launcher, the first player hit will become the arrow's owner and will fly along with it.", "item.nestle_rope_arrow.desc.4": "", "item.nestle_rope_arrow.desc.5": "", "item.spectral_leash_rope_arrow.desc": "§c2.§r Strike the entity to give it a §e§lGlowing§r effect.", diff --git a/src/generated/resources/assets/leashedplayer/lang/zh_cn.json b/src/generated/resources/assets/leashedplayer/lang/zh_cn.json index 5746559..1b64328 100644 --- a/src/generated/resources/assets/leashedplayer/lang/zh_cn.json +++ b/src/generated/resources/assets/leashedplayer/lang/zh_cn.json @@ -60,7 +60,7 @@ "item.minecraft.tipped_arrow.effect.no_leash": "禁拴之箭", "item.nestle_rope_arrow.desc.1": "§7该箭将会携带拥有者随其飞行", "item.nestle_rope_arrow.desc.2": "§c1.§r 若击中生物时,将持有者与其拴在一起并已普通箭形式掉落;", - "item.nestle_rope_arrow.desc.3": "", + "item.nestle_rope_arrow.desc.3": "§c2.§r 当前其发射器里发射,第一个射中的玩家将成为此箭的持有者并随箭飞行.", "item.nestle_rope_arrow.desc.4": "", "item.nestle_rope_arrow.desc.5": "", "item.spectral_leash_rope_arrow.desc": "§c2.§r 击中实体给与其§e§l发光§7(§e§lGlowing§7)§r效果", diff --git a/src/generated/resources/assets/leashedplayer/lang/zh_tw.json b/src/generated/resources/assets/leashedplayer/lang/zh_tw.json index 9117cde..942ecad 100644 --- a/src/generated/resources/assets/leashedplayer/lang/zh_tw.json +++ b/src/generated/resources/assets/leashedplayer/lang/zh_tw.json @@ -60,7 +60,7 @@ "item.minecraft.tipped_arrow.effect.no_leash": "禁拴之箭", "item.nestle_rope_arrow.desc.1": "§7該箭將會攜帶擁有者隨其飛行:", "item.nestle_rope_arrow.desc.2": "§c1.§r 若擊中生物時,將持有者與其拴在一起其上並以普通箭的形式掉落;", - "item.nestle_rope_arrow.desc.3": "", + "item.nestle_rope_arrow.desc.3": "§c2.§r 當箭從發射器發射時,第一個射中的玩家將成為此箭的持有者並隨箭飛行;", "item.nestle_rope_arrow.desc.4": "", "item.nestle_rope_arrow.desc.5": "", "item.spectral_leash_rope_arrow.desc": "擊中實體給予其§e§l發光§7(§e§lGlowing§7)§r效果", diff --git a/src/main/java/com/r3944realms/leashedplayer/content/entities/LeashRopeArrow.java b/src/main/java/com/r3944realms/leashedplayer/content/entities/LeashRopeArrow.java index 5300158..8352c42 100644 --- a/src/main/java/com/r3944realms/leashedplayer/content/entities/LeashRopeArrow.java +++ b/src/main/java/com/r3944realms/leashedplayer/content/entities/LeashRopeArrow.java @@ -197,7 +197,7 @@ public class LeashRopeArrow extends AbstractArrow { } } } else if (this.pickup != Pickup.CREATIVE_ONLY) this.pickup = Pickup.ALLOWED; - else return false; + else return pPlayer.hasInfiniteMaterials() && this.pickup == Pickup.CREATIVE_ONLY; } @@ -425,8 +425,9 @@ public class LeashRopeArrow extends AbstractArrow { ItemEntity lead = new ItemEntity(this.level(), this.position().x, this.position().y, this.position().z, Items.LEAD.getDefaultInstance()); this.level().addFreshEntity(lead); } - super.onHitEntity(pResult); + } + else super.onHitEntity(pResult); } /** * Handles an entity event received from a {@link net.minecraft.network.protocol.game.ClientboundEntityEventPacket}. 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 d739f02..71f6890 100644 --- a/src/main/java/com/r3944realms/leashedplayer/datagen/LanguageAndOtherData/ModLangKeyValue.java +++ b/src/main/java/com/r3944realms/leashedplayer/datagen/LanguageAndOtherData/ModLangKeyValue.java @@ -58,8 +58,8 @@ public enum ModLangKeyValue { DESC_ITEM_T_LEASH_R_ARROW_THREE(TippedLeashRopeArrow.DESC, ModPartEnum.DESCRIPTION, "§c2.§rStrike the entity to give it a Potion effect.", "§c2.§r 击中实体给与其药水效果", "擊中實體給予其药水效果", false), DESC_ITEM_LEAD_BREAKER(LeadBreakerItem.HOVER_KEY, ModPartEnum.DESCRIPTION, "§7can break the link of leash", "§7可以破坏拴绳链接", "§7可以破壞拴繩鏈接", false), DESC_ITEM_NESTLE_R_ARROW_ONE(NestleRopeArrowItem.DESC_1, ModPartEnum.DESCRIPTION, "§7This arrow will carry the owner along with its flight:", "§7该箭将会携带拥有者随其飞行", "§7該箭將會攜帶擁有者隨其飛行:", false), - DESC_ITEM_NESTLE_R_ARROW_TWO(NestleRopeArrowItem.DESC_2, ModPartEnum.DESCRIPTION, "§c1.§r If it hits an entity, it will leash the owner with the entity and drop as a normal arrow.", "§c1.§r 若击中生物时,将持有者与其拴在一起并已普通箭形式掉落;", "§c1.§r 若擊中生物時,將持有者與其拴在一起其上並以普通箭的形式掉落;", false), - DESC_ITEM_NESTLE_R_ARROW_THREE(NestleRopeArrowItem.DESC_3, ModPartEnum.DESCRIPTION, "", "", "", false), + DESC_ITEM_NESTLE_R_ARROW_TWO(NestleRopeArrowItem.DESC_2, ModPartEnum.DESCRIPTION, "§c1.§r If it hits an entity, it will leash the owner with the entity and drop as a normal arrow;", "§c1.§r 若击中生物时,将持有者与其拴在一起并已普通箭形式掉落;", "§c1.§r 若擊中生物時,將持有者與其拴在一起其上並以普通箭的形式掉落;", false), + DESC_ITEM_NESTLE_R_ARROW_THREE(NestleRopeArrowItem.DESC_3, ModPartEnum.DESCRIPTION, "§c2.§r When fired from its launcher, the first player hit will become the arrow's owner and will fly along with it.", "§c2.§r 当前其发射器里发射,第一个射中的玩家将成为此箭的持有者并随箭飞行.", "§c2.§r 當箭從發射器發射時,第一個射中的玩家將成為此箭的持有者並隨箭飛行;", false), DESC_ITEM_NESTLE_R_ARROW_FORE(NestleRopeArrowItem.DESC_4, ModPartEnum.DESCRIPTION, "", "", "", false), DESC_ITEM_NESTLE_R_ARROW_FIVE(NestleRopeArrowItem.DESC_5, ModPartEnum.DESCRIPTION, "", "", "", false),