Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-07-01 02:46:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove BukkitMask

Browse Source
This commit is contained in:
MattBDev
2019-06-21 19:58:40 -04:00
parent eddb1ec677
commit 1e02560039
21 changed files with 88 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
worldedit-core/src/main/java/com/boydti/fawe/Fawe.java
View File

@ -166,21 +166,6 @@ public class Fawe {
this.timer = new FaweTimer();
Fawe.this.IMP.setupVault();
File jar = MainUtil.getJarFile();
// TODO FIXME remove extrablocks.json
// File extraBlocks = MainUtil.copyFile(jar, "extrablocks.json", null);
// if (extraBlocks != null && extraBlocks.exists()) {
// TaskManager.IMP.task(() -> {
// try {
// BundledBlockData.getInstance().loadFromResource();
// BundledBlockData.getInstance().add(extraBlocks.toURI().toURL(), true);
// } catch (Throwable ignore) {
// ignore.printStackTrace();
// Fawe.debug("Invalid format: extrablocks.json");
// }
// });
// }
// Delayed worldedit setup
TaskManager.IMP.later(() -> {
try {
@ -207,11 +192,6 @@ public class Fawe {
this.chatManager = chatManager;
}
// @Deprecated
// public boolean isJava8() {
// return isJava8;
// }
public DefaultTransformParser getTransformParser() {
return transformParser;
}

20
worldedit-core/src/main/java/com/boydti/fawe/regions/FaweMask.java
View File

@ -8,24 +8,14 @@ import com.sk89q.worldedit.regions.Region;
public class FaweMask implements IDelegateRegion {
private final Region region;
private String description = null;
@Deprecated
public FaweMask(final BlockVector3 pos1, final BlockVector3 pos2, final String id) {
this(new CuboidRegion(pos1, pos2), id);
}
@Deprecated
public FaweMask(final BlockVector3 pos1, final BlockVector3 pos2) {
this(pos1, pos2, null);
if ((pos1 == null) || (pos2 == null)) {
throw new IllegalArgumentException("BlockVectors cannot be null!");
}
this(new CuboidRegion(pos1, pos2));
}
public FaweMask(Region region, String id) {
public FaweMask(Region region) {
this.region = region;
this.description = id;
}
@Override
@ -33,10 +23,6 @@ public class FaweMask implements IDelegateRegion {
return region;
}
public String getName() {
return this.description;
}
public boolean isValid(FawePlayer player, FaweMaskManager.MaskType type) {
return false;
}
@ -45,4 +31,4 @@ public class FaweMask implements IDelegateRegion {
public Region clone() {
throw new UnsupportedOperationException("Clone not supported");
}
}
}

2
worldedit-core/src/main/java/com/boydti/fawe/regions/general/plot/PlotSquaredFeature.java
View File

@ -149,7 +149,7 @@ public class PlotSquaredFeature extends FaweMaskManager {
};
}
return new FaweMask(maskedRegion, "PLOT^2") {
return new FaweMask(maskedRegion) {
@Override
public boolean isValid(FawePlayer player, MaskType type) {
if (Settings.Done.RESTRICT_BUILDING && Flags.DONE.isSet(finalPlot)) {