Upstream
/
FastAsyncWorldedit
mirror of https://github.com/boy0001/FastAsyncWorldedit.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix translation problem

This commit is contained in:
Jesse Boyd 2016-05-01 21:11:16 +10:00
parent 024d46be78
commit ea6840535a
15 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -20,4 +20,5 @@ gradle.log
/bukkit/build
/bukkit0/build
/bukkit19/build
/bukkit18/build
/bukkit18/build
build

2
build.gradle
View File

@ -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 {

2
bukkit0/src/main/resources/plugin.yml
View File

@ -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]

2
bukkit18/src/main/resources/plugin.yml
View File

@ -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]

2
bukkit19/src/main/resources/plugin.yml
View File

@ -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]

6
core/src/main/java/com/boydti/fawe/object/changeset/MemoryOptimizedHistory.java
View File

@ -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<Change> 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());

2
core/src/main/java/com/sk89q/worldedit/command/BrushCommands.java
View File

@ -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")

4
core/src/main/java/com/sk89q/worldedit/regions/selector/CuboidRegionSelector.java
View File

@ -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()));

2
forge1710/src/main/java/com/boydti/fawe/forge/FaweForge.java
View File

@ -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) {

2
forge1710/src/main/java/com/boydti/fawe/forge/ForgeMain.java
View File

@ -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;

2
forge1710/src/main/resources/mcmod.info
View File

@ -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"

2
forge189/src/main/java/com/boydti/fawe/forge/FaweForge.java
View File

@ -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) {

2
forge189/src/main/java/com/boydti/fawe/forge/ForgeMain.java
View File

@ -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;

2
pom.xml
View File

@ -8,7 +8,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<artifactId>FastAsyncWorldEdit</artifactId>
<version>3.4.2</version>
<version>3.4.3</version>
<name>FastAsyncWorldEdit</name>
<packaging>jar</packaging>
<build>

2
sponge/src/main/java/com/boydti/fawe/sponge/SpongeMain.java
View File

@ -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;