Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-07-05 20:36:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Convert tabs to whitespace.

Browse Source
This commit is contained in:
MattBDev
2019-07-22 16:42:40 -04:00
parent 4d8cf04be1
commit 46f5b12b36
75 changed files with 513 additions and 546 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
worldedit-core/src/main/java/com/boydti/fawe/object/extent/BlockTranslateExtent.java
View File

@ -59,9 +59,9 @@ public class BlockTranslateExtent extends AbstractDelegateExtent {
public BlockState getBlock(int x, int y, int z) {
return super.getBlock(x + dx, y + dy, z + dz);
}
@Override
public BaseBlock getFullBlock(BlockVector3 pos) {
return super.getFullBlock(pos.add(dx, dy, dz));
return super.getFullBlock(pos.add(dx, dy, dz));
}
}

24
worldedit-core/src/main/java/com/boydti/fawe/object/extent/NullExtent.java
View File

@ -54,7 +54,7 @@ public class NullExtent extends FaweRegionExtent {
@Override
public BiomeType getBiome(final BlockVector2 arg0) {
if(reason != null) {
throw reason;
throw reason;
}
return null;
}
@ -62,7 +62,7 @@ public class NullExtent extends FaweRegionExtent {
@Override
public BlockState getBlock(final BlockVector3 arg0) {
if(reason != null) {
throw reason;
throw reason;
}
return null;
}
@ -70,7 +70,7 @@ public class NullExtent extends FaweRegionExtent {
@Override
public BlockState getBlock(int x, int y, int z) {
if(reason != null) {
throw reason;
throw reason;
}
return null;
}
@ -86,7 +86,7 @@ public class NullExtent extends FaweRegionExtent {
@Override
public boolean setBiome(final BlockVector2 arg0, final BiomeType arg1) {
if(reason != null) {
throw reason;
throw reason;
}
return false;
}
@ -94,7 +94,7 @@ public class NullExtent extends FaweRegionExtent {
@Override
public boolean setBlock(final BlockVector3 arg0, final BlockStateHolder arg1) throws WorldEditException {
if(reason != null) {
throw reason;
throw reason;
}
return false;
}
@ -102,7 +102,7 @@ public class NullExtent extends FaweRegionExtent {
@Override
public boolean setBlock(int x, int y, int z, BlockStateHolder block) throws WorldEditException {
if(reason != null) {
throw reason;
throw reason;
}
return false;
}
@ -110,7 +110,7 @@ public class NullExtent extends FaweRegionExtent {
@Override
public Entity createEntity(final Location arg0, final BaseEntity arg1) {
if(reason != null) {
throw reason;
throw reason;
}
return null;
}
@ -138,7 +138,7 @@ public class NullExtent extends FaweRegionExtent {
@Override
public boolean contains(int x, int z) {
if(reason != null) {
throw reason;
throw reason;
}
return false;
}
@ -146,7 +146,7 @@ public class NullExtent extends FaweRegionExtent {
@Override
public boolean contains(int x, int y, int z) {
if(reason != null) {
throw reason;
throw reason;
}
return false;
}
@ -165,7 +165,7 @@ public class NullExtent extends FaweRegionExtent {
@Override
public int getNearestSurfaceLayer(int x, int z, int y, int minY, int maxY) {
if(reason != null) {
throw reason;
throw reason;
}
return -1;
}
@ -173,7 +173,7 @@ public class NullExtent extends FaweRegionExtent {
@Override
public int getNearestSurfaceTerrainBlock(int x, int z, int y, int minY, int maxY) {
if(reason != null) {
throw reason;
throw reason;
}
return -1;
}
@ -181,7 +181,7 @@ public class NullExtent extends FaweRegionExtent {
@Override
public int getNearestSurfaceTerrainBlock(int x, int z, int y, int minY, int maxY, int failedMin, int failedMax) {
if(reason != null) {
throw reason;
throw reason;
}
return -1;
}

2
worldedit-core/src/main/java/com/boydti/fawe/object/extent/PositionTransformExtent.java
View File

@ -57,7 +57,7 @@ public class PositionTransformExtent extends ResettableExtent {
@Override
public BaseBlock getFullBlock(BlockVector3 position) {
return super.getFullBlock(getPos(position));
return super.getFullBlock(getPos(position));
}
@Override

12
worldedit-core/src/main/java/com/boydti/fawe/object/extent/StripNBTExtent.java
View File

@ -1,11 +1,8 @@
package com.boydti.fawe.object.extent;
import com.boydti.fawe.util.ReflectionUtils;
import com.sk89q.jnbt.CompoundTag;
import com.sk89q.jnbt.Tag;
import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.world.block.BaseBlock;
import com.sk89q.worldedit.world.block.BlockState;
import com.sk89q.worldedit.entity.BaseEntity;
import com.sk89q.worldedit.entity.Entity;
import com.sk89q.worldedit.extent.AbstractDelegateExtent;
@ -13,12 +10,11 @@ import com.sk89q.worldedit.extent.Extent;
import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.util.Location;
import com.sk89q.worldedit.world.NbtValued;
import com.sk89q.worldedit.world.block.BaseBlock;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import javax.annotation.Nullable;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
import javax.annotation.Nullable;
public class StripNBTExtent extends AbstractDelegateExtent {
private final String[] strip;
@ -50,8 +46,8 @@ public class StripNBTExtent extends AbstractDelegateExtent {
}
public <B extends BlockStateHolder<B>> B stripBlockNBT(B block) {
if(!(block instanceof BaseBlock)) return block;
BaseBlock localBlock = (BaseBlock)block;
if(!(block instanceof BaseBlock)) return block;
BaseBlock localBlock = (BaseBlock)block;
if (!localBlock.hasNbtData()) return block;
CompoundTag nbt = localBlock.getNbtData();
Map<String, Tag> value = nbt.getValue();

4
worldedit-core/src/main/java/com/boydti/fawe/object/extent/TemporalExtent.java
View File

@ -68,9 +68,9 @@ public class TemporalExtent extends AbstractDelegateExtent {
public BaseBlock getFullBlock(BlockVector3 position) {
if (position.getX() == x && position.getY() == y && position.getZ() == z) {
if(block instanceof BaseBlock) {
return (BaseBlock)block;
return (BaseBlock)block;
}else {
return block.toBaseBlock();
return block.toBaseBlock();
}
}
return super.getFullBlock(position);

17
worldedit-core/src/main/java/com/boydti/fawe/object/extent/TransformExtent.java
View File

@ -1,16 +1,15 @@
package com.boydti.fawe.object.extent;
import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.math.Vector3;
import com.sk89q.worldedit.world.block.BaseBlock;
import com.sk89q.worldedit.world.block.BlockState;
import com.sk89q.worldedit.extent.Extent;
import com.sk89q.worldedit.extent.transform.BlockTransformExtent;
import com.sk89q.worldedit.math.BlockVector2;
import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.math.MutableBlockVector3;
import com.sk89q.worldedit.math.MutableVector3;
import com.sk89q.worldedit.math.Vector3;
import com.sk89q.worldedit.world.biome.BiomeType;
import com.sk89q.worldedit.world.block.BaseBlock;
import com.sk89q.worldedit.world.block.BlockState;
import com.sk89q.worldedit.world.block.BlockStateHolder;
public class TransformExtent extends BlockTransformExtent {
@ -31,15 +30,15 @@ public class TransformExtent extends BlockTransformExtent {
@Override
public BlockVector3 getMinimumPoint() {
BlockVector3 pos1 = getPos(super.getMinimumPoint());
BlockVector3 pos2 = getPos(super.getMaximumPoint());
BlockVector3 pos1 = getPos(super.getMinimumPoint());
BlockVector3 pos2 = getPos(super.getMaximumPoint());
return pos1.getMinimum(pos2);
}
@Override
public BlockVector3 getMaximumPoint() {
BlockVector3 pos1 = getPos(super.getMinimumPoint());
BlockVector3 pos2 = getPos(super.getMaximumPoint());
BlockVector3 pos1 = getPos(super.getMinimumPoint());
BlockVector3 pos2 = getPos(super.getMaximumPoint());
return pos1.getMaximum(pos2);
}
@ -84,7 +83,7 @@ public class TransformExtent extends BlockTransformExtent {
@Override
public BaseBlock getFullBlock(BlockVector3 position) {
return transform(super.getFullBlock(getPos(position)));
return transform(super.getFullBlock(getPos(position)));
}
@Override