3
0
Mirror von https://github.com/IntellectualSites/FastAsyncWorldEdit.git synchronisiert 2024-12-25 18:40:05 +01:00

Refactor heightmap classes to math where it makes more sense

(not required by heightmap processor, nor are they processors, used for heightmap brushes etc.)
Dieser Commit ist enthalten in:
dordsor21 2021-09-11 12:23:03 +01:00
Ursprung 5fb4434afe
Commit 37998ec598
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 1E53E88969FFCF0B
24 geänderte Dateien mit 28 neuen und 28 gelöschten Zeilen

Datei anzeigen

@ -1,7 +1,7 @@
package com.fastasyncworldedit.core.command.tool.brush; package com.fastasyncworldedit.core.command.tool.brush;
import com.fastasyncworldedit.core.extent.processor.heightmap.HeightMap; import com.fastasyncworldedit.core.math.heightmap.HeightMap;
import com.fastasyncworldedit.core.extent.processor.heightmap.ScalableHeightMap; import com.fastasyncworldedit.core.math.heightmap.ScalableHeightMap;
import com.sk89q.worldedit.EditSession; import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.MaxChangedBlocksException; import com.sk89q.worldedit.MaxChangedBlocksException;
import com.sk89q.worldedit.extent.clipboard.Clipboard; import com.sk89q.worldedit.extent.clipboard.Clipboard;

Datei anzeigen

@ -1,9 +1,9 @@
package com.fastasyncworldedit.core.command.tool.brush; package com.fastasyncworldedit.core.command.tool.brush;
import com.fastasyncworldedit.core.configuration.Caption; import com.fastasyncworldedit.core.configuration.Caption;
import com.fastasyncworldedit.core.extent.processor.heightmap.HeightMap; import com.fastasyncworldedit.core.math.heightmap.HeightMap;
import com.fastasyncworldedit.core.extent.processor.heightmap.RotatableHeightMap; import com.fastasyncworldedit.core.math.heightmap.RotatableHeightMap;
import com.fastasyncworldedit.core.extent.processor.heightmap.ScalableHeightMap; import com.fastasyncworldedit.core.math.heightmap.ScalableHeightMap;
import com.fastasyncworldedit.core.internal.exception.FaweException; import com.fastasyncworldedit.core.internal.exception.FaweException;
import com.sk89q.worldedit.EditSession; import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.MaxChangedBlocksException; import com.sk89q.worldedit.MaxChangedBlocksException;

Datei anzeigen

@ -1,6 +1,6 @@
package com.fastasyncworldedit.core.command.tool.brush; package com.fastasyncworldedit.core.command.tool.brush;
import com.fastasyncworldedit.core.extent.processor.heightmap.HeightMap; import com.fastasyncworldedit.core.math.heightmap.HeightMap;
import com.fastasyncworldedit.core.function.mask.StencilBrushMask; import com.fastasyncworldedit.core.function.mask.StencilBrushMask;
import com.sk89q.worldedit.EditSession; import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.MaxChangedBlocksException; import com.sk89q.worldedit.MaxChangedBlocksException;

Datei anzeigen

@ -1,6 +1,6 @@
package com.fastasyncworldedit.core.extent.clipboard; package com.fastasyncworldedit.core.extent.clipboard;
import com.fastasyncworldedit.core.extent.processor.heightmap.HeightMapType; import com.fastasyncworldedit.core.math.heightmap.HeightMapType;
import com.sk89q.jnbt.CompoundTag; import com.sk89q.jnbt.CompoundTag;
import com.sk89q.worldedit.WorldEditException; import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.entity.Entity; import com.sk89q.worldedit.entity.Entity;

Datei anzeigen

@ -1,7 +1,7 @@
package com.fastasyncworldedit.core.extent.processor; package com.fastasyncworldedit.core.extent.processor;
import com.fastasyncworldedit.core.FaweCache; import com.fastasyncworldedit.core.FaweCache;
import com.fastasyncworldedit.core.extent.processor.heightmap.HeightMapType; import com.fastasyncworldedit.core.math.heightmap.HeightMapType;
import com.fastasyncworldedit.core.queue.IBatchProcessor; import com.fastasyncworldedit.core.queue.IBatchProcessor;
import com.fastasyncworldedit.core.queue.IChunk; import com.fastasyncworldedit.core.queue.IChunk;
import com.fastasyncworldedit.core.queue.IChunkGet; import com.fastasyncworldedit.core.queue.IChunkGet;

