diff --git a/.gitignore b/.gitignore index e6259922..45c3371a 100644 --- a/.gitignore +++ b/.gitignore @@ -20,4 +20,5 @@ gradle.log /bukkit/build /bukkit0/build /bukkit19/build -/bukkit18/build \ No newline at end of file +/bukkit18/build +build \ No newline at end of file diff --git a/build.gradle b/build.gradle index 87069e1f..884c99d6 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ apply plugin: 'java' clean { delete "target" } group = 'com.boydti.fawe' -version = '3.4.2' +version = '3.4.3' description = """FastAsyncWorldEdit""" subprojects { diff --git a/bukkit0/src/main/resources/plugin.yml b/bukkit0/src/main/resources/plugin.yml index e35720e6..3842604f 100644 --- a/bukkit0/src/main/resources/plugin.yml +++ b/bukkit0/src/main/resources/plugin.yml @@ -1,6 +1,6 @@ name: FastAsyncWorldEdit main: com.boydti.fawe.bukkit.FaweBukkit -version: 3.4.2 +version: 3.4.3 description: Fast Async WorldEdit plugin authors: [Empire92] loadbefore: [WorldEdit] diff --git a/bukkit18/src/main/resources/plugin.yml b/bukkit18/src/main/resources/plugin.yml index da7fe10a..baab1c6e 100644 --- a/bukkit18/src/main/resources/plugin.yml +++ b/bukkit18/src/main/resources/plugin.yml @@ -1,6 +1,6 @@ name: FastAsyncWorldEdit main: com.boydti.fawe.bukkit.v1_8.BukkitMain_1_8 -version: 3.4.2 +version: 3.4.3 description: Fast Async WorldEdit plugin authors: [Empire92] loadbefore: [WorldEdit] diff --git a/bukkit19/src/main/resources/plugin.yml b/bukkit19/src/main/resources/plugin.yml index f7d53e1c..e27c19a0 100644 --- a/bukkit19/src/main/resources/plugin.yml +++ b/bukkit19/src/main/resources/plugin.yml @@ -1,6 +1,6 @@ name: FastAsyncWorldEdit main: com.boydti.fawe.bukkit.v1_9.BukkitMain_1_9 -version: 3.4.2 +version: 3.4.3 description: Fast Async WorldEdit plugin authors: [Empire92] loadbefore: [WorldEdit] diff --git a/core/src/main/java/com/boydti/fawe/object/changeset/MemoryOptimizedHistory.java b/core/src/main/java/com/boydti/fawe/object/changeset/MemoryOptimizedHistory.java index 59e1445c..87fe571f 100644 --- a/core/src/main/java/com/boydti/fawe/object/changeset/MemoryOptimizedHistory.java +++ b/core/src/main/java/com/boydti/fawe/object/changeset/MemoryOptimizedHistory.java @@ -2,6 +2,7 @@ package com.boydti.fawe.object.changeset; import com.boydti.fawe.FaweCache; import com.boydti.fawe.config.Settings; +import com.boydti.fawe.object.io.FastByteArrayOutputStream; import com.boydti.fawe.util.MainUtil; import com.boydti.fawe.util.ReflectionUtils; import com.google.common.collect.Iterators; @@ -16,7 +17,6 @@ import com.sk89q.worldedit.history.change.BlockChange; import com.sk89q.worldedit.history.change.Change; import com.sk89q.worldedit.history.changeset.ChangeSet; import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -44,7 +44,7 @@ public class MemoryOptimizedHistory implements ChangeSet, FaweChangeSet { private Object lock; private int decompressedLength; - private ByteArrayOutputStream idsStream; + private FastByteArrayOutputStream idsStream; private OutputStream idsStreamZip; private ArrayDeque entities; @@ -150,7 +150,7 @@ public class MemoryOptimizedHistory implements ChangeSet, FaweChangeSet { return idsStreamZip; } LZ4Factory factory = LZ4Factory.fastestInstance(); - idsStream = new ByteArrayOutputStream(Settings.BUFFER_SIZE); + idsStream = new FastByteArrayOutputStream(Settings.BUFFER_SIZE); idsStreamZip = new LZ4OutputStream(idsStream, Settings.BUFFER_SIZE, factory.fastCompressor()); if (Settings.COMPRESSION_LEVEL > 0) { idsStreamZip = new LZ4OutputStream(idsStreamZip, Settings.BUFFER_SIZE, factory.highCompressor()); diff --git a/core/src/main/java/com/sk89q/worldedit/command/BrushCommands.java b/core/src/main/java/com/sk89q/worldedit/command/BrushCommands.java index 8587d665..699dc84d 100644 --- a/core/src/main/java/com/sk89q/worldedit/command/BrushCommands.java +++ b/core/src/main/java/com/sk89q/worldedit/command/BrushCommands.java @@ -237,7 +237,7 @@ public class BrushCommands { desc = "Height brush", help = "This brush raises land.\n", - min = 0, + min = 1, max = 4 ) @CommandPermissions("worldedit.brush.height") diff --git a/core/src/main/java/com/sk89q/worldedit/regions/selector/CuboidRegionSelector.java b/core/src/main/java/com/sk89q/worldedit/regions/selector/CuboidRegionSelector.java index 502026a5..173916de 100644 --- a/core/src/main/java/com/sk89q/worldedit/regions/selector/CuboidRegionSelector.java +++ b/core/src/main/java/com/sk89q/worldedit/regions/selector/CuboidRegionSelector.java @@ -169,9 +169,9 @@ public class CuboidRegionSelector extends com.sk89q.worldedit.regions.CuboidRegi checkNotNull(pos); if (position1 != null && position2 != null) { - BBC.SELECTOR_CUBOID_POS2.send(player, position1, "(" + region.getArea() + ")"); + BBC.SELECTOR_CUBOID_POS2.send(player, position2, "(" + region.getArea() + ")"); } else { - BBC.SELECTOR_CUBOID_POS2.send(player, position1, ""); + BBC.SELECTOR_CUBOID_POS2.send(player, position2, ""); } session.dispatchCUIEvent(player, new SelectionPointEvent(1, pos, getArea())); diff --git a/forge1710/src/main/java/com/boydti/fawe/forge/FaweForge.java b/forge1710/src/main/java/com/boydti/fawe/forge/FaweForge.java index 0cba816d..aa95ee7b 100644 --- a/forge1710/src/main/java/com/boydti/fawe/forge/FaweForge.java +++ b/forge1710/src/main/java/com/boydti/fawe/forge/FaweForge.java @@ -130,7 +130,7 @@ public class FaweForge implements IFawe { @Override public void startMetrics() { try { - ForgeMetrics metrics = new ForgeMetrics("FastAsyncWorldEdit", "3.4.2"); + ForgeMetrics metrics = new ForgeMetrics("FastAsyncWorldEdit", "3.4.3"); metrics.start(); debug("[FAWE] &6Metrics enabled."); } catch (Throwable e) { diff --git a/forge1710/src/main/java/com/boydti/fawe/forge/ForgeMain.java b/forge1710/src/main/java/com/boydti/fawe/forge/ForgeMain.java index 1340cad6..2142ed10 100644 --- a/forge1710/src/main/java/com/boydti/fawe/forge/ForgeMain.java +++ b/forge1710/src/main/java/com/boydti/fawe/forge/ForgeMain.java @@ -19,7 +19,7 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.EntityJoinWorldEvent; import org.apache.logging.log4j.Logger; -@Mod(modid = "com.boydti.fawe", name = "FastAsyncWorldEdit", version = "3.4.2", acceptableRemoteVersions = "*") +@Mod(modid = "com.boydti.fawe", name = "FastAsyncWorldEdit", version = "3.4.3", acceptableRemoteVersions = "*") public class ForgeMain { private static FaweForge IMP; private Logger logger; diff --git a/forge1710/src/main/resources/mcmod.info b/forge1710/src/main/resources/mcmod.info index b03148c8..3cfcfd96 100644 --- a/forge1710/src/main/resources/mcmod.info +++ b/forge1710/src/main/resources/mcmod.info @@ -2,7 +2,7 @@ "modid": "com.boydti.fawe", "name": "FastAsyncWorldEdit", "description": "Extreme WorldEdit optimizations, no lag, low memory usage, area + tile + entity limits, block logging + rollback", - "version": "3.4.2", + "version": "3.4.3", "mcVersion": "1.7.10", "dependencies": [ "WorldEdit" diff --git a/forge189/src/main/java/com/boydti/fawe/forge/FaweForge.java b/forge189/src/main/java/com/boydti/fawe/forge/FaweForge.java index 03287153..7812f308 100644 --- a/forge189/src/main/java/com/boydti/fawe/forge/FaweForge.java +++ b/forge189/src/main/java/com/boydti/fawe/forge/FaweForge.java @@ -131,7 +131,7 @@ public class FaweForge implements IFawe { @Override public void startMetrics() { try { - com.boydti.fawe.forge.ForgeMetrics metrics = new com.boydti.fawe.forge.ForgeMetrics("FastAsyncWorldEdit", "3.4.2"); + com.boydti.fawe.forge.ForgeMetrics metrics = new com.boydti.fawe.forge.ForgeMetrics("FastAsyncWorldEdit", "3.4.3"); metrics.start(); debug("[FAWE] &6Metrics enabled."); } catch (Throwable e) { diff --git a/forge189/src/main/java/com/boydti/fawe/forge/ForgeMain.java b/forge189/src/main/java/com/boydti/fawe/forge/ForgeMain.java index 25602dfa..a71c27a4 100644 --- a/forge189/src/main/java/com/boydti/fawe/forge/ForgeMain.java +++ b/forge189/src/main/java/com/boydti/fawe/forge/ForgeMain.java @@ -19,7 +19,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.PlayerEvent; import org.apache.logging.log4j.Logger; -@Mod(modid = "com.boydti.fawe", name = "FastAsyncWorldEdit", version = "3.4.2", acceptableRemoteVersions = "*") +@Mod(modid = "com.boydti.fawe", name = "FastAsyncWorldEdit", version = "3.4.3", acceptableRemoteVersions = "*") public class ForgeMain { private static com.boydti.fawe.forge.FaweForge IMP; private Logger logger; diff --git a/pom.xml b/pom.xml index 62d0b3c2..b1ff713f 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ UTF-8 FastAsyncWorldEdit - 3.4.2 + 3.4.3 FastAsyncWorldEdit jar diff --git a/sponge/src/main/java/com/boydti/fawe/sponge/SpongeMain.java b/sponge/src/main/java/com/boydti/fawe/sponge/SpongeMain.java index c2379da2..79bda8c9 100644 --- a/sponge/src/main/java/com/boydti/fawe/sponge/SpongeMain.java +++ b/sponge/src/main/java/com/boydti/fawe/sponge/SpongeMain.java @@ -18,7 +18,7 @@ import org.spongepowered.api.plugin.PluginContainer; import org.spongepowered.api.profile.GameProfileManager; import org.spongepowered.api.world.World; -@Plugin(id = "com.boydti.fawe", name = "FastAsyncWorldEdit", description = "Lagless WorldEdit, Area restrictions, Memory mangement, Block logging", url = "https://github.com/boy0001/FastAsyncWorldedit", version = "3.4.2", authors = "Empire92") +@Plugin(id = "com.boydti.fawe", name = "FastAsyncWorldEdit", description = "Lagless WorldEdit, Area restrictions, Memory mangement, Block logging", url = "https://github.com/boy0001/FastAsyncWorldedit", version = "3.4.3", authors = "Empire92") public class SpongeMain { public PluginContainer plugin;