Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-22 17:27:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix p2 compatibility and replace empcraft.com/maven2

Browse Source
This commit is contained in:
dordsor21 2020-04-21 11:39:42 +01:00
parent 330fc39dde
commit 952aaf8b43
11 changed files with 73 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
buildSrc/src/main/kotlin/CommonConfig.kt
View File

@ -8,10 +8,10 @@ fun Project.applyCommonConfiguration() {
repositories { repositories {
mavenCentral() mavenCentral()
mavenLocal() mavenLocal()
maven { url = uri("http://ci.athion.net/job/PlotSquared-breaking/ws/mvn/") } maven { url = uri("https://plotsquared.com/mvn/") }
maven { url = uri("https://maven.sk89q.com/repo/") } maven { url = uri("https://maven.sk89q.com/repo/") }
maven { url = uri("https://oss.sonatype.org/content/repositories/snapshots/") } maven { url = uri("https://oss.sonatype.org/content/repositories/snapshots/") }
maven { url = uri("http://empcraft.com/maven2") } maven { url = uri("https://ci.athion.net/plugin/repository/tools/") }
maven { url = uri("https://repo.destroystokyo.com/repository/maven-public") } maven { url = uri("https://repo.destroystokyo.com/repository/maven-public") }
ivy { url = uri("https://ci.athion.net/job") ivy { url = uri("https://ci.athion.net/job")
patternLayout { patternLayout {

2
worldedit-bukkit/build.gradle.kts
View File

@ -11,9 +11,9 @@ repositories {
maven { url = uri("https://hub.spigotmc.org/nexus/content/groups/public") } maven { url = uri("https://hub.spigotmc.org/nexus/content/groups/public") }
maven { url = uri("https://repo.codemc.org/repository/maven-public") } maven { url = uri("https://repo.codemc.org/repository/maven-public") }
maven { url = uri("https://papermc.io/repo/repository/maven-public/") } maven { url = uri("https://papermc.io/repo/repository/maven-public/") }
maven { url = uri("http://empcraft.com/maven2") }
maven { url = uri("https://maven.enginehub.org/repo/") } maven { url = uri("https://maven.enginehub.org/repo/") }
maven { url = uri("http://ci.emc.gs/nexus/content/groups/aikar/") } maven { url = uri("http://ci.emc.gs/nexus/content/groups/aikar/") }
maven { url = uri("https://ci.athion.net/plugin/repository/tools/") }
maven { maven {
this.name = "JitPack" this.name = "JitPack"
this.url = uri("https://jitpack.io") this.url = uri("https://jitpack.io")

6
worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/regions/plotsquared/FaweChunkManager.java
View File

@ -4,9 +4,9 @@ import static org.bukkit.Bukkit.getWorld;
import com.boydti.fawe.util.EditSessionBuilder; import com.boydti.fawe.util.EditSessionBuilder;
import com.boydti.fawe.util.TaskManager; import com.boydti.fawe.util.TaskManager;
import com.github.intellectualsites.plotsquared.plot.object.Location; import com.plotsquared.core.location.Location;
import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.plotsquared.core.plot.Plot;
import com.github.intellectualsites.plotsquared.plot.util.ChunkManager; import com.plotsquared.core.util.ChunkManager;
import com.sk89q.worldedit.EditSession; import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.MaxChangedBlocksException; import com.sk89q.worldedit.MaxChangedBlocksException;
import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.WorldEdit;

9
worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/regions/plotsquared/FaweLocalBlockQueue.java
View File

@ -5,7 +5,7 @@ import com.boydti.fawe.FaweAPI;
import com.boydti.fawe.FaweCache; import com.boydti.fawe.FaweCache;
import com.boydti.fawe.beta.IQueueChunk; import com.boydti.fawe.beta.IQueueChunk;
import com.boydti.fawe.beta.IQueueExtent; import com.boydti.fawe.beta.IQueueExtent;
import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue; import com.plotsquared.core.queue.LocalBlockQueue;
import com.sk89q.jnbt.CompoundTag; import com.sk89q.jnbt.CompoundTag;
import com.sk89q.worldedit.function.pattern.Pattern; import com.sk89q.worldedit.function.pattern.Pattern;
import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldedit.math.BlockVector3;
@ -21,6 +21,7 @@ public class FaweLocalBlockQueue extends LocalBlockQueue {
public final IQueueExtent<IQueueChunk> instance; public final IQueueExtent<IQueueChunk> instance;
private final World world; private final World world;
private BlockVector3 mutable = new MutableBlockVector3(); private BlockVector3 mutable = new MutableBlockVector3();
private boolean setbiome = false;
public FaweLocalBlockQueue(String worldName) { public FaweLocalBlockQueue(String worldName) {
super(worldName); super(worldName);
@ -88,9 +89,15 @@ public class FaweLocalBlockQueue extends LocalBlockQueue {
@Override @Override
public boolean setBiome(int x, int z, BiomeType biomeType) { public boolean setBiome(int x, int z, BiomeType biomeType) {
setbiome = true;
return instance.setBiome(x, 0, z, biomeType); return instance.setBiome(x, 0, z, biomeType);
} }
@Override
public boolean setBiome() {
return setbiome;
}
@Override @Override
public String getWorld() { public String getWorld() {
return world.getId(); return world.getId();

14
worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/regions/plotsquared/FaweSchematicHandler.java
View File

@ -9,12 +9,12 @@ import com.boydti.fawe.object.io.PGZIPOutputStream;
import com.boydti.fawe.util.EditSessionBuilder; import com.boydti.fawe.util.EditSessionBuilder;
import com.boydti.fawe.util.IOUtil; import com.boydti.fawe.util.IOUtil;
import com.boydti.fawe.util.TaskManager; import com.boydti.fawe.util.TaskManager;
import com.github.intellectualsites.plotsquared.plot.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.github.intellectualsites.plotsquared.plot.object.Location; import com.plotsquared.core.location.Location;
import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; import com.plotsquared.core.queue.LocalBlockQueue;
import com.github.intellectualsites.plotsquared.plot.util.MainUtil; import com.plotsquared.core.util.MainUtil;
import com.github.intellectualsites.plotsquared.plot.util.SchematicHandler; import com.plotsquared.core.util.SchematicHandler;
import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue; import com.plotsquared.core.util.task.RunnableVal;
import com.sk89q.jnbt.CompoundTag; import com.sk89q.jnbt.CompoundTag;
import com.sk89q.jnbt.CompressedCompoundTag; import com.sk89q.jnbt.CompressedCompoundTag;
import com.sk89q.jnbt.CompressedSchematicTag; import com.sk89q.jnbt.CompressedSchematicTag;
@ -110,7 +110,7 @@ public class FaweSchematicHandler extends SchematicHandler {
public void upload(final CompoundTag tag, final UUID uuid, final String file, final RunnableVal<URL> whenDone) { public void upload(final CompoundTag tag, final UUID uuid, final String file, final RunnableVal<URL> whenDone) {
if (tag == null) { if (tag == null) {
PlotSquared.debug("&cCannot save empty tag"); PlotSquared.debug("&cCannot save empty tag");
com.github.intellectualsites.plotsquared.plot.util.TaskManager.runTask(whenDone); com.plotsquared.core.util.task.TaskManager.runTask(whenDone);
return; return;
} }
CompoundTag weTag = (CompoundTag) FaweCache.IMP.asTag(tag); CompoundTag weTag = (CompoundTag) FaweCache.IMP.asTag(tag);

14
worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/regions/plotsquared/FaweTrim.java
View File

@ -1,13 +1,13 @@
package com.boydti.fawe.bukkit.regions.plotsquared; package com.boydti.fawe.bukkit.regions.plotsquared;
import com.boydti.fawe.util.TaskManager; import com.boydti.fawe.util.TaskManager;
import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; import com.plotsquared.core.command.CommandCategory;
import com.github.intellectualsites.plotsquared.plot.commands.CommandCategory; import com.plotsquared.core.command.CommandDeclaration;
import com.github.intellectualsites.plotsquared.plot.commands.RequiredType; import com.plotsquared.core.command.RequiredType;
import com.github.intellectualsites.plotsquared.plot.commands.SubCommand; import com.plotsquared.core.command.SubCommand;
import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.plotsquared.core.configuration.Captions;
import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.plot.util.WorldUtil; import com.plotsquared.core.util.WorldUtil;
@CommandDeclaration( @CommandDeclaration(
command = "trimchunks", command = "trimchunks",

7
worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/regions/plotsquared/MoveTo512.java
View File

@ -1,8 +1,9 @@
package com.boydti.fawe.bukkit.regions.plotsquared; package com.boydti.fawe.bukkit.regions.plotsquared;
import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
import com.github.intellectualsites.plotsquared.plot.commands.CommandCategory; import com.plotsquared.core.command.CommandCategory;
import com.github.intellectualsites.plotsquared.plot.commands.RequiredType; import com.plotsquared.core.command.CommandDeclaration;
import com.plotsquared.core.command.RequiredType;
@CommandDeclaration( @CommandDeclaration(
command = "moveto512", command = "moveto512",

6
worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/regions/plotsquared/PlotRegionFilter.java
View File

@ -3,9 +3,9 @@ package com.boydti.fawe.bukkit.regions.plotsquared;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
import com.boydti.fawe.regions.general.CuboidRegionFilter; import com.boydti.fawe.regions.general.CuboidRegionFilter;
import com.github.intellectualsites.plotsquared.plot.object.Location; import com.plotsquared.core.location.Location;
import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.plotsquared.core.plot.Plot;
import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import com.plotsquared.core.plot.PlotArea;
import com.sk89q.worldedit.math.BlockVector2; import com.sk89q.worldedit.math.BlockVector2;
import java.util.ArrayList; import java.util.ArrayList;

33
worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/regions/plotsquared/PlotSetBiome.java
View File

@ -1,22 +1,20 @@
package com.boydti.fawe.bukkit.regions.plotsquared; package com.boydti.fawe.bukkit.regions.plotsquared;
import com.boydti.fawe.Fawe;
import com.boydti.fawe.FaweAPI;
import com.boydti.fawe.util.EditSessionBuilder; import com.boydti.fawe.util.EditSessionBuilder;
import com.boydti.fawe.util.TaskManager; import com.boydti.fawe.util.TaskManager;
import com.github.intellectualsites.plotsquared.commands.Command; import com.plotsquared.core.command.Command;
import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; import com.plotsquared.core.command.CommandCategory;
import com.github.intellectualsites.plotsquared.plot.commands.CommandCategory; import com.plotsquared.core.command.CommandDeclaration;
import com.github.intellectualsites.plotsquared.plot.commands.MainCommand; import com.plotsquared.core.command.MainCommand;
import com.github.intellectualsites.plotsquared.plot.commands.RequiredType; import com.plotsquared.core.command.RequiredType;
import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.plotsquared.core.configuration.Captions;
import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.plotsquared.core.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; import com.plotsquared.core.plot.Plot;
import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2; import com.plotsquared.core.util.MainUtil;
import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3; import com.plotsquared.core.util.Permissions;
import com.github.intellectualsites.plotsquared.plot.util.MainUtil; import com.plotsquared.core.util.StringMan;
import com.github.intellectualsites.plotsquared.plot.util.Permissions; import com.plotsquared.core.util.task.RunnableVal2;
import com.github.intellectualsites.plotsquared.plot.util.StringMan; import com.plotsquared.core.util.task.RunnableVal3;
import com.sk89q.worldedit.EditSession; import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.bukkit.BukkitAdapter; import com.sk89q.worldedit.bukkit.BukkitAdapter;
@ -49,7 +47,8 @@ public class PlotSetBiome extends Command {
@Override @Override
public CompletableFuture<Boolean> execute(final PlotPlayer player, String[] args, RunnableVal3<Command, Runnable, Runnable> confirm, RunnableVal2<Command, CommandResult> whenDone) throws CommandException { public CompletableFuture<Boolean> execute(final PlotPlayer player, String[] args, RunnableVal3<Command, Runnable, Runnable> confirm, RunnableVal2<Command, CommandResult> whenDone) throws CommandException {
final Plot plot = check(player.getCurrentPlot(), Captions.NOT_IN_PLOT); final Plot plot = check(player.getCurrentPlot(), Captions.NOT_IN_PLOT);
checkTrue(plot.isOwner(player.getUUID()) || Permissions.hasPermission(player, "plots.admin.command.generatebiome"), Captions.NO_PLOT_PERMS); checkTrue(plot.isOwner(player.getUUID()) || Permissions
.hasPermission(player, "plots.admin.command.generatebiome"), Captions.NO_PLOT_PERMS);
if (plot.getRunning() != 0) { if (plot.getRunning() != 0) {
Captions.WAIT_FOR_TIMER.send(player); Captions.WAIT_FOR_TIMER.send(player);
return null; return null;
@ -73,7 +72,7 @@ public class PlotSetBiome extends Command {
} }
plot.addRunning(); plot.addRunning();
TaskManager.IMP.async(() -> { TaskManager.IMP.async(() -> {
EditSession session = new EditSessionBuilder(BukkitAdapter.adapt(Bukkit.getWorld(plot.getArea().worldname))) EditSession session = new EditSessionBuilder(BukkitAdapter.adapt(Bukkit.getWorld(plot.getArea().getWorldName())))
.autoQueue(false) .autoQueue(false)
.checkMemory(false) .checkMemory(false)
.allowedRegionsEverywhere() .allowedRegionsEverywhere()

41
worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/regions/plotsquared/PlotSquaredFeature.java
View File

@ -5,21 +5,20 @@ import com.boydti.fawe.object.RegionWrapper;
import com.boydti.fawe.regions.FaweMask; import com.boydti.fawe.regions.FaweMask;
import com.boydti.fawe.regions.FaweMaskManager; import com.boydti.fawe.regions.FaweMaskManager;
import com.boydti.fawe.regions.general.RegionFilter; import com.boydti.fawe.regions.general.RegionFilter;
import com.github.intellectualsites.plotsquared.plot.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.github.intellectualsites.plotsquared.plot.commands.MainCommand; import com.plotsquared.core.command.MainCommand;
import com.github.intellectualsites.plotsquared.plot.config.Settings; import com.plotsquared.core.configuration.Settings;
import com.github.intellectualsites.plotsquared.plot.database.DBFunc; import com.plotsquared.core.database.DBFunc;
import com.github.intellectualsites.plotsquared.plot.flag.Flags; import com.plotsquared.core.generator.HybridPlotManager;
import com.github.intellectualsites.plotsquared.plot.generator.HybridPlotManager; import com.plotsquared.core.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.plot.listener.WEManager; import com.plotsquared.core.plot.Plot;
import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.plotsquared.core.plot.PlotArea;
import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import com.plotsquared.core.plot.flag.implementations.DoneFlag;
import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; import com.plotsquared.core.plot.flag.implementations.NoWorldeditFlag;
import com.github.intellectualsites.plotsquared.plot.util.ChunkManager; import com.plotsquared.core.util.ChunkManager;
import com.github.intellectualsites.plotsquared.plot.util.SchematicHandler; import com.plotsquared.core.util.SchematicHandler;
import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler; import com.plotsquared.core.util.WEManager;
import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue; import com.plotsquared.core.util.uuid.UUIDHandler;
import com.github.intellectualsites.plotsquared.plot.util.block.QueueProvider;
import com.sk89q.worldedit.entity.Player; import com.sk89q.worldedit.entity.Player;
import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.regions.CuboidRegion; import com.sk89q.worldedit.regions.CuboidRegion;
@ -97,7 +96,7 @@ public class PlotSquaredFeature extends FaweMaskManager {
return false; return false;
} }
UUID uid = player.getUniqueId(); UUID uid = player.getUniqueId();
return !Flags.NO_WORLDEDIT.isTrue(plot) && (plot.isOwner(uid) return !plot.getFlag(NoWorldeditFlag.class) && (plot.isOwner(uid)
|| type == MaskType.MEMBER && (plot.getTrusted().contains(uid) || plot.getTrusted() || type == MaskType.MEMBER && (plot.getTrusted().contains(uid) || plot.getTrusted()
.contains(DBFunc.EVERYONE) .contains(DBFunc.EVERYONE)
|| (plot.getMembers().contains(uid) || plot.getMembers().contains(DBFunc.EVERYONE)) || (plot.getMembers().contains(uid) || plot.getMembers().contains(DBFunc.EVERYONE))
@ -129,8 +128,8 @@ public class PlotSquaredFeature extends FaweMaskManager {
return null; return null;
} }
PlotArea area = pp.getApplicablePlotArea(); PlotArea area = pp.getApplicablePlotArea();
int min = area != null ? area.MIN_BUILD_HEIGHT : 0; int min = area != null ? area.getMinBuildHeight() : 0;
int max = area != null ? Math.min(255, area.MAX_BUILD_HEIGHT) : 255; int max = area != null ? Math.min(255, area.getMaxBuildHeight()) : 255;
final HashSet<RegionWrapper> faweRegions = new HashSet<>(); final HashSet<RegionWrapper> faweRegions = new HashSet<>();
for (CuboidRegion current : regions) { for (CuboidRegion current : regions) {
faweRegions.add(new RegionWrapper(current.getMinimumX(), current.getMaximumX(), min, max, current.getMinimumZ(), current.getMaximumZ())); faweRegions.add(new RegionWrapper(current.getMinimumX(), current.getMaximumX(), min, max, current.getMinimumZ(), current.getMaximumZ()));
@ -139,7 +138,7 @@ public class PlotSquaredFeature extends FaweMaskManager {
final BlockVector3 pos1 = BlockVector3.at(region.getMinimumX(), min, region.getMinimumZ()); final BlockVector3 pos1 = BlockVector3.at(region.getMinimumX(), min, region.getMinimumZ());
final BlockVector3 pos2 = BlockVector3.at(region.getMaximumX(), max, region.getMaximumZ()); final BlockVector3 pos2 = BlockVector3.at(region.getMaximumX(), max, region.getMaximumZ());
final Plot finalPlot = plot; final Plot finalPlot = plot;
if (Settings.Done.RESTRICT_BUILDING && Flags.DONE.isSet(finalPlot) || regions.isEmpty()) { if (Settings.Done.RESTRICT_BUILDING && DoneFlag.isDone(finalPlot) || regions.isEmpty()) {
return null; return null;
} }
@ -147,7 +146,7 @@ public class PlotSquaredFeature extends FaweMaskManager {
if (regions.size() == 1) { if (regions.size() == 1) {
maskedRegion = new CuboidRegion(pos1, pos2); maskedRegion = new CuboidRegion(pos1, pos2);
} else { } else {
World world = FaweAPI.getWorld(area.worldname); World world = FaweAPI.getWorld(area.getWorldName());
List<Region> weRegions = regions.stream() List<Region> weRegions = regions.stream()
.map(r -> new CuboidRegion(world, BlockVector3.at(r.getMinimumX(), r.getMinimumY(), r.getMinimumZ()), BlockVector3.at(r.getMaximumX(), r.getMaximumY(), r.getMaximumZ()))) .map(r -> new CuboidRegion(world, BlockVector3.at(r.getMinimumX(), r.getMinimumY(), r.getMinimumZ()), BlockVector3.at(r.getMaximumX(), r.getMaximumY(), r.getMaximumZ())))
.collect(Collectors.toList()); .collect(Collectors.toList());
@ -157,7 +156,7 @@ public class PlotSquaredFeature extends FaweMaskManager {
return new FaweMask(maskedRegion) { return new FaweMask(maskedRegion) {
@Override @Override
public boolean isValid(Player player, MaskType type) { public boolean isValid(Player player, MaskType type) {
if (Settings.Done.RESTRICT_BUILDING && Flags.DONE.isSet(finalPlot)) { if (Settings.Done.RESTRICT_BUILDING && DoneFlag.isDone(finalPlot)) {
return false; return false;
} }
return isAllowed(player, finalPlot, type); return isAllowed(player, finalPlot, type);

4
worldedit-core/build.gradle.kts
View File

@ -14,7 +14,7 @@ plugins {
} }
repositories { repositories {
maven { url = uri("http://ci.athion.net/job/PlotSquared-breaking/ws/mvn/") } maven { url = uri("https://plotsquared.com/mvn") }
mavenCentral() mavenCentral()
} }
@ -55,7 +55,7 @@ dependencies {
"compile"("co.aikar:fastutil-lite:1.0") "compile"("co.aikar:fastutil-lite:1.0")
"compile"("com.github.luben:zstd-jni:1.4.3-1") "compile"("com.github.luben:zstd-jni:1.4.3-1")
"compileOnly"("net.fabiozumbi12:redprotect:1.9.6") "compileOnly"("net.fabiozumbi12:redprotect:1.9.6")
"compile"("com.github.intellectualsites.plotsquared:PlotSquared-API:latest") { "compile"("com.plotsquared:PlotSquared:5.1") {
isTransitive = false isTransitive = false
} }
implementation(kotlin("stdlib-jdk8", "1.3.61")) implementation(kotlin("stdlib-jdk8", "1.3.61"))