From 5674f4f99d5e2dac0d22d08a130380e8cc8728f1 Mon Sep 17 00:00:00 2001 From: 3944Realms Date: Fri, 25 Oct 2024 16:52:54 +0800 Subject: [PATCH] =?UTF-8?q?2024-10-25=20=E4=BF=AE=E5=A4=8D=E4=BA=86?= =?UTF-8?q?=E6=9C=89=E5=85=B3=E7=AE=AD=E4=B8=8D=E8=83=BD=E6=AD=A3=E5=B8=B8?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=9A=84BUG=20=E5=B0=86=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=80=BC=E8=B0=83=E9=AB=98=E5=87=8F=E5=B0=91=E6=8B=B4=E7=BB=B3?= =?UTF-8?q?=E6=96=AD=E8=A3=82=E7=9A=84=E5=8F=AF=E8=83=BD=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 ++- gradle.properties | 2 +- .../r3944realms/leashedplayer/CommonEventHandler.java | 2 -- .../leashedplayer/config/LeashPlayerCommonConfig.java | 2 +- .../leashedplayer/content/entities/LeashRopeArrow.java | 2 +- .../leashedplayer/content/items/ModCreativeTab.java | 9 +++++++++ 6 files changed, 14 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 5272ed0..0e04db7 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# 版本 0.0.3.9.1 提前介绍c[最终版本对于0.0.4] 【注意：本解釋簡繁混寫，因爲趕時間，所以並不怎麽規範，請諒解】 +# 版本 0.0.3.9.4 提前介绍c[最终版本对于0.0.4] 【注意：本解釋簡繁混寫，因爲趕時間，所以並不怎麽規範，請諒解】 ## 简介 现在开始你可以用拴绳拴住玩家，也可以拴住自己了，不如尝试拴住彼此来通关我的世界吧（ @@ -17,6 +17,7 @@ ## 新物品 和 实体 ### 拴绳箭 [有普通和荧光两种箭矢] 获得飞一样的感觉（操作不当可能会摔死 ++ 拴绳箭可以拴其它可拴LivingEntity了（ #### 射中实体时，会将射击者拴绳绑定在改实体上（该实体父类必须是有LivingEntity类型），同时拴绳箭会以普通的箭矢掉落 #### 射中栅栏时，会自动将玩家拴在上面 ，同时拴绳箭会以普通的箭矢掉落 #### 在地面上的箭可以通过按Shift靠近来捡起，如果捡起实体为发射箭矢玩家，则直接获取拴绳箭矢，如果捡起者为非发射者则成为发送者的拴绳持有者，并获得普通箭矢 diff --git a/gradle.properties b/gradle.properties index 5aee8d5..068bebb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -32,7 +32,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.2 +mod_version=0.0.3.9.4 # 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/main/java/com/r3944realms/leashedplayer/CommonEventHandler.java b/src/main/java/com/r3944realms/leashedplayer/CommonEventHandler.java index 1fbfb01..70d0ea0 100644 --- a/src/main/java/com/r3944realms/leashedplayer/CommonEventHandler.java +++ b/src/main/java/com/r3944realms/leashedplayer/CommonEventHandler.java @@ -73,8 +73,6 @@ public class CommonEventHandler { public static void onCommonSetup(FMLCommonSetupEvent event) { DispenserBlock.registerProjectileBehavior(ModItemRegister.LEASH_ROPE_ARROW.get()); DispenserBlock.registerProjectileBehavior(ModItemRegister.SPECTRAL_LEASH_ROPE_ARROW.get()); - - } } diff --git a/src/main/java/com/r3944realms/leashedplayer/config/LeashPlayerCommonConfig.java b/src/main/java/com/r3944realms/leashedplayer/config/LeashPlayerCommonConfig.java index 99299bb..0d9c0d6 100644 --- a/src/main/java/com/r3944realms/leashedplayer/config/LeashPlayerCommonConfig.java +++ b/src/main/java/com/r3944realms/leashedplayer/config/LeashPlayerCommonConfig.java @@ -27,7 +27,7 @@ public class LeashPlayerCommonConfig { BUILDER.push("Misc"); BUILDER.comment("Leash Player Length"); BUILDER.push("LeashLength"); - TheLeashBreakLengthTimesBase = BUILDER.comment("When it exceeds how many times, the leash will drop"," [ Default:2.0f, Invalid Range:[2.0f, 5.0f] ]").defineInRange("BreakLengthTimeBase", 2.0f, 2.0f ,5.0f); + TheLeashBreakLengthTimesBase = BUILDER.comment("When it exceeds how many times, the leash will drop"," [ Default:2.0f, Invalid Range:[2.0f, 5.0f] ]").defineInRange("BreakLengthTimeBase", 3.0f, 3.0f ,6.0f); MinimumLeashLengthCanBeSet = BUILDER.comment("The minimum integer's length of Leash", " [ Default:5, Invalid Range:[2,10] ]").defineInRange("MinLeashLength", 5, 2, 10); MaximumLeashLengthCanBeSet = BUILDER.comment("The maximum integer's length of Leash", " [ Default:1024, Invalid Range:[32, 1024] ]").defineInRange("MaxLeashLength", 1024, 32, 1024); BUILDER.pop().pop(); 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 80f53da..2013640 100644 --- a/src/main/java/com/r3944realms/leashedplayer/content/entities/LeashRopeArrow.java +++ b/src/main/java/com/r3944realms/leashedplayer/content/entities/LeashRopeArrow.java @@ -270,7 +270,7 @@ public class LeashRopeArrow extends AbstractArrow { this.level().addFreshEntity(lead); } } - super.onHitEntity(pResult); + if(!level().isClientSide()) super.onHitEntity(pResult); } } diff --git a/src/main/java/com/r3944realms/leashedplayer/content/items/ModCreativeTab.java b/src/main/java/com/r3944realms/leashedplayer/content/items/ModCreativeTab.java index 1c424c3..6d54475 100644 --- a/src/main/java/com/r3944realms/leashedplayer/content/items/ModCreativeTab.java +++ b/src/main/java/com/r3944realms/leashedplayer/content/items/ModCreativeTab.java @@ -4,6 +4,7 @@ import com.r3944realms.leashedplayer.LeashedPlayer; import net.minecraft.core.HolderLookup; import net.minecraft.core.registries.Registries; import net.minecraft.network.chat.Component; +import net.minecraft.world.entity.decoration.PaintingVariant; import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.Items; import net.minecraft.world.item.alchemy.Potion; @@ -36,6 +37,14 @@ public class ModCreativeTab { .filter(p_337926_ -> Objects.requireNonNull(p_337926_.getKey()).location().getNamespace().equals(LeashedPlayer.MOD_ID)) .map(p_330083_ -> PotionContents.createItemStack(Items.POTION, p_330083_)) .forEach(pOutput::accept); + potionRegistryLookup.listElements() + .filter(p_337926_ -> Objects.requireNonNull(p_337926_.getKey()).location().getNamespace().equals(LeashedPlayer.MOD_ID)) + .map(p_330083_ -> PotionContents.createItemStack(Items.SPLASH_POTION, p_330083_)) + .forEach(pOutput::accept); + potionRegistryLookup.listElements() + .filter(p_337926_ -> Objects.requireNonNull(p_337926_.getKey()).location().getNamespace().equals(LeashedPlayer.MOD_ID)) + .map(p_330083_ -> PotionContents.createItemStack(Items.LINGERING_POTION, p_330083_)) + .forEach(pOutput::accept); } })).build()); public static String getCreativeMod(@NotNull String tabs) {