Move some classes to their expected location (#3004)

IntellectualSites · Nov 24, 2024 · 9d42b5d · 9d42b5d
1 parent c4267b3
commit 9d42b5d
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 10 deletions.
diff --git 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<ShadowJar>().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
@@ -203,6 +203,7 @@ tasks.withType<ShadowJar>().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/...c/main/java/com/fastasyncworldedit/core/extension/factory/parser/mask/RichMaskParser.java b/...c/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
@@ -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/...rldedit/core/function/mask/MaskUnion.java → ...9q/worldedit/function/mask/MaskUnion.java b/...rldedit/core/function/mask/MaskUnion.java → ...9q/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/...dedit/core/function/mask/MaskUnion2D.java → .../worldedit/function/mask/MaskUnion2D.java b/...dedit/core/function/mask/MaskUnion2D.java → .../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;