Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-06-11 20:13:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge upstream changes through 7961fa58

Browse Source 
Signed-off-by: Byron Marohn <combustible@live.com>
This commit is contained in:
Byron Marohn
2018-12-21 12:13:43 -08:00
parent 3f1d807472 7961fa5891
commit 801793cc12
24 changed files with 370 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
worldedit-core/src/main/java/com/sk89q/worldedit/extent/validation/BlockChangeLimiter.java
View File

@ -41,7 +41,7 @@ public class BlockChangeLimiter extends AbstractDelegateExtent {
* Create a new instance.
*
* @param extent the extent
* @param limit the limit (>= 0) or -1 for no limit
* @param limit the limit (&gt;= 0) or -1 for no limit
*/
public BlockChangeLimiter(Extent extent, int limit) {
super(extent);
@ -51,7 +51,7 @@ public class BlockChangeLimiter extends AbstractDelegateExtent {
/**
* Get the limit.
*
* @return the limit (>= 0) or -1 for no limit
* @return the limit (&gt;= 0) or -1 for no limit
*/
public int getLimit() {
return limit;
@ -60,7 +60,7 @@ public class BlockChangeLimiter extends AbstractDelegateExtent {
/**
* Set the limit.
*
* @param limit the limit (>= 0) or -1 for no limit
* @param limit the limit (&gt;= 0) or -1 for no limit
*/
public void setLimit(int limit) {
checkArgument(limit >= -1, "limit >= -1 required");

1
worldedit-core/src/main/java/com/sk89q/worldedit/internal/annotation/Direction.java
View File

@ -17,7 +17,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.sk89q.worldedit.internal.annotation;
import com.sk89q.worldedit.Vector;

2
worldedit-core/src/main/java/com/sk89q/worldedit/internal/expression/Expression.java
View File

@ -40,7 +40,7 @@ import java.util.Map;
* <p>Supported operators:</p>
* <p>
* <ul>
* <li>Logical: &&, ||, ! (unary)</li>
* <li>Logical: &amp;&amp;, ||, ! (unary)</li>
* <li>Bitwise: ~ (unary), &gt;&gt;, &lt;&lt;</li>
* <li>Arithmetic: +, -, *, /, % (modulo), ^ (power), - (unary), --, ++ (prefix only)</li>
* <li>Comparison: &lt;=, &gt;=, &gt;, &lt;, ==, !=, ~= (near)</li>

2
worldedit-core/src/main/java/com/sk89q/worldedit/util/command/SimpleDispatcher.java
View File

@ -112,7 +112,7 @@ public class SimpleDispatcher implements Dispatcher {
@Override
public Object call(String arguments, CommandLocals locals, String[] parentCommands) throws CommandException {
// We have permission for this command if we have permissions for subcommands
if (!testPermission(locals)) {
if (parentCommands.length != 0 && !testPermission(locals)) {
throw new CommandPermissionsException();
}

2
worldedit-core/src/main/java/com/sk89q/worldedit/util/command/parametric/ParametricCallable.java
View File

@ -201,7 +201,7 @@ public class ParametricCallable extends AParametricCallable {
@Override
public Object call(String stringArguments, CommandLocals locals, String[] parentCommands) throws CommandException {
// Test permission
if (!testPermission(locals)) {
if (parentCommands.length != 0 && !testPermission(locals)) {
throw new CommandPermissionsException();
}
locals.putIfAbsent(CommandCallable.class, this);

2
worldedit-core/src/main/java/com/sk89q/worldedit/util/formatting/Style.java
View File

@ -221,7 +221,7 @@ public enum Style {
* ChatColor.COLOR_CODE color code character. The alternate color code character will only be replaced
* if it is immediately followed by 0-9, A-F, a-f, K-O, k-o, R or r.
*
* @param altColorChar The alternate color code character to replace. Ex: &
* @param altColorChar The alternate color code character to replace. Ex: &amp;
* @param textToTranslate Text containing the alternate color code character.
* @return Text containing the ChatColor.COLOR_CODE color code character.
*/

2
worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockType.java
View File

@ -99,7 +99,7 @@ public interface BlockType extends FawePattern, Comparable<BlockTypes> {
}
/**
* Gets the properties of this BlockType in a key->property mapping.
* Gets the properties of this BlockType in a {@code key->property} mapping.
*
* @return The properties map
*/

10
worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockTypes.java
View File

@ -219,19 +219,24 @@ public enum BlockTypes implements BlockType {
DARK_PRISMARINE_SLAB,
DARK_PRISMARINE_STAIRS,
DAYLIGHT_DETECTOR,
DEAD_BRAIN_CORAL,
DEAD_BRAIN_CORAL_BLOCK,
DEAD_BRAIN_CORAL_FAN,
DEAD_BRAIN_CORAL_WALL_FAN,
DEAD_BUBBLE_CORAL,
DEAD_BUBBLE_CORAL_BLOCK,
DEAD_BUBBLE_CORAL_FAN,
DEAD_BUBBLE_CORAL_WALL_FAN,
DEAD_BUSH,
DEAD_FIRE_CORAL,
DEAD_FIRE_CORAL_BLOCK,
DEAD_FIRE_CORAL_FAN,
DEAD_FIRE_CORAL_WALL_FAN,
DEAD_HORN_CORAL,
DEAD_HORN_CORAL_BLOCK,
DEAD_HORN_CORAL_FAN,
DEAD_HORN_CORAL_WALL_FAN,
DEAD_TUBE_CORAL,
DEAD_TUBE_CORAL_BLOCK,
DEAD_TUBE_CORAL_FAN,
DEAD_TUBE_CORAL_WALL_FAN,
@ -654,11 +659,6 @@ public enum BlockTypes implements BlockType {
YELLOW_WOOL,
ZOMBIE_HEAD,
ZOMBIE_WALL_HEAD,
DEAD_BRAIN_CORAL,
DEAD_BUBBLE_CORAL,
DEAD_FIRE_CORAL,
DEAD_HORN_CORAL,
DEAD_TUBE_CORAL,
;

5
worldedit-core/src/main/java/com/sk89q/worldedit/world/item/ItemTypes.java
View File

@ -245,15 +245,20 @@ public enum ItemTypes implements ItemType {
DARK_PRISMARINE_SLAB,
DARK_PRISMARINE_STAIRS,
DAYLIGHT_DETECTOR,
DEAD_BRAIN_CORAL,
DEAD_BRAIN_CORAL_BLOCK,
DEAD_BRAIN_CORAL_FAN,
DEAD_BUBBLE_CORAL,
DEAD_BUBBLE_CORAL_BLOCK,
DEAD_BUBBLE_CORAL_FAN,
DEAD_BUSH,
DEAD_FIRE_CORAL,
DEAD_FIRE_CORAL_BLOCK,
DEAD_FIRE_CORAL_FAN,
DEAD_HORN_CORAL,
DEAD_HORN_CORAL_BLOCK,
DEAD_HORN_CORAL_FAN,
DEAD_TUBE_CORAL,
DEAD_TUBE_CORAL_BLOCK,
DEAD_TUBE_CORAL_FAN,
DEBUG_STICK,

4
worldedit-core/src/main/java/com/sk89q/worldedit/world/storage/ChunkStore.java
View File

@ -46,8 +46,8 @@ public abstract class ChunkStore implements Closeable {
public static final int DATA_VERSION_MC_1_13 = 1519;
/**
* >> to chunk
* << from chunk
* {@code >>} - to chunk
* {@code <<} - from chunk
*/
public static final int CHUNK_SHIFTS = 4;

129
worldedit-core/src/main/resources/com/sk89q/worldedit/world/registry/blocks.json
View File

@ -3949,6 +3949,31 @@
"hasContainer": true
}
},
{
"id": "minecraft:dead_brain_coral",
"localizedName": "Dead Brain Coral",
"material": {
"powerSource": false,
"lightValue": 0,
"hardness": 0.0,
"resistance": 0.0,
"ticksRandomly": false,
"fullCube": false,
"slipperiness": 0.6,
"liquid": false,
"solid": true,
"movementBlocker": true,
"burnable": false,
"opaque": true,
"replacedDuringPlacement": false,
"toolRequired": true,
"fragileWhenPushed": false,
"unpushable": false,
"mapColor": "#707070",
"isTranslucent": false,
"hasContainer": false
}
},
{
"id": "minecraft:dead_brain_coral_block",
"localizedName": "Dead Brain Coral Block",
@ -4024,6 +4049,31 @@
"hasContainer": false
}
},
{
"id": "minecraft:dead_bubble_coral",
"localizedName": "Dead Bubble Coral",
"material": {
"powerSource": false,
"lightValue": 0,
"hardness": 0.0,
"resistance": 0.0,
"ticksRandomly": false,
"fullCube": false,
"slipperiness": 0.6,
"liquid": false,
"solid": true,
"movementBlocker": true,
"burnable": false,
"opaque": true,
"replacedDuringPlacement": false,
"toolRequired": true,
"fragileWhenPushed": false,
"unpushable": false,
"mapColor": "#707070",
"isTranslucent": false,
"hasContainer": false
}
},
{
"id": "minecraft:dead_bubble_coral_block",
"localizedName": "Dead Bubble Coral Block",
@ -4124,6 +4174,31 @@
"hasContainer": false
}
},
{
"id": "minecraft:dead_fire_coral",
"localizedName": "Dead Fire Coral",
"material": {
"powerSource": false,
"lightValue": 0,
"hardness": 0.0,
"resistance": 0.0,
"ticksRandomly": false,
"fullCube": false,
"slipperiness": 0.6,
"liquid": false,
"solid": true,
"movementBlocker": true,
"burnable": false,
"opaque": true,
"replacedDuringPlacement": false,
"toolRequired": true,
"fragileWhenPushed": false,
"unpushable": false,
"mapColor": "#707070",
"isTranslucent": false,
"hasContainer": false
}
},
{
"id": "minecraft:dead_fire_coral_block",
"localizedName": "Dead Fire Coral Block",
@ -4199,6 +4274,31 @@
"hasContainer": false
}
},
{
"id": "minecraft:dead_horn_coral",
"localizedName": "Dead Horn Coral",
"material": {
"powerSource": false,
"lightValue": 0,
"hardness": 0.0,
"resistance": 0.0,
"ticksRandomly": false,
"fullCube": false,
"slipperiness": 0.6,
"liquid": false,
"solid": true,
"movementBlocker": true,
"burnable": false,
"opaque": true,
"replacedDuringPlacement": false,
"toolRequired": true,
"fragileWhenPushed": false,
"unpushable": false,
"mapColor": "#707070",
"isTranslucent": false,
"hasContainer": false
}
},
{
"id": "minecraft:dead_horn_coral_block",
"localizedName": "Dead Horn Coral Block",
@ -4274,6 +4374,31 @@
"hasContainer": false
}
},
{
"id": "minecraft:dead_tube_coral",
"localizedName": "Dead Tube Coral",
"material": {
"powerSource": false,
"lightValue": 0,
"hardness": 0.0,
"resistance": 0.0,
"ticksRandomly": false,
"fullCube": false,
"slipperiness": 0.6,
"liquid": false,
"solid": true,
"movementBlocker": true,
"burnable": false,
"opaque": true,
"replacedDuringPlacement": false,
"toolRequired": true,
"fragileWhenPushed": false,
"unpushable": false,
"mapColor": "#707070",
"isTranslucent": false,
"hasContainer": false
}
},
{
"id": "minecraft:dead_tube_coral_block",
"localizedName": "Dead Tube Coral Block",
@ -6995,7 +7120,7 @@
"fragileWhenPushed": true,
"unpushable": false,
"mapColor": "#ff0000",
"isTranslucent": true,
"isTranslucent": false,
"hasContainer": false
}
},
@ -14045,7 +14170,7 @@
"fragileWhenPushed": true,
"unpushable": false,
"mapColor": "#4040ff",
"isTranslucent": true,
"isTranslucent": false,
"hasContainer": false
}
},

28
worldedit-core/src/main/resources/com/sk89q/worldedit/world/registry/items.json
View File

@ -803,6 +803,10 @@
"id": "minecraft:daylight_detector",
"localizedName": "Air"
},
{
"id": "minecraft:dead_brain_coral",
"localizedName": "Air"
},
{
"id": "minecraft:dead_brain_coral_block",
"localizedName": "Air"
@ -811,6 +815,10 @@
"id": "minecraft:dead_brain_coral_fan",
"localizedName": "Air"
},
{
"id": "minecraft:dead_bubble_coral",
"localizedName": "Air"
},
{
"id": "minecraft:dead_bubble_coral_block",
"localizedName": "Air"
@ -823,6 +831,10 @@
"id": "minecraft:dead_bush",
"localizedName": "Air"
},
{
"id": "minecraft:dead_fire_coral",
"localizedName": "Air"
},
{
"id": "minecraft:dead_fire_coral_block",
"localizedName": "Air"
@ -831,6 +843,10 @@
"id": "minecraft:dead_fire_coral_fan",
"localizedName": "Air"
},
{
"id": "minecraft:dead_horn_coral",
"localizedName": "Air"
},
{
"id": "minecraft:dead_horn_coral_block",
"localizedName": "Air"
@ -839,6 +855,10 @@
"id": "minecraft:dead_horn_coral_fan",
"localizedName": "Air"
},
{
"id": "minecraft:dead_tube_coral",
"localizedName": "Air"
},
{
"id": "minecraft:dead_tube_coral_block",
"localizedName": "Air"
@ -1749,7 +1769,7 @@
},
{
"id": "minecraft:lingering_potion",
"localizedName": "Lingering Potion"
"localizedName": "Lingering Water Bottle"
},
{
"id": "minecraft:llama_spawn_egg",
@ -2237,7 +2257,7 @@
},
{
"id": "minecraft:potion",
"localizedName": "Potion"
"localizedName": "Water Bottle"
},
{
"id": "minecraft:powered_rail",
@ -2677,7 +2697,7 @@
},
{
"id": "minecraft:splash_potion",
"localizedName": "Splash Potion"
"localizedName": "Splash Water Bottle"
},
{
"id": "minecraft:sponge",
@ -2885,7 +2905,7 @@
},
{
"id": "minecraft:tipped_arrow",
"localizedName": "Tipped Arrow"
"localizedName": "Arrow of Poison"
},
{
"id": "minecraft:tnt",