From 9d42b5db70691073e92540ca23c80d22425b072d Mon Sep 17 00:00:00 2001 From: Hannes Greule Date: Sun, 24 Nov 2024 10:52:43 +0100 Subject: [PATCH] Move some classes to their expected location (#3004) --- buildSrc/src/main/kotlin/PlatformConfig.kt | 1 + worldedit-bukkit/build.gradle.kts | 1 + .../core/extension/factory/parser/mask/RichMaskParser.java | 2 +- .../src/main/java/com/sk89q/worldedit/EditSession.java | 2 +- .../core => sk89q/worldedit}/function/mask/MaskUnion.java | 6 +----- .../core => sk89q/worldedit}/function/mask/MaskUnion2D.java | 4 +--- 6 files changed, 6 insertions(+), 10 deletions(-) rename worldedit-core/src/main/java/com/{fastasyncworldedit/core => sk89q/worldedit}/function/mask/MaskUnion.java (91%) rename worldedit-core/src/main/java/com/{fastasyncworldedit/core => sk89q/worldedit}/function/mask/MaskUnion2D.java (86%) diff --git a/buildSrc/src/main/kotlin/PlatformConfig.kt b/buildSrc/src/main/kotlin/PlatformConfig.kt index 6a2c9d7eea..1b89a362e4 100644 --- a/buildSrc/src/main/kotlin/PlatformConfig.kt +++ b/buildSrc/src/main/kotlin/PlatformConfig.kt @@ -134,6 +134,7 @@ fun Project.applyPlatformAndCoreConfiguration() { fun Project.applyShadowConfiguration() { tasks.withType().configureEach { + relocate("com.sk89q.jchronic", "com.sk89q.worldedit.jchronic") dependencies { include(project(":worldedit-libs:core")) include(project(":worldedit-libs:${project.name.replace("worldedit-", "")}")) diff --git a/worldedit-bukkit/build.gradle.kts b/worldedit-bukkit/build.gradle.kts index 8a9f435564..eadc70c8ef 100644 --- a/worldedit-bukkit/build.gradle.kts +++ b/worldedit-bukkit/build.gradle.kts @@ -203,6 +203,7 @@ tasks.withType().configureEach { relocate("it.unimi.dsi.fastutil", "com.sk89q.worldedit.bukkit.fastutil") { include(dependency("it.unimi.dsi:fastutil")) } + relocate("net.royawesome.jlibnoise", "com.sk89q.worldedit.jlibnoise") relocate("org.incendo.serverlib", "com.fastasyncworldedit.serverlib") { include(dependency("dev.notmyfault.serverlib:ServerLib:2.3.6")) } diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/mask/RichMaskParser.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/mask/RichMaskParser.java index 1b6640ecd8..4086d5d3d5 100644 --- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/mask/RichMaskParser.java +++ b/worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/mask/RichMaskParser.java @@ -4,7 +4,7 @@ import com.fastasyncworldedit.core.configuration.Caption; import com.fastasyncworldedit.core.extension.factory.parser.FaweParser; import com.fastasyncworldedit.core.function.mask.BlockMaskBuilder; -import com.fastasyncworldedit.core.function.mask.MaskUnion; +import com.sk89q.worldedit.function.mask.MaskUnion; import com.fastasyncworldedit.core.util.StringMan; import com.sk89q.minecraft.util.commands.CommandLocals; import com.sk89q.worldedit.WorldEdit; diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/EditSession.java b/worldedit-core/src/main/java/com/sk89q/worldedit/EditSession.java index 7986ee366d..b66b988970 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/EditSession.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/EditSession.java @@ -38,7 +38,7 @@ import com.fastasyncworldedit.core.function.generator.OreGen; import com.fastasyncworldedit.core.function.generator.SchemGen; import com.fastasyncworldedit.core.function.mask.BlockMaskBuilder; -import com.fastasyncworldedit.core.function.mask.MaskUnion; +import com.sk89q.worldedit.function.mask.MaskUnion; import com.fastasyncworldedit.core.function.mask.ResettableMask; import com.fastasyncworldedit.core.function.mask.SingleBlockTypeMask; import com.fastasyncworldedit.core.function.mask.WallMakeMask; diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/function/mask/MaskUnion.java b/worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/MaskUnion.java similarity index 91% rename from worldedit-core/src/main/java/com/fastasyncworldedit/core/function/mask/MaskUnion.java rename to worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/MaskUnion.java index 381754a3c6..e35ac319d4 100644 --- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/function/mask/MaskUnion.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/MaskUnion.java @@ -1,9 +1,5 @@ -package com.fastasyncworldedit.core.function.mask; +package com.sk89q.worldedit.function.mask; -import com.sk89q.worldedit.function.mask.Mask; -import com.sk89q.worldedit.function.mask.Mask2D; -import com.sk89q.worldedit.function.mask.MaskIntersection; -import com.sk89q.worldedit.function.mask.Masks; import com.sk89q.worldedit.math.BlockVector3; import javax.annotation.Nullable; diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/function/mask/MaskUnion2D.java b/worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/MaskUnion2D.java similarity index 86% rename from worldedit-core/src/main/java/com/fastasyncworldedit/core/function/mask/MaskUnion2D.java rename to worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/MaskUnion2D.java index 53edf2c45c..a7995a9cfd 100644 --- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/function/mask/MaskUnion2D.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/MaskUnion2D.java @@ -1,7 +1,5 @@ -package com.fastasyncworldedit.core.function.mask; +package com.sk89q.worldedit.function.mask; -import com.sk89q.worldedit.function.mask.Mask2D; -import com.sk89q.worldedit.function.mask.MaskIntersection2D; import com.sk89q.worldedit.math.BlockVector2; import java.util.Collection;