mirror of
https://github.com/plexusorg/Plex-FAWE.git
synced 2025-06-11 20:13:55 +00:00
Feature/1.17 (#1120)
* start v6 * Update classes to v6 method signatures * change rootVersion to signify p2v6 compat * Use 16 as toolchain version but target 11 for build output * add minimessage as api * Require v6 and don't attempt to "setup" hook from FAWE * Address comments * *address /all/ comments * FAWE classes should only act as a delegate * Uppercase logger * Settings for v6-hook have moved to P2-v6, remove unneeded if statements * Rename classes to Delegate * add whenDone task to setCuboids * Remove bad spaces * Fix plot swap * Initial work on 1.17 support * Remove data versions from the Bukkit adapters (#1507) * Remove data versions from the Bukkit adapters * Don't allow saving schematics without an adapter in place on Bukkit. * Removed confusing line (cherry picked from commit 2056218b4a8644836b1d127105dfa289e9cdbc1c) * More progress * Fix chunk sending * Repackage from com.boydti to com.fastasyncworldedit.<module> (#1119) * Preliminary work on repackaging * Rename build artifacts matching our pattern * Finish up repackaging * Fix a few field accesses and old imports * Dirty fix for chunks container ChunkSections outside of 0-15 * Correctly read from NibbleArrays for lighting * Fix getSections and BlockMaterial for 1.17 * Fix writing blocks to the world. - The issue isn't the presence of a "-1" chunk, it's the constructor for ChunkSection requiring the layer (0 to 15) rather than the y chord * Fix more field accesses * More work towards 1.17 * Update Upstream a57f66f Fix watchdog, add negative y support. (1782) * Add azalea tree to `/tool tree` * Don't define toolchain twice * Repackage GriefDefender * Relocate under new namespace * Bye bye ecma left overs * Add 1.17 to issue templates and instructions * Move to adventure-nbt (#918) * Initial work for adventure-nbt * Some more FAWE specific stuff * Fix erroneous deprecation check * Workflow change * Continued merging all adventure NBT related changes * Continued merging all adventure NBT related changes * Made a constructor public again This needs to be public for BlockTransformExtent.java * Finished converting all NBT data to adventure. * Make this compile * Fix conflicts Co-authored-by: Matt <4009945+MattBDev@users.noreply.github.com> * Update adapters to 1.17 * Change build prefix to 1.17 * Move more nms classes to adapters * Move left over nms classes * Move Spigot 1.17 class * Remove unneeded adapter loader code The loader will find the appropriate class now itself * Update adapters * Update adapters * Lazy fix tests * Update adapters * Update Upstream 43da91a Remove method reflection for getMinHeight in BukkitWorld. (1796) * Relocate adventure-nbt under proper namespace * Add LazyCompoundTag as a non-version-specific class to be used by adapters * Better integration between old NBT and Adventure NBT - begin fixing the issues seen recently * Correctly NBT conversion method * LazyCompoundTags should actually be overriding and correctly returning a CompoundBinaryTag. * Update worldedit-adapters Fixes #1141 * Remove unnecessary massive lag machine * Refactor apply to applyBlock in subclasses * applyBlock should be overriden by all subclasses. Default apply to applyBlock * Closes #1130 Closes #1132 * Squashed commit of the following: commit a9bfa1a07c77083c844a0c3ba62f4bd94bed107c Author: NotMyFault <mc.cache@web.de> Date: Sun Jun 27 21:53:21 2021 +0200 [ci skip] Update gradle wrapper validation commit aa7471f95317d28a16f62e4b200de8d0fea2fa95 Author: Matthew Miller <mnmiller1@me.com> Date: Sat Oct 10 15:49:13 2020 +1000 Add ^x,y,z relative offset support to the offset parser (#1545) * Add ^x,y,z relative offset support to the offset parser * Wrap in a try-catch (cherry picked from commit 28bdf7ff9254bbc85bb4f5f792b303943a3930a8) * Add `fawe.error.schematic.not.found` translation key * Update Upstream 728a152 Skip notify if chunk section doesn't exist (1794) * Fixed #1157 * Add a null check to prevent NPE in nbt code * Update adapters * Update Upstream fbb047a Optimize legacy schematic loading (1808) * Hurr durr I don't want to update Java * Update Upstream 0790e6e Fix CLI Mess (1811) * Fixes #1160 * Expose minimessage transitively thru PlotSquared Touches #32 * [ci skip] Remove unneeded maven repository * Steal tab completion from PlotSquared for P2 related commands * Don't error on startup when building locally Co-Authored-By: goldfishapp <8278196+goldfishapp@users.noreply.github.com> * [ci skip] Update gh actions to Java 16 * Update textures to grab 1.17 jar Co-authored-by: NotMyFault <mc.cache@web.de> Co-authored-by: SirYwell <hannesgreule@outlook.de> Co-authored-by: Matthew Miller <mnmiller1@me.com> Co-authored-by: Matt <4009945+MattBDev@users.noreply.github.com> Co-authored-by: goldfishapp <8278196+goldfishapp@users.noreply.github.com>
This commit is contained in:
dordsor21
GitHub
@ -4,12 +4,17 @@ plugins {
|
||||
`java-library`
|
||||
}
|
||||
|
||||
project.description = "CLI"
|
||||
|
||||
applyPlatformAndCoreConfiguration()
|
||||
applyShadowConfiguration()
|
||||
|
||||
addJarManifest(WorldEditKind.Standalone("com.sk89q.worldedit.cli.CLIWorldEdit"))
|
||||
|
||||
dependencies {
|
||||
compileOnly(project(":worldedit-libs:core:ap"))
|
||||
annotationProcessor(project(":worldedit-libs:core:ap"))
|
||||
annotationProcessor("com.google.guava:guava:${Versions.GUAVA}")
|
||||
api(project(":worldedit-core"))
|
||||
implementation(platform("org.apache.logging.log4j:log4j-bom:2.14.1") {
|
||||
because("We control Log4J on this platform")
|
||||
@ -25,7 +30,7 @@ tasks.named<ShadowJar>("shadowJar") {
|
||||
dependencies {
|
||||
include { true }
|
||||
}
|
||||
archiveFileName.set("FastAsyncWorldEdit-CLI-${project.version}.jar")
|
||||
archiveFileName.set("${rootProject.name}-${project.description}-${project.version}.${archiveExtension.getOrElse("jar")}")
|
||||
minimize {
|
||||
exclude(dependency("org.apache.logging.log4j:log4j-core"))
|
||||
}
|
||||
|
||||
@ -0,0 +1,62 @@
|
||||
/*
|
||||
* WorldEdit, a Minecraft world manipulation toolkit
|
||||
* Copyright (C) sk89q <http://www.sk89q.com>
|
||||
* Copyright (C) WorldEdit team and contributors
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package com.sk89q.worldedit.cli;
|
||||
|
||||
import com.sk89q.worldedit.LocalSession;
|
||||
import com.sk89q.worldedit.WorldEdit;
|
||||
import com.sk89q.worldedit.extension.platform.Actor;
|
||||
import com.sk89q.worldedit.regions.selector.CuboidRegionSelector;
|
||||
import com.sk89q.worldedit.util.formatting.text.TextComponent;
|
||||
import com.sk89q.worldedit.util.task.Task;
|
||||
import com.sk89q.worldedit.world.World;
|
||||
import org.enginehub.piston.annotation.Command;
|
||||
import org.enginehub.piston.annotation.CommandContainer;
|
||||
|
||||
import java.util.concurrent.ExecutionException;
|
||||
|
||||
@CommandContainer
|
||||
public class CLIExtraCommands {
|
||||
@Command(
|
||||
name = "selectworld",
|
||||
desc = "Select the entire world"
|
||||
)
|
||||
public void selectWorld(Actor actor, World world, LocalSession session) {
|
||||
session.setRegionSelector(world, new CuboidRegionSelector(
|
||||
world, world.getMinimumPoint(), world.getMaximumPoint()
|
||||
));
|
||||
actor.printInfo(TextComponent.of("Selected the entire world."));
|
||||
}
|
||||
|
||||
@Command(
|
||||
name = "await",
|
||||
desc = "Await all pending tasks"
|
||||
)
|
||||
public void await() {
|
||||
for (Task<?> task : WorldEdit.getInstance().getSupervisor().getTasks()) {
|
||||
try {
|
||||
task.get();
|
||||
} catch (InterruptedException e) {
|
||||
WorldEdit.logger.warn("Interrupted awaiting task", e);
|
||||
} catch (ExecutionException e) {
|
||||
WorldEdit.logger.warn("Error awaiting task", e);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -19,8 +19,8 @@
|
||||
|
||||
package com.sk89q.worldedit.cli;
|
||||
|
||||
import com.boydti.fawe.beta.implementation.lighting.NullRelighter;
|
||||
import com.boydti.fawe.beta.implementation.lighting.RelighterFactory;
|
||||
import com.fastasyncworldedit.core.beta.implementation.lighting.NullRelighter;
|
||||
import com.fastasyncworldedit.core.beta.implementation.lighting.RelighterFactory;
|
||||
import com.google.common.collect.ImmutableSet;
|
||||
import com.sk89q.worldedit.entity.Player;
|
||||
import com.sk89q.worldedit.extension.platform.AbstractPlatform;
|
||||
|
||||
@ -19,19 +19,24 @@
|
||||
|
||||
package com.sk89q.worldedit.cli;
|
||||
|
||||
import com.boydti.fawe.config.Caption;
|
||||
import com.fastasyncworldedit.core.configuration.Caption;
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import com.sk89q.worldedit.WorldEdit;
|
||||
import com.sk89q.worldedit.cli.data.FileRegistries;
|
||||
import com.sk89q.worldedit.cli.schematic.ClipboardWorld;
|
||||
import com.sk89q.worldedit.event.platform.CommandEvent;
|
||||
import com.sk89q.worldedit.event.platform.PlatformReadyEvent;
|
||||
import com.sk89q.worldedit.event.platform.PlatformsRegisteredEvent;
|
||||
import com.sk89q.worldedit.extension.input.InputParseException;
|
||||
import com.sk89q.worldedit.extension.input.ParserContext;
|
||||
import com.sk89q.worldedit.extension.platform.Actor;
|
||||
import com.sk89q.worldedit.extension.platform.Platform;
|
||||
import com.sk89q.worldedit.extension.platform.PlatformCommandManager;
|
||||
import com.sk89q.worldedit.extent.clipboard.io.BuiltInClipboardFormat;
|
||||
import com.sk89q.worldedit.extent.clipboard.io.ClipboardFormat;
|
||||
import com.sk89q.worldedit.extent.clipboard.io.ClipboardFormats;
|
||||
import com.sk89q.worldedit.extent.clipboard.io.ClipboardReader;
|
||||
import com.sk89q.worldedit.internal.Constants;
|
||||
import com.sk89q.worldedit.internal.util.LogManagerCompat;
|
||||
import com.sk89q.worldedit.registry.state.Property;
|
||||
import com.sk89q.worldedit.world.biome.BiomeType;
|
||||
@ -87,10 +92,29 @@ public class CLIWorldEdit {
|
||||
private void setupPlatform() {
|
||||
WorldEdit.getInstance().getPlatformManager().register(platform);
|
||||
|
||||
registerCommands();
|
||||
|
||||
config = new CLIConfiguration(this);
|
||||
|
||||
// There's no other platforms, so fire this immediately
|
||||
WorldEdit.getInstance().getEventBus().post(new PlatformsRegisteredEvent());
|
||||
|
||||
this.fileRegistries = new FileRegistries(this);
|
||||
this.fileRegistries.loadDataFiles();
|
||||
}
|
||||
|
||||
private void registerCommands() {
|
||||
PlatformCommandManager pcm = WorldEdit.getInstance().getPlatformManager()
|
||||
.getPlatformCommandManager();
|
||||
pcm.registerSubCommands(
|
||||
"cli",
|
||||
ImmutableList.of(),
|
||||
"CLI-specific commands",
|
||||
CLIExtraCommandsRegistration.builder(),
|
||||
new CLIExtraCommands()
|
||||
);
|
||||
}
|
||||
|
||||
public void setupRegistries() {
|
||||
// Blocks
|
||||
for (Map.Entry<String, FileRegistries.BlockManifest> manifestEntry : fileRegistries.getDataFile().blocks.entrySet()) {
|
||||
@ -172,7 +196,6 @@ public class CLIWorldEdit {
|
||||
setupRegistries();
|
||||
WorldEdit.getInstance().loadMappings();
|
||||
|
||||
config = new CLIConfiguration(this);
|
||||
config.load();
|
||||
|
||||
WorldEdit.getInstance().getEventBus().post(new PlatformReadyEvent(platform));
|
||||
@ -235,8 +258,15 @@ public class CLIWorldEdit {
|
||||
|
||||
public void run(InputStream inputStream) {
|
||||
try (Scanner scanner = new Scanner(inputStream)) {
|
||||
while (scanner.hasNextLine()) {
|
||||
while (true) {
|
||||
System.err.print("> ");
|
||||
if (!scanner.hasNextLine()) {
|
||||
break;
|
||||
}
|
||||
String line = scanner.nextLine();
|
||||
if (line.isEmpty()) {
|
||||
continue;
|
||||
}
|
||||
if (line.equals("stop")) {
|
||||
commandSender.print(Caption.of("worldedit.cli.stopping"));
|
||||
break;
|
||||
@ -280,31 +310,40 @@ public class CLIWorldEdit {
|
||||
if (file == null) {
|
||||
throw new IllegalArgumentException("A file must be provided!");
|
||||
}
|
||||
LOGGER.info(() -> "Loading '" + file + "'...");
|
||||
if (file.getName().endsWith("level.dat")) {
|
||||
throw new IllegalArgumentException("level.dat file support is unfinished.");
|
||||
} else {
|
||||
ClipboardFormat format = ClipboardFormats.findByFile(file);
|
||||
if (format != null) {
|
||||
ClipboardReader dataVersionReader = format
|
||||
.getReader(Files.newInputStream(file.toPath(), StandardOpenOption.READ));
|
||||
int dataVersion = dataVersionReader.getDataVersion()
|
||||
.orElseThrow(() -> new IllegalArgumentException("Failed to obtain data version from schematic."));
|
||||
dataVersionReader.close();
|
||||
int dataVersion;
|
||||
if (format != BuiltInClipboardFormat.MCEDIT_SCHEMATIC) {
|
||||
try (ClipboardReader dataVersionReader = format.getReader(
|
||||
Files.newInputStream(file.toPath(), StandardOpenOption.READ)
|
||||
)) {
|
||||
dataVersion = dataVersionReader.getDataVersion()
|
||||
.orElseThrow(() -> new IllegalArgumentException("Failed to obtain data version from schematic."));
|
||||
}
|
||||
} else {
|
||||
dataVersion = Constants.DATA_VERSION_MC_1_13_2;
|
||||
}
|
||||
app.platform.setDataVersion(dataVersion);
|
||||
app.onStarted();
|
||||
ClipboardWorld world;
|
||||
try (ClipboardReader clipboardReader = format.getReader(Files.newInputStream(file.toPath(), StandardOpenOption.READ))) {
|
||||
ClipboardWorld world = new ClipboardWorld(
|
||||
world = new ClipboardWorld(
|
||||
file,
|
||||
clipboardReader.read(),
|
||||
file.getName()
|
||||
);
|
||||
app.platform.addWorld(world);
|
||||
WorldEdit.getInstance().getSessionManager().get(app.commandSender).setWorldOverride(world);
|
||||
}
|
||||
app.platform.addWorld(world);
|
||||
WorldEdit.getInstance().getSessionManager().get(app.commandSender).setWorldOverride(world);
|
||||
} else {
|
||||
throw new IllegalArgumentException("Unknown file provided!");
|
||||
}
|
||||
}
|
||||
LOGGER.info(() -> "Loaded '" + file + "'");
|
||||
|
||||
String scriptFile = cmd.getOptionValue('s');
|
||||
if (scriptFile != null) {
|
||||
|
||||
@ -19,8 +19,8 @@
|
||||
|
||||
package com.sk89q.worldedit.cli.schematic;
|
||||
|
||||
import com.boydti.fawe.beta.IChunkGet;
|
||||
import com.boydti.fawe.beta.implementation.packet.ChunkPacket;
|
||||
import com.fastasyncworldedit.core.beta.IChunkGet;
|
||||
import com.fastasyncworldedit.core.beta.implementation.packet.ChunkPacket;
|
||||
import com.google.common.collect.ImmutableSet;
|
||||
import com.sk89q.jnbt.CompoundTag;
|
||||
import com.sk89q.worldedit.EditSession;
|
||||
|
||||
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user