Merge branch 'major/2.0.0/1.18' of github.com:IntellectualSites/FastAsyncWorldEdit into major/2.0.0/1.18

This commit is contained in:
dordsor21 2021-12-29 16:30:12 +00:00
commit fd3619f7b5
No known key found for this signature in database
GPG Key ID: 1E53E88969FFCF0B
8 changed files with 16 additions and 16 deletions

View File

@ -377,8 +377,8 @@ public abstract class ChunkListener implements Listener {
if (Math.abs(velocity.getX()) > vertical
|| Math.abs(velocity.getZ()) > vertical) {
LOGGER.warn(
"[FAWE `tick-limiter`] Detected and cancelled rogue FireWork at "
+ ent.getLocation());
"[FAWE `tick-limiter`] Detected and cancelled rogue FireWork at {}",
ent.getLocation());
ent.remove();
}
}
@ -408,7 +408,7 @@ public abstract class ChunkListener implements Listener {
if (rateLimit <= 0) {
rateLimit = 20;
LOGGER.warn(
"[FAWE `tick-limiter`] Detected and cancelled item lag source at " + loc);
"[FAWE `tick-limiter`] Detected and cancelled item lag source at {}", loc);
}
event.setCancelled(true);
}

View File

@ -275,7 +275,7 @@ public class BukkitServerInterface extends AbstractPlatform implements MultiUser
RelighterFactory getRelighterFactory() {
if (this.relighterFactory == null) {
this.relighterFactory = this.plugin.getBukkitImplAdapter().getRelighterFactory();
LOGGER.info("Using " + this.relighterFactory.getClass().getCanonicalName() + " as relighter factory.");
LOGGER.info("Using {} as relighter factory.", this.relighterFactory.getClass().getCanonicalName());
}
return this.relighterFactory;
}

View File

@ -301,10 +301,10 @@ public class BukkitWorld extends AbstractWorld {
if (treeTypeMapping.get(type) == null) {
LOGGER.error("No TreeType mapping for TreeGenerator.TreeType." + type);
//FAWE start
LOGGER.info("The above message is displayed because your FAWE version is newer than " + Bukkit.getVersion() +
" and contains features of future minecraft versions which do not exist in "
+ Bukkit.getVersion() + ", hence the tree type " + type + " is not available. This is not an error. " +
"This version will work on your version of Minecraft. This is an informative message only");
LOGGER.info("The above message is displayed because your FAWE version is newer than {}" +
" and contains features of future minecraft versions which do not exist in {} hence the tree type" +
"{} is not available. This is not an error. This version will work on your version of Minecraft." +
"This is an informative message only.", Bukkit.getVersion(), Bukkit.getVersion(), type);
//FAWE end
}
}

View File

@ -367,8 +367,8 @@ public class WorldEditPlugin extends JavaPlugin {
} else {
//FAWE start - Identify as FAWE
LOGGER.info("FastAsyncWorldEdit could not find a Bukkit adapter for this MC version, "
+ "but it seems that you have another implementation of FastAsyncWorldEdit installed (" + platform.getPlatformName() + ") "
+ "that handles the world editing.");
+ "but it seems that you have another implementation of FastAsyncWorldEdit installed ({}) "
+ "that handles the world editing.", platform.getPlatformName());
//FAWE end
}
this.adapter.invalidate();

View File

@ -190,7 +190,7 @@ public class CLIWorldEdit {
this.commandSender = new CLICommandSender(this, LOGGER);
this.platform = new CLIPlatform(this);
//FAWE start - identify as Fawe
LOGGER.info("FastAsyncWorldEdit CLI (version " + getInternalVersion() + ") is loaded");
LOGGER.info("FastAsyncWorldEdit CLI (version {}) is loaded", getInternalVersion());
//FAWE end
}

View File

@ -178,7 +178,7 @@ public class FastSchematicReader extends NBTSchematicReader {
try {
state = BlockState.get(palettePart);
} catch (InputParseException ignored) {
LOGGER.warn("Invalid BlockState in palette: " + palettePart + ". Block will be replaced with air.");
LOGGER.warn("Invalid BlockState in palette: {}. Block will be replaced with air.", palettePart);
state = BlockTypes.AIR.getDefaultState();
}
int index = (int) entry.getValue();

View File

@ -722,7 +722,7 @@ public final class EditSessionBuilder {
"FAWE config.yml to let FAWE recognize the extent:"));
event.getActor().print(toReturn.getClass().getName());
} else {
LOGGER.warn("Potentially unsafe extent blocked: " + toReturn.getClass().getName());
LOGGER.warn("Potentially unsafe extent blocked: {}", toReturn.getClass().getName());
LOGGER.warn(
" - For area restrictions and block logging, it is recommended that third party plugins use the FAWE API");
LOGGER.warn(

View File

@ -206,7 +206,7 @@ public class MCEditSchematicReader extends NBTSchematicReader {
//FAWE start - tile entity safety - perhaps caused by the old issue with tile entities created in the wrong
// position in schematics?
if (index >= blocks.length) {
LOGGER.warn("Skipping corrupt tile entity at position " + x + " " + y + " " + z + " in schematic.");
LOGGER.warn("Skipping corrupt tile entity at position {} {} {} in schematic.", x, y, z);
continue;
}
@ -275,8 +275,8 @@ public class MCEditSchematicReader extends NBTSchematicReader {
byte data = blockData[index];
int combined = block << 8 | data;
if (unknownBlocks.add(combined)) {
LOGGER.warn("Unknown block when loading schematic: "
+ block + ":" + data + ". This is most likely a bad schematic.");
LOGGER.warn("Unknown block when loading schematic: {} {}. This is most likely a" +
"bad schematic.", block, data);
}
}
} catch (WorldEditException ignored) { // BlockArrayClipboard won't throw this