Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Operation Executors #187

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Operation Executors #187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
36180dd
Initial operation executors
KevinDaGame Jun 11, 2023
53a8294
Save
KevinDaGame Jun 11, 2023
c84773e
Merge master
KevinDaGame Aug 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions VoxelSniperCore/src/main/java/com/github/kevindagame/brush/AbstractBrush.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@ import com.github.kevindagame.snipe.Undo
import com.github.kevindagame.util.BlockHelper
import com.github.kevindagame.util.Messages
import com.github.kevindagame.util.VoxelMessage
import com.github.kevindagame.util.brushOperation.BrushOperation
import com.github.kevindagame.util.brushOperation.CustomOperation
import com.github.kevindagame.util.brushOperation.executor.OperationExecutor
import com.github.kevindagame.util.brushOperation.executor.OperationExecutorStrategyFactory
import com.github.kevindagame.util.brushOperation.operation.BrushOperation
import com.github.kevindagame.util.brushOperation.operation.CustomOperation
import com.github.kevindagame.voxelsniper.block.BlockFace
import com.github.kevindagame.voxelsniper.block.IBlock
import com.github.kevindagame.voxelsniper.blockdata.IBlockData
Expand All @@ -35,7 +37,7 @@ abstract class AbstractBrush : IBrush {
/**
* The operations this brush performs
*/
private val operations: MutableList<BrushOperation> = ArrayList()
private var operations: MutableList<BrushOperation> = mutableListOf()

/**
* Brush name.
Expand Down Expand Up @@ -82,13 +84,18 @@ abstract class AbstractBrush : IBrush {

protected fun performOperations(data: SnipeData): Boolean {
if (operations.size == 0) return false
if(operations.distinctBy { it::class.java }.size > 1) {
throw IllegalStateException("Brushes can only perform operations of one type")
}
val event = PlayerSnipeEvent(
data.owner().player,
this,
Collections.unmodifiableList(operations),
operations.any { o -> o is CustomOperation }).callEvent()
if (!event.isCancelled) {
val undo = Undo()
val strategy = OperationExecutorStrategyFactory.getStrategy(operations[0]::class.java)
val executor = OperationExecutor(strategy, operations, undo)
var reloadArea = false
if (event.isCustom && this is CustomBrush) {
this.perform(event.operations.stream().filter { o -> !o.isCancelled && o is CustomOperation }
Expand Down
2 changes: 1 addition & 1 deletion VoxelSniperCore/src/main/java/com/github/kevindagame/brush/BiomeBrush.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import com.github.kevindagame.snipe.SnipeData;
import com.github.kevindagame.util.Messages;
import com.github.kevindagame.util.VoxelMessage;
import com.github.kevindagame.util.brushOperation.BiomeOperation;
import com.github.kevindagame.util.brushOperation.operation.BiomeOperation;
import com.github.kevindagame.voxelsniper.biome.VoxelBiome;
import com.github.kevindagame.voxelsniper.location.BaseLocation;
import org.jetbrains.annotations.NotNull;
Expand Down
2 changes: 1 addition & 1 deletion VoxelSniperCore/src/main/java/com/github/kevindagame/brush/BlockResetBrush.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import com.github.kevindagame.snipe.SnipeData;
import com.github.kevindagame.util.Shapes;
import com.github.kevindagame.util.VoxelMessage;
import com.github.kevindagame.util.brushOperation.BlockOperation;
import com.github.kevindagame.util.brushOperation.operation.BlockOperation;
import com.github.kevindagame.voxelsniper.location.BaseLocation;
import com.github.kevindagame.voxelsniper.material.VoxelMaterial;

Expand Down
2 changes: 1 addition & 1 deletion VoxelSniperCore/src/main/java/com/github/kevindagame/brush/BlockResetSurfaceBrush.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import com.github.kevindagame.snipe.SnipeData;
import com.github.kevindagame.util.VoxelMessage;
import com.github.kevindagame.util.brushOperation.BlockOperation;
import com.github.kevindagame.util.brushOperation.operation.BlockOperation;
import com.github.kevindagame.voxelsniper.block.IBlock;
import com.github.kevindagame.voxelsniper.location.BaseLocation;
import com.github.kevindagame.voxelsniper.material.VoxelMaterial;
Expand Down
2 changes: 1 addition & 1 deletion VoxelSniperCore/src/main/java/com/github/kevindagame/brush/CleanSnowBrush.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import com.github.kevindagame.util.Shapes;
import com.github.kevindagame.util.Utils;
import com.github.kevindagame.util.VoxelMessage;
import com.github.kevindagame.util.brushOperation.BlockOperation;
import com.github.kevindagame.util.brushOperation.operation.BlockOperation;
import com.github.kevindagame.voxelsniper.block.BlockFace;
import com.github.kevindagame.voxelsniper.block.IBlock;
import com.github.kevindagame.voxelsniper.material.VoxelMaterial;
Expand Down
4 changes: 2 additions & 2 deletions VoxelSniperCore/src/main/java/com/github/kevindagame/brush/CometBrush.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
import com.github.kevindagame.util.Messages;
import com.github.kevindagame.util.Utils;
import com.github.kevindagame.util.VoxelMessage;
import com.github.kevindagame.util.brushOperation.CustomOperation;
import com.github.kevindagame.util.brushOperation.CustomOperationContext;
import com.github.kevindagame.util.brushOperation.operation.CustomOperation;
import com.github.kevindagame.util.brushOperation.operation.CustomOperationContext;
import com.github.kevindagame.voxelsniper.entity.entitytype.VoxelEntityType;
import com.github.kevindagame.voxelsniper.vector.VoxelVector;
import org.jetbrains.annotations.NotNull;
Expand Down
2 changes: 1 addition & 1 deletion VoxelSniperCore/src/main/java/com/github/kevindagame/brush/CustomBrush.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package com.github.kevindagame.brush

import com.github.kevindagame.snipe.SnipeData
import com.github.kevindagame.snipe.Undo
import com.github.kevindagame.util.brushOperation.CustomOperation
import com.github.kevindagame.util.brushOperation.operation.CustomOperation

abstract class CustomBrush : AbstractBrush() {
abstract fun perform(operations: List<CustomOperation>, snipeData: SnipeData, undo: Undo): Boolean
Expand Down
2 changes: 1 addition & 1 deletion VoxelSniperCore/src/main/java/com/github/kevindagame/brush/DrainBrush.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import com.github.kevindagame.snipe.SnipeData;
import com.github.kevindagame.util.*;
import com.github.kevindagame.util.brushOperation.BlockOperation;
import com.github.kevindagame.util.brushOperation.operation.BlockOperation;
import com.github.kevindagame.voxelsniper.blockdata.waterlogged.IWaterlogged;
import com.github.kevindagame.voxelsniper.material.VoxelMaterial;
import org.jetbrains.annotations.NotNull;
Expand Down
2 changes: 1 addition & 1 deletion VoxelSniperCore/src/main/java/com/github/kevindagame/brush/EntityBrush.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import com.github.kevindagame.snipe.SnipeData;
import com.github.kevindagame.util.Messages;
import com.github.kevindagame.util.VoxelMessage;
import com.github.kevindagame.util.brushOperation.EntitySpawnOperation;
import com.github.kevindagame.util.brushOperation.operation.EntitySpawnOperation;
import com.github.kevindagame.voxelsniper.entity.entitytype.VoxelEntityType;
import org.jetbrains.annotations.NotNull;

Expand Down
2 changes: 1 addition & 1 deletion VoxelSniperCore/src/main/java/com/github/kevindagame/brush/EntityRemovalBrush.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import com.github.kevindagame.util.Messages;
import com.github.kevindagame.util.Utils;
import com.github.kevindagame.util.VoxelMessage;
import com.github.kevindagame.util.brushOperation.EntityRemoveOperation;
import com.github.kevindagame.util.brushOperation.operation.EntityRemoveOperation;
import com.github.kevindagame.voxelsniper.chunk.IChunk;
import com.github.kevindagame.voxelsniper.entity.IEntity;
import com.github.kevindagame.voxelsniper.entity.entitytype.VoxelEntityType;
Expand Down
2 changes: 1 addition & 1 deletion VoxelSniperCore/src/main/java/com/github/kevindagame/brush/EraserBrush.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import com.github.kevindagame.snipe.SnipeData;
import com.github.kevindagame.util.Shapes;
import com.github.kevindagame.util.VoxelMessage;
import com.github.kevindagame.util.brushOperation.BlockOperation;
import com.github.kevindagame.util.brushOperation.operation.BlockOperation;
import com.github.kevindagame.voxelsniper.material.VoxelMaterial;

import java.util.List;
Expand Down
2 changes: 1 addition & 1 deletion VoxelSniperCore/src/main/java/com/github/kevindagame/brush/ErodeBrush.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import com.github.kevindagame.util.Messages;
import com.github.kevindagame.util.Utils;
import com.github.kevindagame.util.VoxelMessage;
import com.github.kevindagame.util.brushOperation.BlockOperation;
import com.github.kevindagame.util.brushOperation.operation.BlockOperation;
import com.github.kevindagame.voxelsniper.block.IBlock;
import com.github.kevindagame.voxelsniper.blockdata.IBlockData;
import com.github.kevindagame.voxelsniper.material.VoxelMaterial;
Expand Down
4 changes: 2 additions & 2 deletions VoxelSniperCore/src/main/java/com/github/kevindagame/brush/JockeyBrush.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
import com.github.kevindagame.util.Messages;
import com.github.kevindagame.util.Utils;
import com.github.kevindagame.util.VoxelMessage;
import com.github.kevindagame.util.brushOperation.CustomOperation;
import com.github.kevindagame.util.brushOperation.CustomOperationContext;
import com.github.kevindagame.util.brushOperation.operation.CustomOperation;
import com.github.kevindagame.util.brushOperation.operation.CustomOperationContext;
import com.github.kevindagame.voxelsniper.chunk.IChunk;
import com.github.kevindagame.voxelsniper.entity.IEntity;
import com.github.kevindagame.voxelsniper.entity.player.IPlayer;
Expand Down
4 changes: 2 additions & 2 deletions VoxelSniperCore/src/main/java/com/github/kevindagame/brush/LightningBrush.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
import com.github.kevindagame.snipe.Undo;
import com.github.kevindagame.util.Messages;
import com.github.kevindagame.util.VoxelMessage;
import com.github.kevindagame.util.brushOperation.CustomOperation;
import com.github.kevindagame.util.brushOperation.CustomOperationContext;
import com.github.kevindagame.util.brushOperation.operation.CustomOperation;
import com.github.kevindagame.util.brushOperation.operation.CustomOperationContext;

import java.util.List;

Expand Down
4 changes: 2 additions & 2 deletions VoxelSniperCore/src/main/java/com/github/kevindagame/brush/PaintingBrush.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
import com.github.kevindagame.snipe.Undo;
import com.github.kevindagame.util.BlockHelper;
import com.github.kevindagame.util.VoxelMessage;
import com.github.kevindagame.util.brushOperation.CustomOperation;
import com.github.kevindagame.util.brushOperation.CustomOperationContext;
import com.github.kevindagame.util.brushOperation.operation.CustomOperation;
import com.github.kevindagame.util.brushOperation.operation.CustomOperationContext;

import java.util.List;
import java.util.Objects;
Expand Down
4 changes: 2 additions & 2 deletions VoxelSniperCore/src/main/java/com/github/kevindagame/brush/RegenerateChunkBrush.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
import com.github.kevindagame.snipe.Undo;
import com.github.kevindagame.util.Messages;
import com.github.kevindagame.util.VoxelMessage;
import com.github.kevindagame.util.brushOperation.CustomOperation;
import com.github.kevindagame.util.brushOperation.CustomOperationContext;
import com.github.kevindagame.util.brushOperation.operation.CustomOperation;
import com.github.kevindagame.util.brushOperation.operation.CustomOperationContext;
import com.github.kevindagame.voxelsniper.chunk.IChunk;
import com.github.kevindagame.voxelsniper.location.BaseLocation;

Expand Down
4 changes: 2 additions & 2 deletions VoxelSniperCore/src/main/java/com/github/kevindagame/brush/RulerBrush.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
import com.github.kevindagame.snipe.Undo;
import com.github.kevindagame.util.Messages;
import com.github.kevindagame.util.VoxelMessage;
import com.github.kevindagame.util.brushOperation.CustomOperation;
import com.github.kevindagame.util.brushOperation.CustomOperationContext;
import com.github.kevindagame.util.brushOperation.operation.CustomOperation;
import com.github.kevindagame.util.brushOperation.operation.CustomOperationContext;
import com.github.kevindagame.voxelsniper.vector.VoxelVector;

import java.util.List;
Expand Down
4 changes: 2 additions & 2 deletions VoxelSniperCore/src/main/java/com/github/kevindagame/brush/ScannerBrush.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
import com.github.kevindagame.util.Messages;
import com.github.kevindagame.util.Utils;
import com.github.kevindagame.util.VoxelMessage;
import com.github.kevindagame.util.brushOperation.CustomOperation;
import com.github.kevindagame.util.brushOperation.CustomOperationContext;
import com.github.kevindagame.util.brushOperation.operation.CustomOperation;
import com.github.kevindagame.util.brushOperation.operation.CustomOperationContext;
import com.github.kevindagame.voxelsniper.block.BlockFace;
import com.github.kevindagame.voxelsniper.material.VoxelMaterial;

Expand Down
2 changes: 1 addition & 1 deletion VoxelSniperCore/src/main/java/com/github/kevindagame/brush/SchematicBrush.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package com.github.kevindagame.brush
import com.github.kevindagame.snipe.SnipeData
import com.github.kevindagame.util.Messages
import com.github.kevindagame.util.VoxelMessage
import com.github.kevindagame.util.brushOperation.BlockOperation
import com.github.kevindagame.util.brushOperation.operation.BlockOperation
import com.github.kevindagame.util.schematic.SchematicReader
import com.github.kevindagame.util.schematic.VoxelSchematic
import com.github.kevindagame.util.schematic.VoxelSchematicBlock
Expand Down
6 changes: 3 additions & 3 deletions VoxelSniperCore/src/main/java/com/github/kevindagame/brush/SignOverwriteBrush.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
import com.github.kevindagame.util.Messages;
import com.github.kevindagame.util.Utils;
import com.github.kevindagame.util.VoxelMessage;
import com.github.kevindagame.util.brushOperation.BlockStateOperation;
import com.github.kevindagame.util.brushOperation.CustomOperation;
import com.github.kevindagame.util.brushOperation.CustomOperationContext;
import com.github.kevindagame.util.brushOperation.operation.BlockStateOperation;
import com.github.kevindagame.util.brushOperation.operation.CustomOperation;
import com.github.kevindagame.util.brushOperation.operation.CustomOperationContext;
import com.github.kevindagame.voxelsniper.blockstate.IBlockState;
import com.github.kevindagame.voxelsniper.blockstate.sign.ISign;

Expand Down
2 changes: 1 addition & 1 deletion VoxelSniperCore/src/main/java/com/github/kevindagame/brush/StampBrush.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import com.github.kevindagame.util.BlockWrapper;
import com.github.kevindagame.util.Messages;
import com.github.kevindagame.util.VoxelMessage;
import com.github.kevindagame.util.brushOperation.BlockOperation;
import com.github.kevindagame.util.brushOperation.operation.BlockOperation;
import com.github.kevindagame.voxelsniper.block.IBlock;
import org.jetbrains.annotations.NotNull;

Expand Down
4 changes: 2 additions & 2 deletions VoxelSniperCore/src/main/java/com/github/kevindagame/brush/VoltMeterBrush.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
import com.github.kevindagame.snipe.Undo;
import com.github.kevindagame.util.Messages;
import com.github.kevindagame.util.VoxelMessage;
import com.github.kevindagame.util.brushOperation.CustomOperation;
import com.github.kevindagame.util.brushOperation.CustomOperationContext;
import com.github.kevindagame.util.brushOperation.operation.CustomOperation;
import com.github.kevindagame.util.brushOperation.operation.CustomOperationContext;
import com.github.kevindagame.voxelsniper.block.BlockFace;
import com.github.kevindagame.voxelsniper.blockdata.IBlockData;
import com.github.kevindagame.voxelsniper.blockdata.redstoneWire.IRedstoneWire;
Expand Down
2 changes: 1 addition & 1 deletion VoxelSniperCore/src/main/java/com/github/kevindagame/brush/multiBlock/CanyonBrush.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import com.github.kevindagame.util.Messages;
import com.github.kevindagame.util.Utils;
import com.github.kevindagame.util.VoxelMessage;
import com.github.kevindagame.util.brushOperation.BlockOperation;
import com.github.kevindagame.util.brushOperation.operation.BlockOperation;
import com.github.kevindagame.voxelsniper.block.IBlock;
import com.github.kevindagame.voxelsniper.chunk.IChunk;
import com.github.kevindagame.voxelsniper.material.VoxelMaterial;
Expand Down
2 changes: 1 addition & 1 deletion VoxelSniperCore/src/main/java/com/github/kevindagame/brush/multiBlock/CopyPastaBrush.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import com.github.kevindagame.util.Messages;
import com.github.kevindagame.util.Utils;
import com.github.kevindagame.util.VoxelMessage;
import com.github.kevindagame.util.brushOperation.BlockOperation;
import com.github.kevindagame.util.brushOperation.operation.BlockOperation;
import com.github.kevindagame.voxelsniper.block.IBlock;
import com.github.kevindagame.voxelsniper.blockdata.IBlockData;
import org.jetbrains.annotations.NotNull;
Expand Down
2 changes: 1 addition & 1 deletion VoxelSniperCore/src/main/java/com/github/kevindagame/brush/multiBlock/ExtrudeBrush.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import com.github.kevindagame.util.Messages;
import com.github.kevindagame.util.Utils;
import com.github.kevindagame.util.VoxelMessage;
import com.github.kevindagame.util.brushOperation.BlockOperation;
import com.github.kevindagame.util.brushOperation.operation.BlockOperation;
import com.github.kevindagame.voxelsniper.block.BlockFace;
import com.github.kevindagame.voxelsniper.block.IBlock;
import org.jetbrains.annotations.NotNull;
Expand Down
2 changes: 1 addition & 1 deletion VoxelSniperCore/src/main/java/com/github/kevindagame/brush/multiBlock/FlatOceanBrush.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import com.github.kevindagame.util.Messages;
import com.github.kevindagame.util.Utils;
import com.github.kevindagame.util.VoxelMessage;
import com.github.kevindagame.util.brushOperation.BlockOperation;
import com.github.kevindagame.util.brushOperation.operation.BlockOperation;
import com.github.kevindagame.voxelsniper.chunk.IChunk;
import com.github.kevindagame.voxelsniper.material.VoxelMaterial;
import org.jetbrains.annotations.NotNull;
Expand Down
2 changes: 1 addition & 1 deletion VoxelSniperCore/src/main/java/com/github/kevindagame/brush/multiBlock/GenerateTreeBrush.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import com.github.kevindagame.util.Messages;
import com.github.kevindagame.util.Utils;
import com.github.kevindagame.util.VoxelMessage;
import com.github.kevindagame.util.brushOperation.BlockOperation;
import com.github.kevindagame.util.brushOperation.operation.BlockOperation;
import com.github.kevindagame.voxelsniper.block.IBlock;
import com.github.kevindagame.voxelsniper.blockdata.leaves.ILeaves;
import com.github.kevindagame.voxelsniper.location.BaseLocation;
Expand Down
2 changes: 1 addition & 1 deletion VoxelSniperCore/src/main/java/com/github/kevindagame/brush/multiBlock/MoveBrush.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import com.github.kevindagame.util.Messages;
import com.github.kevindagame.util.Utils;
import com.github.kevindagame.util.VoxelMessage;
import com.github.kevindagame.util.brushOperation.BlockOperation;
import com.github.kevindagame.util.brushOperation.operation.BlockOperation;
import com.github.kevindagame.voxelsniper.location.BaseLocation;
import com.github.kevindagame.voxelsniper.location.VoxelLocation;
import com.github.kevindagame.voxelsniper.material.VoxelMaterial;
Expand Down
2 changes: 1 addition & 1 deletion VoxelSniperCore/src/main/java/com/github/kevindagame/brush/multiBlock/OceanBrush.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import com.github.kevindagame.util.Messages;
import com.github.kevindagame.util.Utils;
import com.github.kevindagame.util.VoxelMessage;
import com.github.kevindagame.util.brushOperation.BlockOperation;
import com.github.kevindagame.util.brushOperation.operation.BlockOperation;
import com.github.kevindagame.voxelsniper.block.IBlock;
import com.github.kevindagame.voxelsniper.material.VoxelMaterial;
import com.github.kevindagame.voxelsniper.world.IWorld;
Expand Down
2 changes: 1 addition & 1 deletion VoxelSniperCore/src/main/java/com/github/kevindagame/brush/multiBlock/PullBrush.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import com.github.kevindagame.util.Messages;
import com.github.kevindagame.util.Utils;
import com.github.kevindagame.util.VoxelMessage;
import com.github.kevindagame.util.brushOperation.BlockOperation;
import com.github.kevindagame.util.brushOperation.operation.BlockOperation;
import com.github.kevindagame.voxelsniper.block.IBlock;
import com.github.kevindagame.voxelsniper.blockdata.IBlockData;
import com.github.kevindagame.voxelsniper.material.VoxelMaterial;
Expand Down
4 changes: 2 additions & 2 deletions VoxelSniperCore/src/main/java/com/github/kevindagame/brush/perform/BasePerformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
import com.github.kevindagame.snipe.SnipeData;
import com.github.kevindagame.snipe.Undo;
import com.github.kevindagame.util.VoxelMessage;
import com.github.kevindagame.util.brushOperation.BlockOperation;
import com.github.kevindagame.util.brushOperation.BrushOperation;
import com.github.kevindagame.util.brushOperation.operation.BlockOperation;
import com.github.kevindagame.util.brushOperation.operation.BrushOperation;
import com.github.kevindagame.voxelsniper.block.IBlock;
import com.github.kevindagame.voxelsniper.location.BaseLocation;
import com.github.kevindagame.voxelsniper.world.IWorld;
Expand Down
2 changes: 1 addition & 1 deletion VoxelSniperCore/src/main/java/com/github/kevindagame/brush/perform/pCombo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import com.github.kevindagame.snipe.SnipeData;
import com.github.kevindagame.util.VoxelMessage;
import com.github.kevindagame.util.brushOperation.BlockOperation;
import com.github.kevindagame.util.brushOperation.operation.BlockOperation;
import com.github.kevindagame.voxelsniper.block.IBlock;
import com.github.kevindagame.voxelsniper.blockdata.IBlockData;

Expand Down
2 changes: 1 addition & 1 deletion VoxelSniperCore/src/main/java/com/github/kevindagame/brush/perform/pComboCombo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import com.github.kevindagame.snipe.SnipeData;
import com.github.kevindagame.util.VoxelMessage;
import com.github.kevindagame.util.brushOperation.BlockOperation;
import com.github.kevindagame.util.brushOperation.operation.BlockOperation;
import com.github.kevindagame.voxelsniper.block.IBlock;
import com.github.kevindagame.voxelsniper.blockdata.IBlockData;

Expand Down
2 changes: 1 addition & 1 deletion VoxelSniperCore/src/main/java/com/github/kevindagame/brush/perform/pComboComboNoPhysics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import com.github.kevindagame.snipe.SnipeData;
import com.github.kevindagame.util.VoxelMessage;
import com.github.kevindagame.util.brushOperation.BlockOperation;
import com.github.kevindagame.util.brushOperation.operation.BlockOperation;
import com.github.kevindagame.voxelsniper.block.IBlock;
import com.github.kevindagame.voxelsniper.blockdata.IBlockData;

Expand Down
2 changes: 1 addition & 1 deletion VoxelSniperCore/src/main/java/com/github/kevindagame/brush/perform/pComboMat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import com.github.kevindagame.snipe.SnipeData;
import com.github.kevindagame.util.VoxelMessage;
import com.github.kevindagame.util.brushOperation.BlockOperation;
import com.github.kevindagame.util.brushOperation.operation.BlockOperation;
import com.github.kevindagame.voxelsniper.block.IBlock;
import com.github.kevindagame.voxelsniper.blockdata.IBlockData;
import com.github.kevindagame.voxelsniper.material.VoxelMaterial;
Expand Down
2 changes: 1 addition & 1 deletion VoxelSniperCore/src/main/java/com/github/kevindagame/brush/perform/pComboMatNoPhysics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import com.github.kevindagame.snipe.SnipeData;
import com.github.kevindagame.util.VoxelMessage;
import com.github.kevindagame.util.brushOperation.BlockOperation;
import com.github.kevindagame.util.brushOperation.operation.BlockOperation;
import com.github.kevindagame.voxelsniper.block.IBlock;
import com.github.kevindagame.voxelsniper.blockdata.IBlockData;
import com.github.kevindagame.voxelsniper.material.VoxelMaterial;
Expand Down
2 changes: 1 addition & 1 deletion VoxelSniperCore/src/main/java/com/github/kevindagame/brush/perform/pComboNoPhysics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import com.github.kevindagame.snipe.SnipeData;
import com.github.kevindagame.util.VoxelMessage;
import com.github.kevindagame.util.brushOperation.BlockOperation;
import com.github.kevindagame.util.brushOperation.operation.BlockOperation;
import com.github.kevindagame.voxelsniper.block.IBlock;
import com.github.kevindagame.voxelsniper.blockdata.IBlockData;

Expand Down
2 changes: 1 addition & 1 deletion VoxelSniperCore/src/main/java/com/github/kevindagame/brush/perform/pExcludeCombo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import com.github.kevindagame.snipe.SnipeData;
import com.github.kevindagame.util.VoxelList;
import com.github.kevindagame.util.VoxelMessage;
import com.github.kevindagame.util.brushOperation.BlockOperation;
import com.github.kevindagame.util.brushOperation.operation.BlockOperation;
import com.github.kevindagame.voxelsniper.block.IBlock;
import com.github.kevindagame.voxelsniper.blockdata.IBlockData;

Expand Down
Loading