Skip to content

Commit

Permalink
Merge branch 'master' into no-physics
Browse files Browse the repository at this point in the history
  • Loading branch information
@DevScyu
DevScyu committed Jul 16, 2021
2 parents 481492a + e1f5687 commit b7136c1
Show file tree
Hide file tree
Showing 4 changed files with 123 additions and 9 deletions.
7 changes: 5 additions & 2 deletions build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ repositories {
maven("https://repo.mineinabyss.com/releases")
maven("https://papermc.io/repo/repository/maven-public/") //Paper
maven("https://repo.codemc.org/repository/maven-public/")
// maven("https://mvn.intellectualsites.com/content/repositories/releases/") // FAWE
maven("https://mvn.intellectualsites.com/content/repositories/releases/") // FAWE
maven("https://jitpack.io")
}

Expand All @@ -30,7 +30,10 @@ val kotlinVersion: String by project

dependencies {
compileOnly("com.destroystokyo.paper:paper-api:$serverVersion")
// compileOnly("com.intellectualsites.fawe:FAWE-Bukkit:1.16-637")

compileOnly("com.fastasyncworldedit:FAWE-Bukkit:1.17-47") { isTransitive = false }
compileOnly("com.fastasyncworldedit:FAWE-Core:1.17-47")

compileOnly(kotlin("stdlib-jdk8"))

kotlinSpice("$kotlinVersion+")
Expand Down
122 changes: 116 additions & 6 deletions src/main/java/com/derongan/minecraft/deeperworld/DeeperCommandExecutor.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ import com.derongan.minecraft.deeperworld.MinecraftConstants.FULL_DAY_TIME
import com.derongan.minecraft.deeperworld.config.DeeperConfig
import com.derongan.minecraft.deeperworld.services.WorldManager
import com.derongan.minecraft.deeperworld.services.canMoveSections
import com.derongan.minecraft.deeperworld.synchronization.sync
import com.derongan.minecraft.deeperworld.world.section.correspondingSection
import com.derongan.minecraft.deeperworld.world.section.getCorrespondingLocation
import com.derongan.minecraft.deeperworld.world.section.section
import com.fastasyncworldedit.core.util.EditSessionBuilder
import com.fastasyncworldedit.core.util.TaskManager
import com.mineinabyss.idofront.commands.CommandHolder
import com.mineinabyss.idofront.commands.arguments.booleanArg
import com.mineinabyss.idofront.commands.arguments.intArg
Expand All @@ -14,6 +20,17 @@ import com.mineinabyss.idofront.commands.extensions.actions.playerAction
import com.mineinabyss.idofront.messaging.error
import com.mineinabyss.idofront.messaging.info
import com.mineinabyss.idofront.messaging.success
import com.sk89q.worldedit.EditSession
import com.sk89q.worldedit.bukkit.WorldEditPlugin
import com.sk89q.worldedit.extent.clipboard.BlockArrayClipboard
import com.sk89q.worldedit.function.operation.ForwardExtentCopy
import com.sk89q.worldedit.function.operation.Operation
import com.sk89q.worldedit.function.operation.Operations
import com.sk89q.worldedit.math.BlockVector3
import com.sk89q.worldedit.regions.CuboidRegion
import com.sk89q.worldedit.session.ClipboardHolder
import com.sk89q.worldedit.world.World


@ExperimentalCommandDSL
object DeeperCommandExecutor : IdofrontCommandExecutor() {
Expand All @@ -26,7 +43,7 @@ object DeeperCommandExecutor : IdofrontCommandExecutor() {
sender.success("Automatic TP ${if(state) "enabled" else "disabled"} for ${player.name}")
}
}
("layerinfo" / "linfo")(desc = "Gets information about a players section") {
("layerinfo" / "linfo" / "info")(desc = "Gets information about a players section") {
playerAction {
val section = WorldManager.getSectionFor(player.location)
if (section == null)
Expand All @@ -35,11 +52,6 @@ object DeeperCommandExecutor : IdofrontCommandExecutor() {
sender.info("${player.name} is in section ${section.key}")
}
}
"info" {
playerAction {
sender.error("Please use /dw linfo or /deeperworld layerinfo instead")
}
}
"time" {
val time by intArg()
"set"(desc = "Set the time of the main synchronization world and the other worlds with their respective offsets") {
Expand Down Expand Up @@ -69,6 +81,104 @@ object DeeperCommandExecutor : IdofrontCommandExecutor() {
}
}
}
"sync"(desc = "Sync blocks in range") {
val range by intArg()
playerAction {
val section =
player.location.section ?: run {
sender.error("${player.name} is not in a managed section")
return@playerAction
}

when {
DeeperContext.isFAWELoaded -> {
try {
val pos1 = BlockVector3.at(
(player.location.x + range),
(player.location.y + range),
(player.location.z + range)
)
val pos2 = BlockVector3.at(
(player.location.x - range),
(player.location.y - range),
(player.location.z - range)
)

val region = CuboidRegion(pos1, pos2)
val clipboard = BlockArrayClipboard(region)
val wep = WorldEditPlugin.getInstance().bukkitImplAdapter;
val weWorld: World = wep.adapt(player.world)
val editSession: EditSession = EditSessionBuilder(weWorld)
.limitUnlimited()
.build()

val loc = player.location
val linkedSection =
loc.correspondingSection ?: error("Corresponding Section not found")

val linkedBlock = loc.getCorrespondingLocation(section, linkedSection)?.block
?: error("Corresponding Location not found")

val offset = if (pos2.y < 0) pos2.y else 0
TaskManager.IMP.taskNowAsync {
player.success("Blocks syncing...")
editSession.use { editSession ->
// Copy
val forwardExtentCopy =
ForwardExtentCopy(
editSession, region, clipboard, region.minimumPoint
)
forwardExtentCopy.isCopyingEntities = false
forwardExtentCopy.isCopyingBiomes = true
Operations.complete(forwardExtentCopy)

// Paste
val operation: Operation = ClipboardHolder(clipboard)
.createPaste(editSession)
.to(
BlockVector3.at(
linkedBlock.x - range,
linkedBlock.y - range - offset,
linkedBlock.z - range
)
)
.build()
Operations.complete(operation)
}
player.success("Blocks synced (FAWE)")
}
} catch (e: Exception) {
player.error("""An error occurred: ${e.message}""")
}
}
range <= 100 -> {
// Get blocks in range specified
for (x in -range..range) {
for (y in -range..range) {
for (z in -range..range) {
val block = player.world.getBlockAt(
(player.location.x + x).toInt(),
(player.location.y + y).toInt(),
(player.location.z + z).toInt()
)

block.sync { original, corr ->
if (original.type != corr.type) {
corr.blockData = original.blockData.clone()
}
}
}
}
}

player.success("Blocks synced")
}
else -> {
sender.error("Please use a range smaller than 100 blocks, or install FAWE to use a larger range")
}
}
}
}
}
"linfo"{
playerAction{
Expand Down
1 change: 1 addition & 0 deletions src/main/java/com/derongan/minecraft/deeperworld/DeeperContext.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ package com.derongan.minecraft.deeperworld
*/
object DeeperContext {
val isBlockLockerLoaded: Boolean = deeperWorld.server.pluginManager.isPluginEnabled("BlockLocker")
val isFAWELoaded: Boolean = deeperWorld.server.pluginManager.isPluginEnabled("FastAsyncWorldEdit")
}
2 changes: 1 addition & 1 deletion src/main/resources/plugin.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ authors: [Derongan]
api-version: '1.16'
description: A plugin for letting you create a deeper world. Or at least fake it.

softdepend: [Multiverse-Core, BlockLocker, KotlinSpice, ProtocolLib]
softdepend: [Multiverse-Core, BlockLocker, KotlinSpice, ProtocolLib, FastAsyncWorldEdit]

commands:
deeperworld:
Expand Down

0 comments on commit b7136c1

Please sign in to comment.