mirror of
https://github.com/plexusorg/Plex-FAWE.git
synced 2024-12-23 01:37:37 +00:00
Fix compile
This commit is contained in:
parent
be574391ed
commit
659ed09bf1
10
build.gradle
10
build.gradle
@ -21,11 +21,6 @@ buildscript {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
allprojects {
|
|
||||||
group = 'com.sk89q.worldedit'
|
|
||||||
version = '7.0.0-SNAPSHOT'
|
|
||||||
}
|
|
||||||
|
|
||||||
apply plugin: 'java'
|
apply plugin: 'java'
|
||||||
clean { delete "target" }
|
clean { delete "target" }
|
||||||
|
|
||||||
@ -50,9 +45,10 @@ ext {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
version = date + revision + buildNumber
|
|
||||||
if ( project.hasProperty("lzNoVersion") ) { // gradle build -PlzNoVersion
|
if ( project.hasProperty("lzNoVersion") ) { // gradle build -PlzNoVersion
|
||||||
version = "unknown"
|
version = "unknown"
|
||||||
|
} else {
|
||||||
|
version = date + revision + buildNumber
|
||||||
}
|
}
|
||||||
description = """FastAsyncWorldEdit"""
|
description = """FastAsyncWorldEdit"""
|
||||||
|
|
||||||
@ -68,7 +64,9 @@ subprojects {
|
|||||||
|
|
||||||
sourceCompatibility = JavaVersion.VERSION_1_8
|
sourceCompatibility = JavaVersion.VERSION_1_8
|
||||||
targetCompatibility = JavaVersion.VERSION_1_8
|
targetCompatibility = JavaVersion.VERSION_1_8
|
||||||
|
|
||||||
version = rootProject.version
|
version = rootProject.version
|
||||||
|
group = 'com.boydti.fawe'
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
|
@ -1,10 +1,12 @@
|
|||||||
package com.boydti.fawe.bukkit.filter;
|
package com.boydti.fawe.bukkit.filter;
|
||||||
|
|
||||||
import com.boydti.fawe.Fawe;
|
import com.boydti.fawe.Fawe;
|
||||||
|
import com.boydti.fawe.FaweAPI;
|
||||||
import com.boydti.fawe.object.RunnableVal;
|
import com.boydti.fawe.object.RunnableVal;
|
||||||
import com.boydti.fawe.regions.general.CuboidRegionFilter;
|
import com.boydti.fawe.regions.general.CuboidRegionFilter;
|
||||||
import com.boydti.fawe.util.TaskManager;
|
import com.boydti.fawe.util.TaskManager;
|
||||||
import com.sk89q.worldedit.BlockVector;
|
import com.sk89q.worldedit.BlockVector;
|
||||||
|
import com.sk89q.worldguard.WorldGuard;
|
||||||
import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
|
import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
|
||||||
import com.sk89q.worldguard.protection.ApplicableRegionSet;
|
import com.sk89q.worldguard.protection.ApplicableRegionSet;
|
||||||
import com.sk89q.worldguard.protection.managers.RegionManager;
|
import com.sk89q.worldguard.protection.managers.RegionManager;
|
||||||
@ -29,7 +31,7 @@ public class WorldGuardFilter extends CuboidRegionFilter {
|
|||||||
TaskManager.IMP.sync(new RunnableVal<Object>() {
|
TaskManager.IMP.sync(new RunnableVal<Object>() {
|
||||||
@Override
|
@Override
|
||||||
public void run(Object value) {
|
public void run(Object value) {
|
||||||
WorldGuardFilter.this.manager = WorldGuardPlugin.inst().getRegionManager(world);
|
WorldGuardFilter.this.manager = WorldGuard.getInstance().getPlatform().getRegionContainer().get(FaweAPI.getWorld(world.getName()));
|
||||||
for (ProtectedRegion region : manager.getRegions().values()) {
|
for (ProtectedRegion region : manager.getRegions().values()) {
|
||||||
BlockVector min = region.getMinimumPoint();
|
BlockVector min = region.getMinimumPoint();
|
||||||
BlockVector max = region.getMaximumPoint();
|
BlockVector max = region.getMaximumPoint();
|
||||||
|
@ -6,7 +6,6 @@ import com.boydti.fawe.bukkit.wrapper.state.AsyncSign;
|
|||||||
import com.boydti.fawe.object.FaweQueue;
|
import com.boydti.fawe.object.FaweQueue;
|
||||||
import com.boydti.fawe.util.TaskManager;
|
import com.boydti.fawe.util.TaskManager;
|
||||||
import com.sk89q.worldedit.WorldEditException;
|
import com.sk89q.worldedit.WorldEditException;
|
||||||
import com.sk89q.worldedit.blocks.BlockID;
|
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.function.Supplier;
|
import java.util.function.Supplier;
|
||||||
|
@ -6,6 +6,7 @@ import com.sk89q.worldedit.blocks.BaseBlock;
|
|||||||
import com.sk89q.worldedit.world.block.BlockState;
|
import com.sk89q.worldedit.world.block.BlockState;
|
||||||
import com.sk89q.worldedit.extent.Extent;
|
import com.sk89q.worldedit.extent.Extent;
|
||||||
import com.sk89q.worldedit.world.block.BlockStateHolder;
|
import com.sk89q.worldedit.world.block.BlockStateHolder;
|
||||||
|
import com.sk89q.worldedit.world.block.BlockTypes;
|
||||||
|
|
||||||
public class ExistingPattern extends AbstractExtentPattern {
|
public class ExistingPattern extends AbstractExtentPattern {
|
||||||
public ExistingPattern(Extent extent) {
|
public ExistingPattern(Extent extent) {
|
||||||
@ -19,7 +20,7 @@ public class ExistingPattern extends AbstractExtentPattern {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean apply(Extent extent, Vector set, Vector get) throws WorldEditException {
|
public boolean apply(Extent extent, Vector set, Vector get) throws WorldEditException {
|
||||||
if (set.getBlockX() == get.getBlockX() && set.getBlockZ() == get.getBlockZ() && set.getBlockY() == get.getBlockY()) {
|
if (set.equals(get)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
return extent.setBlock(set, extent.getBlock(get));
|
return extent.setBlock(set, extent.getBlock(get));
|
||||||
|
@ -353,7 +353,7 @@ public class MathMan {
|
|||||||
return x;
|
return x;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static final boolean isInteger(String str) {
|
public static final boolean isInteger(CharSequence str) {
|
||||||
if (str == null) {
|
if (str == null) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -818,6 +818,7 @@ public class Vector extends Vector2D implements Comparable<Vector>, Serializable
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean equals(Object obj) {
|
public boolean equals(Object obj) {
|
||||||
|
if (obj == this) return true;
|
||||||
if (!(obj instanceof Vector)) {
|
if (!(obj instanceof Vector)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -139,7 +139,6 @@ public class BlockMask extends AbstractExtentMask {
|
|||||||
if (other instanceof SingleBlockTypeMask) {
|
if (other instanceof SingleBlockTypeMask) {
|
||||||
return new BlockMaskBuilder(bitSets).filter(((SingleBlockTypeMask) other).getBlockType()).build(getExtent());
|
return new BlockMaskBuilder(bitSets).filter(((SingleBlockTypeMask) other).getBlockType()).build(getExtent());
|
||||||
}
|
}
|
||||||
// TODO FIXME BlockTypeMask
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -164,7 +163,6 @@ public class BlockMask extends AbstractExtentMask {
|
|||||||
if (other instanceof SingleBlockTypeMask) {
|
if (other instanceof SingleBlockTypeMask) {
|
||||||
return new BlockMaskBuilder(bitSets).add(((SingleBlockTypeMask) other).getBlockType()).build(getExtent());
|
return new BlockMaskBuilder(bitSets).add(((SingleBlockTypeMask) other).getBlockType()).build(getExtent());
|
||||||
}
|
}
|
||||||
// TODO FIXME BlockTypeMask
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -56,7 +56,6 @@ public class YAMLConfiguration extends LocalConfiguration {
|
|||||||
logger.log(Level.WARNING, "Error loading WorldEdit configuration", e);
|
logger.log(Level.WARNING, "Error loading WorldEdit configuration", e);
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO FIXME use Config class with comments / bindings
|
|
||||||
profile = config.getBoolean("debug", profile);
|
profile = config.getBoolean("debug", profile);
|
||||||
wandItem = ItemTypes.parse(config.getString("wand-item", wandItem.getId()));
|
wandItem = ItemTypes.parse(config.getString("wand-item", wandItem.getId()));
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user