Datei anzeigen

@ -1,6 +1,6 @@
package com.fastasyncworldedit.core.function.mask; package com.fastasyncworldedit.core.function.mask;
import com.fastasyncworldedit.core.extent.processor.heightmap.HeightMap; import com.fastasyncworldedit.core.math.heightmap.HeightMap;
import com.fastasyncworldedit.core.math.MutableVector3; import com.fastasyncworldedit.core.math.MutableVector3;
import com.fastasyncworldedit.core.util.MathMan; import com.fastasyncworldedit.core.util.MathMan;
import com.sk89q.worldedit.EditSession; import com.sk89q.worldedit.EditSession;

Datei anzeigen

@ -1,4 +1,4 @@
package com.fastasyncworldedit.core.extent.processor.heightmap; package com.fastasyncworldedit.core.math.heightmap;
public class AbstractDelegateHeightMap implements HeightMap { public class AbstractDelegateHeightMap implements HeightMap {

Datei anzeigen

@ -1,4 +1,4 @@
package com.fastasyncworldedit.core.extent.processor.heightmap; package com.fastasyncworldedit.core.math.heightmap;
public class ArrayHeightMap extends ScalableHeightMap { public class ArrayHeightMap extends ScalableHeightMap {

Datei anzeigen

@ -1,4 +1,4 @@
package com.fastasyncworldedit.core.extent.processor.heightmap; package com.fastasyncworldedit.core.math.heightmap;
public class AverageHeightMapFilter { public class AverageHeightMapFilter {

Datei anzeigen

@ -1,4 +1,4 @@
package com.fastasyncworldedit.core.extent.processor.heightmap; package com.fastasyncworldedit.core.math.heightmap;
public class FlatScalableHeightMap extends ScalableHeightMap { public class FlatScalableHeightMap extends ScalableHeightMap {

Datei anzeigen

@ -1,4 +1,4 @@
package com.fastasyncworldedit.core.extent.processor.heightmap; package com.fastasyncworldedit.core.math.heightmap;
import com.sk89q.worldedit.EditSession; import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.MaxChangedBlocksException; import com.sk89q.worldedit.MaxChangedBlocksException;

Datei anzeigen

@ -1,4 +1,4 @@
package com.fastasyncworldedit.core.extent.processor.heightmap; package com.fastasyncworldedit.core.math.heightmap;
import com.fastasyncworldedit.core.registry.state.PropertyKey; import com.fastasyncworldedit.core.registry.state.PropertyKey;
import com.sk89q.worldedit.registry.state.Property; import com.sk89q.worldedit.registry.state.Property;

Datei anzeigen

@ -1,4 +1,4 @@
package com.fastasyncworldedit.core.extent.processor.heightmap; package com.fastasyncworldedit.core.math.heightmap;
import com.fastasyncworldedit.core.math.MutableVector3; import com.fastasyncworldedit.core.math.MutableVector3;
import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldedit.math.BlockVector3;

Datei anzeigen

@ -1,4 +1,4 @@
package com.fastasyncworldedit.core.extent.processor.heightmap; package com.fastasyncworldedit.core.math.heightmap;
import com.fastasyncworldedit.core.math.IntPair; import com.fastasyncworldedit.core.math.IntPair;
import com.fastasyncworldedit.core.math.MutableBlockVector3; import com.fastasyncworldedit.core.math.MutableBlockVector3;

Datei anzeigen

@ -1,6 +1,6 @@
package com.fastasyncworldedit.core.queue; package com.fastasyncworldedit.core.queue;
import com.fastasyncworldedit.core.extent.processor.heightmap.HeightMapType; import com.fastasyncworldedit.core.math.heightmap.HeightMapType;
import com.sk89q.jnbt.CompoundTag; import com.sk89q.jnbt.CompoundTag;
import com.sk89q.worldedit.extent.InputExtent; import com.sk89q.worldedit.extent.InputExtent;
import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldedit.math.BlockVector3;

Datei anzeigen

@ -1,6 +1,6 @@
package com.fastasyncworldedit.core.queue; package com.fastasyncworldedit.core.queue;
import com.fastasyncworldedit.core.extent.processor.heightmap.HeightMapType; import com.fastasyncworldedit.core.math.heightmap.HeightMapType;
import com.sk89q.jnbt.CompoundTag; import com.sk89q.jnbt.CompoundTag;
import com.sk89q.worldedit.extent.OutputExtent; import com.sk89q.worldedit.extent.OutputExtent;
import com.sk89q.worldedit.function.operation.Operation; import com.sk89q.worldedit.function.operation.Operation;

Datei anzeigen

@ -1,7 +1,7 @@
package com.fastasyncworldedit.core.queue.implementation.blocks; package com.fastasyncworldedit.core.queue.implementation.blocks;
import com.fastasyncworldedit.core.FaweCache; import com.fastasyncworldedit.core.FaweCache;
import com.fastasyncworldedit.core.extent.processor.heightmap.HeightMapType; import com.fastasyncworldedit.core.math.heightmap.HeightMapType;
import com.fastasyncworldedit.core.queue.IChunkSet; import com.fastasyncworldedit.core.queue.IChunkSet;
import com.fastasyncworldedit.core.util.collection.MemBlockSet; import com.fastasyncworldedit.core.util.collection.MemBlockSet;
import com.sk89q.jnbt.CompoundTag; import com.sk89q.jnbt.CompoundTag;

Datei anzeigen

@ -2,7 +2,7 @@ package com.fastasyncworldedit.core.queue.implementation.blocks;
import com.fastasyncworldedit.core.FaweCache; import com.fastasyncworldedit.core.FaweCache;
import com.fastasyncworldedit.core.configuration.Settings; import com.fastasyncworldedit.core.configuration.Settings;
import com.fastasyncworldedit.core.extent.processor.heightmap.HeightMapType; import com.fastasyncworldedit.core.math.heightmap.HeightMapType;
import com.fastasyncworldedit.core.math.BlockVector3ChunkMap; import com.fastasyncworldedit.core.math.BlockVector3ChunkMap;
import com.fastasyncworldedit.core.queue.IChunkSet; import com.fastasyncworldedit.core.queue.IChunkSet;
import com.fastasyncworldedit.core.queue.Pool; import com.fastasyncworldedit.core.queue.Pool;

Datei anzeigen

@ -1,7 +1,7 @@
package com.fastasyncworldedit.core.queue.implementation.blocks; package com.fastasyncworldedit.core.queue.implementation.blocks;
import com.fastasyncworldedit.core.FaweCache; import com.fastasyncworldedit.core.FaweCache;
import com.fastasyncworldedit.core.extent.processor.heightmap.HeightMapType; import com.fastasyncworldedit.core.math.heightmap.HeightMapType;
import com.fastasyncworldedit.core.queue.IBlocks; import com.fastasyncworldedit.core.queue.IBlocks;
import com.fastasyncworldedit.core.queue.IChunkGet; import com.fastasyncworldedit.core.queue.IChunkGet;
import com.fastasyncworldedit.core.queue.IChunkSet; import com.fastasyncworldedit.core.queue.IChunkSet;

Datei anzeigen

@ -4,7 +4,7 @@ import com.fastasyncworldedit.core.FaweCache;
import com.fastasyncworldedit.core.configuration.Settings; import com.fastasyncworldedit.core.configuration.Settings;
import com.fastasyncworldedit.core.extent.filter.block.ChunkFilterBlock; import com.fastasyncworldedit.core.extent.filter.block.ChunkFilterBlock;
import com.fastasyncworldedit.core.extent.processor.EmptyBatchProcessor; import com.fastasyncworldedit.core.extent.processor.EmptyBatchProcessor;
import com.fastasyncworldedit.core.extent.processor.heightmap.HeightMapType; import com.fastasyncworldedit.core.math.heightmap.HeightMapType;
import com.fastasyncworldedit.core.queue.Filter; import com.fastasyncworldedit.core.queue.Filter;
import com.fastasyncworldedit.core.queue.IChunk; import com.fastasyncworldedit.core.queue.IChunk;
import com.fastasyncworldedit.core.queue.IChunkGet; import com.fastasyncworldedit.core.queue.IChunkGet;

Datei anzeigen

@ -1,7 +1,7 @@
package com.fastasyncworldedit.core.queue.implementation.chunk; package com.fastasyncworldedit.core.queue.implementation.chunk;
import com.fastasyncworldedit.core.extent.filter.block.ChunkFilterBlock; import com.fastasyncworldedit.core.extent.filter.block.ChunkFilterBlock;
import com.fastasyncworldedit.core.extent.processor.heightmap.HeightMapType; import com.fastasyncworldedit.core.math.heightmap.HeightMapType;
import com.fastasyncworldedit.core.queue.Filter; import com.fastasyncworldedit.core.queue.Filter;
import com.fastasyncworldedit.core.queue.IChunkSet; import com.fastasyncworldedit.core.queue.IChunkSet;
import com.fastasyncworldedit.core.queue.IQueueChunk; import com.fastasyncworldedit.core.queue.IQueueChunk;

Datei anzeigen

@ -50,8 +50,8 @@ import com.fastasyncworldedit.core.command.tool.sweep.SweepBrush;
import com.fastasyncworldedit.core.configuration.Caption; import com.fastasyncworldedit.core.configuration.Caption;
import com.fastasyncworldedit.core.configuration.Settings; import com.fastasyncworldedit.core.configuration.Settings;
import com.fastasyncworldedit.core.extent.clipboard.MultiClipboardHolder; import com.fastasyncworldedit.core.extent.clipboard.MultiClipboardHolder;
import com.fastasyncworldedit.core.extent.processor.heightmap.ScalableHeightMap; import com.fastasyncworldedit.core.math.heightmap.ScalableHeightMap;
import com.fastasyncworldedit.core.extent.processor.heightmap.ScalableHeightMap.Shape; import com.fastasyncworldedit.core.math.heightmap.ScalableHeightMap.Shape;
import com.fastasyncworldedit.core.function.mask.IdMask; import com.fastasyncworldedit.core.function.mask.IdMask;
import com.fastasyncworldedit.core.function.mask.SingleBlockTypeMask; import com.fastasyncworldedit.core.function.mask.SingleBlockTypeMask;
import com.fastasyncworldedit.core.object.FaweLimit; import com.fastasyncworldedit.core.object.FaweLimit;

Datei anzeigen

@ -19,7 +19,7 @@
package com.sk89q.worldedit.extent; package com.sk89q.worldedit.extent;
import com.fastasyncworldedit.core.extent.processor.heightmap.HeightMapType; import com.fastasyncworldedit.core.math.heightmap.HeightMapType;
import com.fastasyncworldedit.core.math.MutableBlockVector3; import com.fastasyncworldedit.core.math.MutableBlockVector3;
import com.sk89q.worldedit.function.pattern.Pattern; import com.sk89q.worldedit.function.pattern.Pattern;
import com.sk89q.worldedit.internal.util.DeprecationUtil; import com.sk89q.worldedit.internal.util.DeprecationUtil;

Datei anzeigen

@ -19,7 +19,7 @@
package com.sk89q.worldedit.extent; package com.sk89q.worldedit.extent;
import com.fastasyncworldedit.core.extent.processor.heightmap.HeightMapType; import com.fastasyncworldedit.core.math.heightmap.HeightMapType;
import com.fastasyncworldedit.core.math.MutableBlockVector3; import com.fastasyncworldedit.core.math.MutableBlockVector3;
import com.sk89q.jnbt.CompoundTag; import com.sk89q.jnbt.CompoundTag;
import com.sk89q.worldedit.WorldEditException; import com.sk89q.worldedit.WorldEditException;