DBot/overdrive_that_matters
DBot/overdrive_that_matters
3
1
Fork 0
Code Issues 63 Pull Requests Packages Releases Wiki Activity

Rename timer functions to onceServer

Browse Source
This commit is contained in:
DBotThePony 2022-10-02 12:49:40 +07:00
parent 2e93dc7b2c
commit 6e78972ea1
Signed by: DBot
GPG Key ID: DCC23B5715498507
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/kotlin/ru/dbotthepony/mc/otm/GlobalEventHandler.kt
View File

@ -26,7 +26,7 @@ private val postWorldTick = WeakHashMap<Level, TickList>()
private val preServerTickTimers = TimerQueue() private val preServerTickTimers = TimerQueue()
private val postServerTickTimers = TimerQueue() private val postServerTickTimers = TimerQueue()
fun addPreTickTimer(inTicks: Int, callback: Runnable): TimerQueue.Timer? { fun onceServerPre(inTicks: Int, callback: Runnable): TimerQueue.Timer? {
if (!SERVER_IS_LIVE) { if (!SERVER_IS_LIVE) {
LOGGER.error("Refusing to add timer $callback in ticks $inTicks while server is dying", IllegalStateException("Server is stopping")) LOGGER.error("Refusing to add timer $callback in ticks $inTicks while server is dying", IllegalStateException("Server is stopping"))
return null return null
@ -35,7 +35,7 @@ fun addPreTickTimer(inTicks: Int, callback: Runnable): TimerQueue.Timer? {
return preServerTickTimers.Timer(inTicks, callback) return preServerTickTimers.Timer(inTicks, callback)
} }
fun addPostTickTimer(inTicks: Int, callback: Runnable): TimerQueue.Timer? { fun onceServer(inTicks: Int, callback: Runnable): TimerQueue.Timer? {
if (!SERVER_IS_LIVE) { if (!SERVER_IS_LIVE) {
LOGGER.error("Refusing to add ticker $callback in ticks $inTicks while server is dying", IllegalStateException("Server is stopping")) LOGGER.error("Refusing to add ticker $callback in ticks $inTicks while server is dying", IllegalStateException("Server is stopping"))
return null return null

2
src/main/kotlin/ru/dbotthepony/mc/otm/item/ExoSuitCraftingUpgradeItem.kt
View File

@ -11,10 +11,8 @@ import net.minecraft.world.item.*
import net.minecraft.world.level.Level import net.minecraft.world.level.Level
import ru.dbotthepony.mc.otm.OverdriveThatMatters import ru.dbotthepony.mc.otm.OverdriveThatMatters
import ru.dbotthepony.mc.otm.core.TranslatableComponent import ru.dbotthepony.mc.otm.core.TranslatableComponent
import ru.dbotthepony.mc.otm.addPostTickTimer
import ru.dbotthepony.mc.otm.capability.matteryPlayer import ru.dbotthepony.mc.otm.capability.matteryPlayer
import ru.dbotthepony.mc.otm.client.minecraft import ru.dbotthepony.mc.otm.client.minecraft
import ru.dbotthepony.mc.otm.registry.MRegistry
import ru.dbotthepony.mc.otm.runIfClient import ru.dbotthepony.mc.otm.runIfClient
class ExoSuitCraftingUpgradeItem : Item(Properties().tab(OverdriveThatMatters.INSTANCE.CREATIVE_TAB).stacksTo(1).rarity(Rarity.RARE)) { class ExoSuitCraftingUpgradeItem : Item(Properties().tab(OverdriveThatMatters.INSTANCE.CREATIVE_TAB).stacksTo(1).rarity(Rarity.RARE)) {

4
src/main/kotlin/ru/dbotthepony/mc/otm/item/ExoSuitProbeItem.kt
View File

@ -11,7 +11,7 @@ import net.minecraft.world.item.*
import net.minecraft.world.level.Level import net.minecraft.world.level.Level
import ru.dbotthepony.mc.otm.OverdriveThatMatters import ru.dbotthepony.mc.otm.OverdriveThatMatters
import ru.dbotthepony.mc.otm.core.TranslatableComponent import ru.dbotthepony.mc.otm.core.TranslatableComponent
import ru.dbotthepony.mc.otm.addPostTickTimer import ru.dbotthepony.mc.otm.onceServer
import ru.dbotthepony.mc.otm.capability.matteryPlayer import ru.dbotthepony.mc.otm.capability.matteryPlayer
import ru.dbotthepony.mc.otm.client.minecraft import ru.dbotthepony.mc.otm.client.minecraft
import ru.dbotthepony.mc.otm.registry.MRegistry import ru.dbotthepony.mc.otm.registry.MRegistry
@ -65,7 +65,7 @@ class ExoSuitProbeItem : Item(Properties().tab(OverdriveThatMatters.INSTANCE.CRE
player.hurt(MRegistry.DAMAGE_EXOSUIT_PROBE, 1f) player.hurt(MRegistry.DAMAGE_EXOSUIT_PROBE, 1f)
for (i in 2 .. 8) { for (i in 2 .. 8) {
addPostTickTimer((i - 1) * 100) { onceServer((i - 1) * 100) {
if (!player.hasDisconnected()) { if (!player.hasDisconnected()) {
if (i == 6) { if (i == 6) {
player.displayClientMessage(TranslatableComponent("otm.exosuit.granted$i", player.displayName.copy().withStyle(ChatFormatting.DARK_PURPLE)).withStyle(ChatFormatting.DARK_AQUA), false) player.displayClientMessage(TranslatableComponent("otm.exosuit.granted$i", player.displayName.copy().withStyle(ChatFormatting.DARK_PURPLE)).withStyle(ChatFormatting.DARK_AQUA), false)