SteamWar/FastAsyncWorldEdit
13
0
Fork 0
geforkt von Mirrors/FastAsyncWorldEdit
Code Issues Pull-Requests Pakete Projekte Releases Wiki Aktivität

Move some classes to their expected location (#3004)

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Hannes Greule 2024-11-24 10:52:43 +01:00 committet von GitHub
Ursprung c4267b3746
Commit 9d42b5db70
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: B5690EEEBB952194
6 geänderte Dateien mit 6 neuen und 10 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

1
buildSrc/src/main/kotlin/PlatformConfig.kt
Datei anzeigen

@ -134,6 +134,7 @@ fun Project.applyPlatformAndCoreConfiguration() {
fun Project.applyShadowConfiguration() { fun Project.applyShadowConfiguration() {
tasks.withType<ShadowJar>().configureEach { tasks.withType<ShadowJar>().configureEach {
relocate("com.sk89q.jchronic", "com.sk89q.worldedit.jchronic")
dependencies { dependencies {
include(project(":worldedit-libs:core")) include(project(":worldedit-libs:core"))
include(project(":worldedit-libs:${project.name.replace("worldedit-", "")}")) include(project(":worldedit-libs:${project.name.replace("worldedit-", "")}"))

1
worldedit-bukkit/build.gradle.kts
Datei anzeigen

@ -203,6 +203,7 @@ tasks.withType<ShadowJar>().configureEach {
relocate("it.unimi.dsi.fastutil", "com.sk89q.worldedit.bukkit.fastutil") { relocate("it.unimi.dsi.fastutil", "com.sk89q.worldedit.bukkit.fastutil") {
include(dependency("it.unimi.dsi:fastutil")) include(dependency("it.unimi.dsi:fastutil"))
} }
relocate("net.royawesome.jlibnoise", "com.sk89q.worldedit.jlibnoise")
relocate("org.incendo.serverlib", "com.fastasyncworldedit.serverlib") { relocate("org.incendo.serverlib", "com.fastasyncworldedit.serverlib") {
include(dependency("dev.notmyfault.serverlib:ServerLib:2.3.6")) include(dependency("dev.notmyfault.serverlib:ServerLib:2.3.6"))
} }

2
worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/mask/RichMaskParser.java
Datei anzeigen

@ -4,7 +4,7 @@ import com.fastasyncworldedit.core.command.SuggestInputParseException;
import com.fastasyncworldedit.core.configuration.Caption; import com.fastasyncworldedit.core.configuration.Caption;
import com.fastasyncworldedit.core.extension.factory.parser.FaweParser; import com.fastasyncworldedit.core.extension.factory.parser.FaweParser;
import com.fastasyncworldedit.core.function.mask.BlockMaskBuilder; 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.fastasyncworldedit.core.util.StringMan;
import com.sk89q.minecraft.util.commands.CommandLocals; import com.sk89q.minecraft.util.commands.CommandLocals;
import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.WorldEdit;

2
worldedit-core/src/main/java/com/sk89q/worldedit/EditSession.java
Datei anzeigen

@ -38,7 +38,7 @@ import com.fastasyncworldedit.core.function.generator.GenBase;
import com.fastasyncworldedit.core.function.generator.OreGen; import com.fastasyncworldedit.core.function.generator.OreGen;
import com.fastasyncworldedit.core.function.generator.SchemGen; import com.fastasyncworldedit.core.function.generator.SchemGen;
import com.fastasyncworldedit.core.function.mask.BlockMaskBuilder; 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.ResettableMask;
import com.fastasyncworldedit.core.function.mask.SingleBlockTypeMask; import com.fastasyncworldedit.core.function.mask.SingleBlockTypeMask;
import com.fastasyncworldedit.core.function.mask.WallMakeMask; import com.fastasyncworldedit.core.function.mask.WallMakeMask;

6
worldedit-core/src/main/java/com/fastasyncworldedit/core/function/mask/MaskUnion.java → worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/MaskUnion.java
Datei anzeigen

@ -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 com.sk89q.worldedit.math.BlockVector3;
import javax.annotation.Nullable; import javax.annotation.Nullable;

4
worldedit-core/src/main/java/com/fastasyncworldedit/core/function/mask/MaskUnion2D.java → worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/MaskUnion2D.java
Datei anzeigen

@ -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 com.sk89q.worldedit.math.BlockVector2;
import java.util.Collection; import java.util.Collection;