From 0137502ddab58f73ad9b55afd37368d1689927fb Mon Sep 17 00:00:00 2001 From: Krutoy242 Date: Sat, 20 Jan 2024 17:41:24 +0300 Subject: [PATCH] =?UTF-8?q?fix(skyblock):=20=E2=9C=8F=EF=B8=8FFix=20telepo?= =?UTF-8?q?rtation=20with=20Enigmatica=20book=20into=20Skyblock=20dimensio?= =?UTF-8?q?n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/contenttweaker/lang/en_us.lang | 2 +- resources/contenttweaker/lang/ru_ru.lang | 2 +- resources/contenttweaker/lang/zh_cn.lang | 2 +- scripts/skyblock/tp.zs | 10 ++++------ 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/resources/contenttweaker/lang/en_us.lang b/resources/contenttweaker/lang/en_us.lang index aa3202cb4..605b932f4 100644 --- a/resources/contenttweaker/lang/en_us.lang +++ b/resources/contenttweaker/lang/en_us.lang @@ -331,7 +331,7 @@ e2ee.danknull_dock.must_have=§7You need a %s in the inventory to insert %s into e2ee.restrict.vis_seeds=§7§eVis Seeds§7 can only be planted in §nthe Void§7 dimension or on §nplanets§7. They also need Oxygen. e2ee.creature_resisted_morb=§8This creature resist capture by the §n§8%s. e2ee.creature_uncapturable=§7This creature can't be captured. -e2ee.skyblock.need_item=§bTo access the §3Skyblock§b dimension, hold %s in your hand and ascend to a height of §3%s§b blocks. +e2ee.skyblock.need_item=§bTo access the §3Skyblock§b dimension, hold %s§b in your hand and ascend to a height of §3%s§b blocks. tooltips.lang.morb_resist=§rEffective against monsters at §4<%s%%§r hearts, or with fewer than §c%s§r hearts total. # > diff --git a/resources/contenttweaker/lang/ru_ru.lang b/resources/contenttweaker/lang/ru_ru.lang index de711c6a6..409a23751 100644 --- a/resources/contenttweaker/lang/ru_ru.lang +++ b/resources/contenttweaker/lang/ru_ru.lang @@ -331,7 +331,7 @@ e2ee.danknull_dock.must_have=§7Вам понадобится %s в инвент e2ee.restrict.vis_seeds=§7Вы можете сажать §6Семена Вис§7 только в §nМире пустоты§r§7 или на §nпланетах§r§7. Им также необходим кислород. e2ee.creature_resisted_morb=§8Существо сопротивлялось захвату §n§8%s. e2ee.creature_uncapturable=§7Это существо нельзя поймать. -e2ee.skyblock.need_item=§bЧтобы попасть в измерение §3Скайблока§b, держите %s в руке и поднимитесь на высоту §3%s§b блоков. +e2ee.skyblock.need_item=§bЧтобы попасть в измерение §3Скайблока§b, держите %s§b в руке и поднимитесь на высоту §3%s§b блоков. tooltips.lang.morb_resist=Эффективен против монстров с §4<%s%%§r сердец или менее §c%s§r сердец. # > diff --git a/resources/contenttweaker/lang/zh_cn.lang b/resources/contenttweaker/lang/zh_cn.lang index 5bc79caa9..2e4a9f601 100644 --- a/resources/contenttweaker/lang/zh_cn.lang +++ b/resources/contenttweaker/lang/zh_cn.lang @@ -331,7 +331,7 @@ e2ee.danknull_dock.must_have=§7你需要在副手持有一个 %s 才能把 %s e2ee.restrict.vis_seeds=§7§e魔力种子§7只能被种在§nthe Void§7维度或是§n其他星球§7。种植这些种子需要氧气。 e2ee.creature_resisted_morb=§8这个生物在反抗 §n§8%s 的捕捉。 e2ee.creature_uncapturable=§7该生物不能被捕捉。 -e2ee.skyblock.need_item=§b要进入 §3Skyblock§b 维度，您需要手持 %s 并达到 §3%s§b 方块的高度。 +e2ee.skyblock.need_item=§b要进入 §3Skyblock§b 维度，您需要手持 %s§b 并达到 §3%s§b 方块的高度。 tooltips.lang.morb_resist=§r对血量低于总血量的 §4<%s%%§r，或者少于 §c%s§r 颗心的怪物有效。 # > diff --git a/scripts/skyblock/tp.zs b/scripts/skyblock/tp.zs index 17e3851ae..9ef820ea5 100644 --- a/scripts/skyblock/tp.zs +++ b/scripts/skyblock/tp.zs @@ -12,14 +12,12 @@ events.onPlayerTick(function (e as crafttweaker.event.PlayerTickEvent) { if ( e.player.world.remote || e.player.world.getWorldTime() % 2 != 0 - || isNull(e.player.currentItem) || e.player.getDimension() != 0 || e.player.posY < SKY_TP_HEIGHT ) return; - print('~~~ entering onPlayerTick'); // Show warning message if player doesnt hold book but only once per server restart - if (!(requiredItem has e.player.currentItem)) { + if (isNull(e.player.currentItem) || !(requiredItem has e.player.currentItem)) { if (isNull(playersNoted[e.player])) { playersNoted[e.player] = true; e.player.sendRichTextMessage(crafttweaker.text.ITextComponent.fromData([{ @@ -32,8 +30,8 @@ events.onPlayerTick(function (e as crafttweaker.event.PlayerTickEvent) { return; } - print('~~~ executing tp'); e.player.addPotionEffect(.makePotionEffect(600, 0)); - e.player.changeDimension(3); - e.player.posY = SKY_TP_HEIGHT - 255.0; + server.commandManager.executeCommandSilent(server, + '/tpx ' ~ e.player.name ~ ' ' ~ e.player.posX ~ ' ' ~ (SKY_TP_HEIGHT - 255.0) ~ ' ' ~ e.player.posZ ~ ' 3' + ); });