diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java index b097ceb1a..17e2d738e 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java @@ -75,8 +75,6 @@ import com.plotsquared.core.configuration.ConfigurationSection; import com.plotsquared.core.configuration.ConfigurationUtil; import com.plotsquared.core.configuration.Settings; import com.plotsquared.core.configuration.Storage; -import com.plotsquared.core.configuration.caption.ChatFormatter; -import com.plotsquared.core.configuration.file.YamlConfiguration; import com.plotsquared.core.database.DBFunc; import com.plotsquared.core.generator.GeneratorWrapper; import com.plotsquared.core.generator.IndependentPlotGenerator; @@ -986,7 +984,8 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl } return map; })); - metrics.addCustomChart(new Metrics.SimplePie("premium", () -> PremiumVerification.isPremium() ? "Premium" : "Non-Premium")); + metrics.addCustomChart(new Metrics.SimplePie("premium", + () -> PremiumVerification.isPremium() ? "Premium" : "Non-Premium")); metrics.addCustomChart(new Metrics.SimplePie("worlds", () -> Settings.Enabled_Components.WORLDS ? "true" : "false")); metrics.addCustomChart(new Metrics.SimplePie("economy", () -> Settings.Enabled_Components.ECONOMY ? "true" : "false")); metrics.addCustomChart(new Metrics.SimplePie("plot_expiry", () -> Settings.Enabled_Components.PLOT_EXPIRY ? "true" : "false")); diff --git a/Core/src/main/java/com/plotsquared/core/command/DebugPaste.java b/Core/src/main/java/com/plotsquared/core/command/DebugPaste.java index 4dd1840c2..2d3b0515c 100644 --- a/Core/src/main/java/com/plotsquared/core/command/DebugPaste.java +++ b/Core/src/main/java/com/plotsquared/core/command/DebugPaste.java @@ -27,7 +27,6 @@ package com.plotsquared.core.command; import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import com.google.inject.Inject; import com.intellectualsites.paster.IncendoPaster; import com.plotsquared.core.PlotSquared; import com.plotsquared.core.configuration.Settings; @@ -56,15 +55,6 @@ import java.util.concurrent.TimeUnit; requiredType = RequiredType.NONE) public class DebugPaste extends SubCommand { - private final File configFile; - private final File worldfile; - - @Inject public DebugPaste(@ConfigFile @Nonnull final File configFile, - @WorldFile @Nonnull final File worldFile) { - this.configFile = configFile; - this.worldfile = worldFile; - } - @Override public boolean onCommand(final PlotPlayer player, String[] args) { TaskManager.runTaskAsync(() -> { try { @@ -121,8 +111,7 @@ public class DebugPaste extends SubCommand { if (Files.size(logFile.toPath()) > 14_000_000) { throw new IOException("The latest.log is larger than 14MB. Please reboot your server and submit a new paste."); } - incendoPaster - .addFile(logFile); + incendoPaster.addFile(logFile); } catch (IOException ignored) { player.sendMessage( TranslatableCaption.of("debugpaste.latest_log"), @@ -131,13 +120,14 @@ public class DebugPaste extends SubCommand { } try { - incendoPaster.addFile(this.configFile); + incendoPaster.addFile(PlotSquared.get().configFile); + } catch (final IllegalArgumentException ignored) { + incendoPaster.addFile(PlotSquared.get().worldsFile); } catch (final IllegalArgumentException ignored) { player.sendMessage(TranslatableCaption.of("debugpaste.empty_file"), Template.of("file", "settings.yml")); } - try { - incendoPaster.addFile(this.worldfile); + incendoPaster.addFile(PlotSquared.get().translationFile); } catch (final IllegalArgumentException ignored) { player.sendMessage(TranslatableCaption.of("debugpaste.empty_file"), Template.of("file", "worlds.yml")); diff --git a/Core/src/main/java/com/plotsquared/core/util/SchematicHandler.java b/Core/src/main/java/com/plotsquared/core/util/SchematicHandler.java index da81f7cd5..dd8b7413d 100644 --- a/Core/src/main/java/com/plotsquared/core/util/SchematicHandler.java +++ b/Core/src/main/java/com/plotsquared/core/util/SchematicHandler.java @@ -330,20 +330,24 @@ public abstract class SchematicHandler { // Paste schematic here final QueueCoordinator queue = plot.getArea().getQueue(); - for (int ry = 0; ry < Math.min(256, HEIGHT); ry++) { - int yy = y_offset_actual + ry; - if (yy > 255) { - continue; - } - for (int rz = 0; rz <= blockArrayClipboard.getDimensions().getZ(); rz++) { - for (int rx = 0; rx < blockArrayClipboard.getDimensions().getX(); rx++) { - int xx = p1x + rx; - int zz = p1z + rz; - BaseBlock id = blockArrayClipboard.getFullBlock(BlockVector3.at(rx, ry, rz)); - queue.setBlock(xx, yy, zz, id); - if (ry == 0) { - BiomeType biome = blockArrayClipboard.getBiome(BlockVector3.at(rx, ry, rz)); - queue.setBiome(xx, yy, zz, biome); + for (int ry = 0; ry < Math.min(256, HEIGHT); ry++) { + int yy = y_offset_actual + ry; + if (yy > 255) { + continue; + } + for (int rz = zzb - p1z; rz <= (zzt - p1z); rz++) { + for (int rx = xxb - p1x; rx <= (xxt - p1x); rx++) { + int xx = p1x + rx; + int zz = p1z + rz; + BaseBlock id = blockArrayClipboard + .getFullBlock(BlockVector3.at(rx, ry, rz)); + queue.setBlock(xx, yy, zz, id); + if (ry == 0) { + BiomeType biome = + blockArrayClipboard.getBiome(BlockVector2.at(rx, rz)); + queue.setBiome(xx, zz, biome); + } + } } } } diff --git a/renovate.json b/renovate.json new file mode 100644 index 000000000..f45d8f110 --- /dev/null +++ b/renovate.json @@ -0,0 +1,5 @@ +{ + "extends": [ + "config:base" + ] +}