Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@zly2006
zly2006 committed Jul 17, 2024
1 parent 726b426 commit e450c35
Showing 1 changed file with 63 additions and 21 deletions.
84 changes: 63 additions & 21 deletions src/main/kotlin/com/github/zly2006/enclosure/command/ForceLoadSubcommand.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import com.github.zly2006.enclosure.utils.Serializable2Text.SerializationSetting
import com.github.zly2006.enclosure.utils.Serializable2Text.SerializationSettings.NameHover
import com.github.zly2006.enclosure.utils.checkPermission
import com.mojang.authlib.GameProfile
import com.mojang.brigadier.arguments.StringArgumentType
import me.lucko.fabric.api.permissions.v0.Options
import net.minecraft.server.command.ServerCommandSource
import net.minecraft.server.world.ChunkLevelType
Expand All @@ -20,11 +21,29 @@ val FORCED = ChunkTicketType.create<ChunkPos>("enclosure.forced", Comparator.com

fun BuilderScope<*>.registerForceLoad() {
fun forceLoad(source: ServerCommandSource, area: Enclosure, ticks: Int, level: Int) {
val maxTime = Options.get(source, "enclosure.load.max_time", 21600) { it.toInt() }
val ticket = EnclosureArea.ForceLoadTicket(
source.player?.gameProfile ?: GameProfile(CONSOLE, "Server"),
if (checkPermission(source, "enclosure.bypass")) Int.MAX_VALUE else ticks,
level
)
val totalTicksRemaining = ServerMain.getAllEnclosures()
.filter { it.ticket?.executor?.id == source.uuid }
.sumOf { it.ticket!!.remainingTicks }
if (totalTicksRemaining > maxTime * 20) {
source.sendError(Text.literal("You have reached the maximum force loading time: " + getTimeString(maxTime)))
return
}
if (totalTicksRemaining + ticks > maxTime * 20) {
ticket.remainingTicks = maxTime * 20 - totalTicksRemaining
source.sendError(
Text.literal(
"You can only force load for ${getTimeString(maxTime * 20)}. " +
"The remaining time is set to ${getTimeString(ticket.remainingTicks)}"
)
)
return
}
area.ticket = ticket
area.markDirty()
source.sendFeedback(
Expand Down Expand Up @@ -57,8 +76,7 @@ fun BuilderScope<*>.registerForceLoad() {
literal("force-load") {
argument(landArgument()) {
permission("enclosure.command.force_load")
literal("blocks") {
val level = ChunkLevels.getLevelFromType(ChunkLevelType.BLOCK_TICKING)
fun registerCommands(level: Int) {
executes {
val maxTime = Options.get(source, "enclosure.load.max_time", 21600) { it.toInt() }
val land = getEnclosure(this)
Expand All @@ -67,18 +85,38 @@ fun BuilderScope<*>.registerForceLoad() {
}
forceLoad(source, land, maxTime * 20, level)
}
}
literal("entities") {
val level = ChunkLevels.getLevelFromType(ChunkLevelType.ENTITY_TICKING)
executes {
val maxTime = Options.get(source, "enclosure.load.max_time", 21600) { it.toInt() }
val land = getEnclosure(this)
if (land !is Enclosure) {
error(Text.literal("Only enclosure can be force loaded"), this)
literal("--time") {
argument("time", StringArgumentType.word()) {
val timeRegex = Regex("""^(\d{1,3}h)?(\d{1,2}m)?(\d{1,2}s)?(\d{1,2}gt)?$""")
executes {
val timeString = getArgument("time", String::class.java)
timeRegex.matchEntire(timeString)?.let {
val hours = it.groups[1]?.value?.dropLast(1)?.toIntOrNull() ?: 0
val minutes = it.groups[2]?.value?.dropLast(1)?.toIntOrNull() ?: 0
val seconds = it.groups[3]?.value?.dropLast(1)?.toIntOrNull() ?: 0
val gameTicks = it.groups[4]?.value?.dropLast(2)?.toIntOrNull() ?: 0
val ticks = hours * 72000 + minutes * 1200 + seconds * 20 + gameTicks
if (ticks > 0) {
val land = getEnclosure(this)
if (land !is Enclosure) {
error(Text.literal("Only enclosure can be force loaded"), this)
}
forceLoad(source, land, ticks, level)
}
else {
error(Text.literal("Time must be positive"), this)
}
} ?: error(Text.literal("Invalid time format, must be 12h34m56s788gt"), this)
}
}
forceLoad(source, land, maxTime * 20, level)
}
}
literal("blocks") {
registerCommands(ChunkLevels.getLevelFromType(ChunkLevelType.BLOCK_TICKING))
}
literal("entities") {
registerCommands(ChunkLevels.getLevelFromType(ChunkLevelType.ENTITY_TICKING))
}
literal("cancel") {
executes {
val land = getEnclosure(this)
Expand All @@ -95,16 +133,8 @@ fun BuilderScope<*>.registerForceLoad() {
for (enclosure in ServerMain.getAllEnclosures()) {
if (enclosure.ticket != null) {
has = true
val time = buildString {
val ticks = enclosure.ticket!!.remainingTicks
val seconds = ticks / 20
val minutes = seconds / 60
val hours = minutes / 60
if (hours != 0) append(hours).append("h")
if (minutes % 60 != 0) append(minutes % 60).append("m")
if (seconds % 60 != 0) append(seconds % 60).append("s")
if (ticks % 20 != 0) append(ticks % 20).append("gt")
}
val ticks = enclosure.ticket!!.remainingTicks
val time = getTimeString(ticks)
source.sendFeedback(
{
Text.literal("Force loading ")
Expand All @@ -128,3 +158,15 @@ fun BuilderScope<*>.registerForceLoad() {
}
}
}

private fun getTimeString(ticks: Int) {
buildString {
val seconds = ticks / 20
val minutes = seconds / 60
val hours = minutes / 60
if (hours != 0) append(hours).append("h")
if (minutes % 60 != 0) append(minutes % 60).append("m")
if (seconds % 60 != 0) append(seconds % 60).append("s")
if (ticks % 20 != 0) append(ticks % 20).append("gt")
}
}

0 comments on commit e450c35

Please sign in to comment.