mirror of
https://github.com/plexusorg/Plex-FAWE.git
synced 2024-06-29 05:41:45 +00:00
* Feature/main/propagate diff annotations (#1187) * 25% done * More work * More work * 50% * More work * 75% * 100% & cleanup * Update adapters * Squish squash, applesauce commit275ba9bd84
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Sat Jul 17 01:10:20 2021 +0200 Update dependency com.comphenix.protocol:ProtocolLib to v4.7.0 (#1173) Co-authored-by: Renovate Bot <bot@renovateapp.com> commit9fd8984804
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Sat Jul 17 01:09:29 2021 +0200 Update dependency org.checkerframework:checker-qual to v3.16.0 (#1184) Co-authored-by: Renovate Bot <bot@renovateapp.com> commit861fb45e5c
Author: dordsor21 <dordsor21@gmail.com> Date: Fri Jul 16 19:07:02 2021 +0100 Fix #1075 commit420c45a29a
Author: dordsor21 <dordsor21@gmail.com> Date: Fri Jul 16 18:48:21 2021 +0100 Entity removal should be on the main thread as we're just passing through rather than doing chunk operations - Fixes #1164 - Not working: butcher/remove history commit4d4db7dcd0
Author: SirYwell <hannesgreule@outlook.de> Date: Fri Jul 16 17:52:44 2021 +0200 Make sure leaves category is loaded for heightmaps (fixes #1176) commitc98f6e4f37
Author: dordsor21 <dordsor21@gmail.com> Date: Fri Jul 16 10:44:52 2021 +0100 Do not allow generation commands to generate outside selection commit2485f5eccc
Author: dordsor21 <dordsor21@gmail.com> Date: Fri Jul 16 10:43:15 2021 +0100 EditSession needs to override some Extent methods to ensure block changes are correctly set through the various extents Fixes #1152 commitd9418ec8ae
Author: dordsor21 <dordsor21@gmail.com> Date: Fri Jul 16 09:52:44 2021 +0100 Undo part of41073bb1a0
Fixes #1178 * Update Upstream fb1fb84 Fixed typo and grammar * We don't support custom heights yet * Casing inconsistency * Address a few comments * Address comments * Don't refactor to AP classpath * Document annotation style * Refactoring & shade cleanup * Address a few comments * More work * Resolve comments not being resolved yet * Feature/main/propagate diff annotations (#1187) (#1194) * Remove beta package, fix history packages, move classes out of object package * Resolve comments not being resolved yet * Remove beta package, fix history packages, move classes out of object package Co-authored-by: NotMyFault <mc.cache@web.de> * brushes should be under brush * More refactoring - Filters/processors should be in the same place and are related to extents - Transforms are in `extent.transform` in upstream * Move history classes under history * Update adapters Co-authored-by: dordsor21 <dordsor21@gmail.com>
114 lines
3.6 KiB
Java
114 lines
3.6 KiB
Java
package com.fastasyncworldedit.core.extent;
|
|
|
|
import com.sk89q.worldedit.WorldEditException;
|
|
import com.sk89q.worldedit.extent.Extent;
|
|
import com.sk89q.worldedit.extent.transform.BlockTransformExtent;
|
|
import com.sk89q.worldedit.math.BlockVector3;
|
|
import com.fastasyncworldedit.core.math.MutableBlockVector3;
|
|
import com.fastasyncworldedit.core.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 {
|
|
|
|
private final MutableVector3 mutable1 = new MutableVector3();
|
|
private final MutableBlockVector3 mutable2 = new MutableBlockVector3();
|
|
private BlockVector3 min;
|
|
|
|
public TransformExtent(Extent parent) {
|
|
super(parent);
|
|
}
|
|
|
|
@Override
|
|
public ResettableExtent setExtent(Extent extent) {
|
|
min = null;
|
|
return super.setExtent(extent);
|
|
}
|
|
|
|
@Override
|
|
public BlockVector3 getMinimumPoint() {
|
|
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());
|
|
return pos1.getMaximum(pos2);
|
|
}
|
|
|
|
@Override
|
|
public void setOrigin(BlockVector3 pos) {
|
|
this.min = pos;
|
|
}
|
|
|
|
public BlockVector3 getPos(BlockVector3 pos) {
|
|
if (min == null) {
|
|
min = pos;
|
|
}
|
|
mutable1.mutX(pos.getX() - min.getX());
|
|
mutable1.mutY(pos.getY() - min.getY());
|
|
mutable1.mutZ(pos.getZ() - min.getZ());
|
|
Vector3 tmp = getTransform().apply(mutable1);
|
|
mutable2.mutX(tmp.getX() + min.getX());
|
|
mutable2.mutY(tmp.getY() + min.getY());
|
|
mutable2.mutZ(tmp.getZ() + min.getZ());
|
|
return mutable2;
|
|
}
|
|
|
|
public BlockVector3 getPos(int x, int y, int z) {
|
|
if (min == null) {
|
|
min = BlockVector3.at(x, y, z);
|
|
}
|
|
mutable1.mutX(x - min.getX());
|
|
mutable1.mutY(y - min.getY());
|
|
mutable1.mutZ(z - min.getZ());
|
|
Vector3 tmp = getTransform().apply(mutable1);
|
|
mutable2.mutX(tmp.getX() + min.getX());
|
|
mutable2.mutY(tmp.getY() + min.getY());
|
|
mutable2.mutZ(tmp.getZ() + min.getZ());
|
|
return tmp.toBlockPoint();
|
|
}
|
|
|
|
@Override
|
|
public BlockState getBlock(int x, int y, int z) {
|
|
BlockVector3 p = getPos(x, y, z);
|
|
return transform(super.getBlock(p.getX(), p.getY(), p.getZ()));
|
|
}
|
|
|
|
@Override
|
|
public BaseBlock getFullBlock(BlockVector3 position) {
|
|
return transform(super.getFullBlock(getPos(position)));
|
|
}
|
|
|
|
@Override
|
|
public BiomeType getBiomeType(int x, int y, int z) {
|
|
BlockVector3 p = getPos(x, y, z);
|
|
return super.getBiomeType(p.getX(), y, p.getZ());
|
|
}
|
|
|
|
@Override
|
|
public <T extends BlockStateHolder<T>> boolean setBlock(int x, int y, int z, T block)
|
|
throws WorldEditException {
|
|
return super.setBlock(getPos(x, y, z), transformInverse(block));
|
|
}
|
|
|
|
|
|
@Override
|
|
public <B extends BlockStateHolder<B>> boolean setBlock(BlockVector3 location, B block)
|
|
throws WorldEditException {
|
|
return super.setBlock(getPos(location), transformInverse(block));
|
|
}
|
|
|
|
@Override
|
|
public boolean setBiome(int x, int y, int z, BiomeType biome) {
|
|
BlockVector3 p = getPos(x, y, z);
|
|
return super.setBiome(p.getX(), p.getY(), p.getZ(), biome);
|
|
}
|
|
}
|