From 6089934ffded8582d029a0bc079f37354be0711c Mon Sep 17 00:00:00 2001 From: Richard Date: Thu, 24 Dec 2015 22:23:38 -0200 Subject: [PATCH] WorldEdit block change event, still in test. Also fixed package names. --- plugin.yml | 6 +- src/me/TheBukor/{ => SkStuff}/SkStuff.java | 154 +++++++++++------- .../conditions/CondSelectionContains.java | 2 +- .../{ => SkStuff}/effects/EffDrainLiquid.java | 2 +- .../{ => SkStuff}/effects/EffDrawLineWE.java | 4 +- .../effects/EffMakeCylinder.java | 2 +- .../{ => SkStuff}/effects/EffMakePyramid.java | 2 +- .../{ => SkStuff}/effects/EffMakeSphere.java | 2 +- .../{ => SkStuff}/effects/EffMakeWalls.java | 2 +- .../{ => SkStuff}/effects/EffNaturalize.java | 2 +- .../effects/EffRememberChanges.java | 2 +- .../effects/EffReplaceBlocksWE.java | 2 +- .../{ => SkStuff}/effects/EffSetBlocksWE.java | 2 +- .../effects/EffSimulateSnow.java | 2 +- .../effects/EffUndoRedoSession.java | 2 +- .../SkStuff/events/EvtWorldEditChange.java | 40 +++++ .../events/WorldEditChangeHandler.java | 24 +++ .../SkStuff/events/WorldEditExtent.java | 41 +++++ .../expressions/ExprAreaOfSchematic.java | 2 +- .../expressions/ExprAreaOfSelection.java | 2 +- .../expressions/ExprChangedBlocksSession.java | 2 +- .../expressions/ExprEditSessionLimit.java | 2 +- .../expressions/ExprFileNBTv1_8_R1.java | 2 +- .../expressions/ExprFileNBTv1_8_R2.java | 2 +- .../expressions/ExprFileNBTv1_8_R3.java | 2 +- .../expressions/ExprHeightOfSchematic.java | 2 +- .../expressions/ExprHeightOfSelection.java | 2 +- .../expressions/ExprItemNBTv1_7_R1.java | 2 +- .../expressions/ExprItemNBTv1_7_R2.java | 2 +- .../expressions/ExprItemNBTv1_7_R3.java | 2 +- .../expressions/ExprItemNBTv1_7_R4.java | 2 +- .../expressions/ExprItemNBTv1_8_R1.java | 2 +- .../expressions/ExprItemNBTv1_8_R2.java | 2 +- .../expressions/ExprItemNBTv1_8_R3.java | 2 +- .../expressions/ExprLengthOfSchematic.java | 2 +- .../expressions/ExprLengthOfSelection.java | 2 +- .../expressions/ExprNBTv1_7_R1.java | 2 +- .../expressions/ExprNBTv1_7_R2.java | 2 +- .../expressions/ExprNBTv1_7_R3.java | 2 +- .../expressions/ExprNBTv1_7_R4.java | 2 +- .../expressions/ExprNBTv1_8_R1.java | 2 +- .../expressions/ExprNBTv1_8_R2.java | 2 +- .../expressions/ExprNBTv1_8_R3.java | 2 +- .../expressions/ExprNewEditSession.java | 2 +- .../expressions/ExprSelectionOfPlayer.java | 2 +- .../expressions/ExprSelectionPos1.java | 2 +- .../expressions/ExprSelectionPos2.java | 2 +- .../expressions/ExprTagOfv1_7_R1.java | 2 +- .../expressions/ExprTagOfv1_7_R2.java | 2 +- .../expressions/ExprTagOfv1_7_R3.java | 2 +- .../expressions/ExprTagOfv1_7_R4.java | 2 +- .../expressions/ExprTagOfv1_8_R1.java | 2 +- .../expressions/ExprTagOfv1_8_R2.java | 2 +- .../expressions/ExprTagOfv1_8_R3.java | 2 +- .../expressions/ExprVolumeOfSchematic.java | 2 +- .../expressions/ExprVolumeOfSelection.java | 2 +- .../expressions/ExprWidthOfSchematic.java | 2 +- .../expressions/ExprWidthOfSelection.java | 2 +- 58 files changed, 261 insertions(+), 112 deletions(-) rename src/me/TheBukor/{ => SkStuff}/SkStuff.java (80%) rename src/me/TheBukor/{ => SkStuff}/conditions/CondSelectionContains.java (94%) rename src/me/TheBukor/{ => SkStuff}/effects/EffDrainLiquid.java (94%) rename src/me/TheBukor/{ => SkStuff}/effects/EffDrawLineWE.java (95%) rename src/me/TheBukor/{ => SkStuff}/effects/EffMakeCylinder.java (95%) rename src/me/TheBukor/{ => SkStuff}/effects/EffMakePyramid.java (95%) rename src/me/TheBukor/{ => SkStuff}/effects/EffMakeSphere.java (95%) rename src/me/TheBukor/{ => SkStuff}/effects/EffMakeWalls.java (95%) rename src/me/TheBukor/{ => SkStuff}/effects/EffNaturalize.java (94%) rename src/me/TheBukor/{ => SkStuff}/effects/EffRememberChanges.java (94%) rename src/me/TheBukor/{ => SkStuff}/effects/EffReplaceBlocksWE.java (96%) rename src/me/TheBukor/{ => SkStuff}/effects/EffSetBlocksWE.java (95%) rename src/me/TheBukor/{ => SkStuff}/effects/EffSimulateSnow.java (94%) rename src/me/TheBukor/{ => SkStuff}/effects/EffUndoRedoSession.java (93%) create mode 100644 src/me/TheBukor/SkStuff/events/EvtWorldEditChange.java create mode 100644 src/me/TheBukor/SkStuff/events/WorldEditChangeHandler.java create mode 100644 src/me/TheBukor/SkStuff/events/WorldEditExtent.java rename src/me/TheBukor/{ => SkStuff}/expressions/ExprAreaOfSchematic.java (94%) rename src/me/TheBukor/{ => SkStuff}/expressions/ExprAreaOfSelection.java (93%) rename src/me/TheBukor/{ => SkStuff}/expressions/ExprChangedBlocksSession.java (92%) rename src/me/TheBukor/{ => SkStuff}/expressions/ExprEditSessionLimit.java (94%) rename src/me/TheBukor/{ => SkStuff}/expressions/ExprFileNBTv1_8_R1.java (95%) rename src/me/TheBukor/{ => SkStuff}/expressions/ExprFileNBTv1_8_R2.java (95%) rename src/me/TheBukor/{ => SkStuff}/expressions/ExprFileNBTv1_8_R3.java (95%) rename src/me/TheBukor/{ => SkStuff}/expressions/ExprHeightOfSchematic.java (93%) rename src/me/TheBukor/{ => SkStuff}/expressions/ExprHeightOfSelection.java (93%) rename src/me/TheBukor/{ => SkStuff}/expressions/ExprItemNBTv1_7_R1.java (94%) rename src/me/TheBukor/{ => SkStuff}/expressions/ExprItemNBTv1_7_R2.java (94%) rename src/me/TheBukor/{ => SkStuff}/expressions/ExprItemNBTv1_7_R3.java (94%) rename src/me/TheBukor/{ => SkStuff}/expressions/ExprItemNBTv1_7_R4.java (94%) rename src/me/TheBukor/{ => SkStuff}/expressions/ExprItemNBTv1_8_R1.java (94%) rename src/me/TheBukor/{ => SkStuff}/expressions/ExprItemNBTv1_8_R2.java (94%) rename src/me/TheBukor/{ => SkStuff}/expressions/ExprItemNBTv1_8_R3.java (94%) rename src/me/TheBukor/{ => SkStuff}/expressions/ExprLengthOfSchematic.java (93%) rename src/me/TheBukor/{ => SkStuff}/expressions/ExprLengthOfSelection.java (93%) rename src/me/TheBukor/{ => SkStuff}/expressions/ExprNBTv1_7_R1.java (96%) rename src/me/TheBukor/{ => SkStuff}/expressions/ExprNBTv1_7_R2.java (96%) rename src/me/TheBukor/{ => SkStuff}/expressions/ExprNBTv1_7_R3.java (96%) rename src/me/TheBukor/{ => SkStuff}/expressions/ExprNBTv1_7_R4.java (96%) rename src/me/TheBukor/{ => SkStuff}/expressions/ExprNBTv1_8_R1.java (96%) rename src/me/TheBukor/{ => SkStuff}/expressions/ExprNBTv1_8_R2.java (96%) rename src/me/TheBukor/{ => SkStuff}/expressions/ExprNBTv1_8_R3.java (96%) rename src/me/TheBukor/{ => SkStuff}/expressions/ExprNewEditSession.java (94%) rename src/me/TheBukor/{ => SkStuff}/expressions/ExprSelectionOfPlayer.java (95%) rename src/me/TheBukor/{ => SkStuff}/expressions/ExprSelectionPos1.java (95%) rename src/me/TheBukor/{ => SkStuff}/expressions/ExprSelectionPos2.java (95%) rename src/me/TheBukor/{ => SkStuff}/expressions/ExprTagOfv1_7_R1.java (96%) rename src/me/TheBukor/{ => SkStuff}/expressions/ExprTagOfv1_7_R2.java (96%) rename src/me/TheBukor/{ => SkStuff}/expressions/ExprTagOfv1_7_R3.java (96%) rename src/me/TheBukor/{ => SkStuff}/expressions/ExprTagOfv1_7_R4.java (96%) rename src/me/TheBukor/{ => SkStuff}/expressions/ExprTagOfv1_8_R1.java (96%) rename src/me/TheBukor/{ => SkStuff}/expressions/ExprTagOfv1_8_R2.java (96%) rename src/me/TheBukor/{ => SkStuff}/expressions/ExprTagOfv1_8_R3.java (96%) rename src/me/TheBukor/{ => SkStuff}/expressions/ExprVolumeOfSchematic.java (93%) rename src/me/TheBukor/{ => SkStuff}/expressions/ExprVolumeOfSelection.java (93%) rename src/me/TheBukor/{ => SkStuff}/expressions/ExprWidthOfSchematic.java (93%) rename src/me/TheBukor/{ => SkStuff}/expressions/ExprWidthOfSelection.java (93%) diff --git a/plugin.yml b/plugin.yml index a0132a8..2a72415 100644 --- a/plugin.yml +++ b/plugin.yml @@ -1,6 +1,6 @@ name: SkStuff author: TheBukor description: A Skript addon which adds extra functionalities such as NBT and extended WorldEdit support. -version: 1.2.3 -main: me.TheBukor.SkStuff -softdepend: [Skript] \ No newline at end of file +version: 1.4 +main: me.TheBukor.SkStuff.SkStuff +softdepend: [Skript, WorldEdit] \ No newline at end of file diff --git a/src/me/TheBukor/SkStuff.java b/src/me/TheBukor/SkStuff/SkStuff.java similarity index 80% rename from src/me/TheBukor/SkStuff.java rename to src/me/TheBukor/SkStuff/SkStuff.java index 7f3e778..a8a4863 100644 --- a/src/me/TheBukor/SkStuff.java +++ b/src/me/TheBukor/SkStuff/SkStuff.java @@ -1,9 +1,11 @@ -package me.TheBukor; +package me.TheBukor.SkStuff; import javax.annotation.Nullable; import org.bukkit.Bukkit; import org.bukkit.Location; +import org.bukkit.block.Block; +import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; import org.bukkit.plugin.java.JavaPlugin; @@ -14,60 +16,65 @@ import ch.njol.skript.classes.ClassInfo; import ch.njol.skript.classes.Parser; import ch.njol.skript.lang.ExpressionType; import ch.njol.skript.lang.ParseContext; +import ch.njol.skript.lang.util.SimpleEvent; import ch.njol.skript.registrations.Classes; -import me.TheBukor.conditions.CondSelectionContains; -import me.TheBukor.effects.EffDrainLiquid; -import me.TheBukor.effects.EffDrawLineWE; -import me.TheBukor.effects.EffMakeCylinder; -import me.TheBukor.effects.EffMakePyramid; -import me.TheBukor.effects.EffMakeSphere; -import me.TheBukor.effects.EffMakeWalls; -import me.TheBukor.effects.EffNaturalize; -import me.TheBukor.effects.EffRememberChanges; -import me.TheBukor.effects.EffReplaceBlocksWE; -import me.TheBukor.effects.EffSetBlocksWE; -import me.TheBukor.effects.EffSimulateSnow; -import me.TheBukor.effects.EffUndoRedoSession; -import me.TheBukor.expressions.ExprAreaOfSchematic; -import me.TheBukor.expressions.ExprAreaOfSelection; -import me.TheBukor.expressions.ExprChangedBlocksSession; -import me.TheBukor.expressions.ExprEditSessionLimit; -import me.TheBukor.expressions.ExprFileNBTv1_8_R1; -import me.TheBukor.expressions.ExprFileNBTv1_8_R2; -import me.TheBukor.expressions.ExprFileNBTv1_8_R3; -import me.TheBukor.expressions.ExprHeightOfSchematic; -import me.TheBukor.expressions.ExprHeightOfSelection; -import me.TheBukor.expressions.ExprItemNBTv1_7_R1; -import me.TheBukor.expressions.ExprItemNBTv1_7_R2; -import me.TheBukor.expressions.ExprItemNBTv1_7_R3; -import me.TheBukor.expressions.ExprItemNBTv1_7_R4; -import me.TheBukor.expressions.ExprItemNBTv1_8_R1; -import me.TheBukor.expressions.ExprItemNBTv1_8_R2; -import me.TheBukor.expressions.ExprItemNBTv1_8_R3; -import me.TheBukor.expressions.ExprLengthOfSchematic; -import me.TheBukor.expressions.ExprLengthOfSelection; -import me.TheBukor.expressions.ExprNBTv1_7_R1; -import me.TheBukor.expressions.ExprNBTv1_7_R2; -import me.TheBukor.expressions.ExprNBTv1_7_R3; -import me.TheBukor.expressions.ExprNBTv1_7_R4; -import me.TheBukor.expressions.ExprNBTv1_8_R1; -import me.TheBukor.expressions.ExprNBTv1_8_R2; -import me.TheBukor.expressions.ExprNBTv1_8_R3; -import me.TheBukor.expressions.ExprNewEditSession; -import me.TheBukor.expressions.ExprSelectionOfPlayer; -import me.TheBukor.expressions.ExprSelectionPos1; -import me.TheBukor.expressions.ExprSelectionPos2; -import me.TheBukor.expressions.ExprTagOfv1_7_R1; -import me.TheBukor.expressions.ExprTagOfv1_7_R2; -import me.TheBukor.expressions.ExprTagOfv1_7_R3; -import me.TheBukor.expressions.ExprTagOfv1_7_R4; -import me.TheBukor.expressions.ExprTagOfv1_8_R1; -import me.TheBukor.expressions.ExprTagOfv1_8_R2; -import me.TheBukor.expressions.ExprTagOfv1_8_R3; -import me.TheBukor.expressions.ExprVolumeOfSchematic; -import me.TheBukor.expressions.ExprVolumeOfSelection; -import me.TheBukor.expressions.ExprWidthOfSchematic; -import me.TheBukor.expressions.ExprWidthOfSelection; +import ch.njol.skript.registrations.EventValues; +import ch.njol.skript.util.Getter; +import me.TheBukor.SkStuff.conditions.CondSelectionContains; +import me.TheBukor.SkStuff.effects.EffDrainLiquid; +import me.TheBukor.SkStuff.effects.EffDrawLineWE; +import me.TheBukor.SkStuff.effects.EffMakeCylinder; +import me.TheBukor.SkStuff.effects.EffMakePyramid; +import me.TheBukor.SkStuff.effects.EffMakeSphere; +import me.TheBukor.SkStuff.effects.EffMakeWalls; +import me.TheBukor.SkStuff.effects.EffNaturalize; +import me.TheBukor.SkStuff.effects.EffRememberChanges; +import me.TheBukor.SkStuff.effects.EffReplaceBlocksWE; +import me.TheBukor.SkStuff.effects.EffSetBlocksWE; +import me.TheBukor.SkStuff.effects.EffSimulateSnow; +import me.TheBukor.SkStuff.effects.EffUndoRedoSession; +import me.TheBukor.SkStuff.events.EvtWorldEditChange; +import me.TheBukor.SkStuff.events.WorldEditChangeHandler; +import me.TheBukor.SkStuff.expressions.ExprAreaOfSchematic; +import me.TheBukor.SkStuff.expressions.ExprAreaOfSelection; +import me.TheBukor.SkStuff.expressions.ExprChangedBlocksSession; +import me.TheBukor.SkStuff.expressions.ExprEditSessionLimit; +import me.TheBukor.SkStuff.expressions.ExprFileNBTv1_8_R1; +import me.TheBukor.SkStuff.expressions.ExprFileNBTv1_8_R2; +import me.TheBukor.SkStuff.expressions.ExprFileNBTv1_8_R3; +import me.TheBukor.SkStuff.expressions.ExprHeightOfSchematic; +import me.TheBukor.SkStuff.expressions.ExprHeightOfSelection; +import me.TheBukor.SkStuff.expressions.ExprItemNBTv1_7_R1; +import me.TheBukor.SkStuff.expressions.ExprItemNBTv1_7_R2; +import me.TheBukor.SkStuff.expressions.ExprItemNBTv1_7_R3; +import me.TheBukor.SkStuff.expressions.ExprItemNBTv1_7_R4; +import me.TheBukor.SkStuff.expressions.ExprItemNBTv1_8_R1; +import me.TheBukor.SkStuff.expressions.ExprItemNBTv1_8_R2; +import me.TheBukor.SkStuff.expressions.ExprItemNBTv1_8_R3; +import me.TheBukor.SkStuff.expressions.ExprLengthOfSchematic; +import me.TheBukor.SkStuff.expressions.ExprLengthOfSelection; +import me.TheBukor.SkStuff.expressions.ExprNBTv1_7_R1; +import me.TheBukor.SkStuff.expressions.ExprNBTv1_7_R2; +import me.TheBukor.SkStuff.expressions.ExprNBTv1_7_R3; +import me.TheBukor.SkStuff.expressions.ExprNBTv1_7_R4; +import me.TheBukor.SkStuff.expressions.ExprNBTv1_8_R1; +import me.TheBukor.SkStuff.expressions.ExprNBTv1_8_R2; +import me.TheBukor.SkStuff.expressions.ExprNBTv1_8_R3; +import me.TheBukor.SkStuff.expressions.ExprNewEditSession; +import me.TheBukor.SkStuff.expressions.ExprSelectionOfPlayer; +import me.TheBukor.SkStuff.expressions.ExprSelectionPos1; +import me.TheBukor.SkStuff.expressions.ExprSelectionPos2; +import me.TheBukor.SkStuff.expressions.ExprTagOfv1_7_R1; +import me.TheBukor.SkStuff.expressions.ExprTagOfv1_7_R2; +import me.TheBukor.SkStuff.expressions.ExprTagOfv1_7_R3; +import me.TheBukor.SkStuff.expressions.ExprTagOfv1_7_R4; +import me.TheBukor.SkStuff.expressions.ExprTagOfv1_8_R1; +import me.TheBukor.SkStuff.expressions.ExprTagOfv1_8_R2; +import me.TheBukor.SkStuff.expressions.ExprTagOfv1_8_R3; +import me.TheBukor.SkStuff.expressions.ExprVolumeOfSchematic; +import me.TheBukor.SkStuff.expressions.ExprVolumeOfSelection; +import me.TheBukor.SkStuff.expressions.ExprWidthOfSchematic; +import me.TheBukor.SkStuff.expressions.ExprWidthOfSelection; import net.minecraft.server.v1_8_R1.MojangsonParser; import net.minecraft.server.v1_8_R1.NBTTagCompound; import net.minecraft.server.v1_8_R2.MojangsonParseException; @@ -77,6 +84,7 @@ public class SkStuff extends JavaPlugin { private int exprAmount = 0; private int typeAmount = 0; private int effAmount = 0; + private boolean evtWE = false; public void onEnable() { if (Bukkit.getPluginManager().getPlugin("Skript") != null) { @@ -418,8 +426,44 @@ public class SkStuff extends JavaPlugin { Skript.registerExpression(ExprLengthOfSchematic.class, Integer.class, ExpressionType.SIMPLE, "(z( |-)size|length) of schem[atic] [from] %string%"); Skript.registerExpression(ExprAreaOfSchematic.class, Integer.class, ExpressionType.SIMPLE, "area of schem[atic] [from] %string%"); Classes.registerClass(new ClassInfo(EditSession.class, "editsession").name("Edit Session").user("edit ?sessions?")); + try { + Class.forName("com.sk89q.worldedit.extent.logging.AbstractLoggingExtent"); + new WorldEditChangeHandler(); + Skript.registerEvent("WorldEdit block change", SimpleEvent.class, EvtWorldEditChange.class, "world[ ]edit [block] (chang(e|ing)|edit[ing])"); + EventValues.registerEventValue(EvtWorldEditChange.class, Player.class, new Getter() { + @Override + @Nullable + public Player get(EvtWorldEditChange e) { + return EvtWorldEditChange.getPlayer(); + } + }, 0); + EventValues.registerEventValue(EvtWorldEditChange.class, Block.class, new Getter() { + @Override + @Nullable + public Block get(EvtWorldEditChange e) { + return EvtWorldEditChange.getBlock(); + } + }, -1); + EventValues.registerEventValue(EvtWorldEditChange.class, Block.class, new Getter() { + @Override + @Nullable + public Block get(EvtWorldEditChange e) { + return EvtWorldEditChange.getBlock(); + } + }, 0); + EventValues.registerEventValue(EvtWorldEditChange.class, Block.class, new Getter() { + @Override + @Nullable + public Block get(EvtWorldEditChange e) { + return EvtWorldEditChange.getFutureBlock(); + } + }, 1); + evtWE = true; + } catch (ClassNotFoundException ex) { + Skript.error("Unable to register \"On WorldEdit block change\" event! You will need to upgrade to WorldEdit 6.0"); + } } - getLogger().info("Everything ready! Loaded a total of " + condAmount + (condAmount == 1 ? " condition, " : " conditions, ") + effAmount + (effAmount == 1 ? " effect, " : " effects, ") + exprAmount + (exprAmount == 1 ? " expression" : " expressions and ") + typeAmount + (typeAmount == 1 ? " type!" : " types!")); + getLogger().info("Everything ready! Loaded a total of " + condAmount + (condAmount == 1 ? " condition, " : " conditions, ") + effAmount + (effAmount == 1 ? " effect, " : " effects, ") + (evtWE ? "1 event, " : "") + exprAmount + (exprAmount == 1 ? " expression" : " expressions and ") + typeAmount + (typeAmount == 1 ? " type!" : " types!")); } else { getLogger().info("Unable to find Skript, disabling SkStuff..."); Bukkit.getPluginManager().disablePlugin(this);; diff --git a/src/me/TheBukor/conditions/CondSelectionContains.java b/src/me/TheBukor/SkStuff/conditions/CondSelectionContains.java similarity index 94% rename from src/me/TheBukor/conditions/CondSelectionContains.java rename to src/me/TheBukor/SkStuff/conditions/CondSelectionContains.java index 5f31926..b7c6dc8 100644 --- a/src/me/TheBukor/conditions/CondSelectionContains.java +++ b/src/me/TheBukor/SkStuff/conditions/CondSelectionContains.java @@ -1,4 +1,4 @@ -package me.TheBukor.conditions; +package me.TheBukor.SkStuff.conditions; import org.bukkit.Bukkit; import org.bukkit.Location; diff --git a/src/me/TheBukor/effects/EffDrainLiquid.java b/src/me/TheBukor/SkStuff/effects/EffDrainLiquid.java similarity index 94% rename from src/me/TheBukor/effects/EffDrainLiquid.java rename to src/me/TheBukor/SkStuff/effects/EffDrainLiquid.java index 6193a27..2bec4b3 100644 --- a/src/me/TheBukor/effects/EffDrainLiquid.java +++ b/src/me/TheBukor/SkStuff/effects/EffDrainLiquid.java @@ -1,4 +1,4 @@ -package me.TheBukor.effects; +package me.TheBukor.SkStuff.effects; import javax.annotation.Nullable; diff --git a/src/me/TheBukor/effects/EffDrawLineWE.java b/src/me/TheBukor/SkStuff/effects/EffDrawLineWE.java similarity index 95% rename from src/me/TheBukor/effects/EffDrawLineWE.java rename to src/me/TheBukor/SkStuff/effects/EffDrawLineWE.java index c6edcff..9b81681 100644 --- a/src/me/TheBukor/effects/EffDrawLineWE.java +++ b/src/me/TheBukor/SkStuff/effects/EffDrawLineWE.java @@ -1,4 +1,4 @@ -package me.TheBukor.effects; +package me.TheBukor.SkStuff.effects; import javax.annotation.Nullable; @@ -66,4 +66,4 @@ public class EffDrawLineWE extends Effect { return; } } -} +} \ No newline at end of file diff --git a/src/me/TheBukor/effects/EffMakeCylinder.java b/src/me/TheBukor/SkStuff/effects/EffMakeCylinder.java similarity index 95% rename from src/me/TheBukor/effects/EffMakeCylinder.java rename to src/me/TheBukor/SkStuff/effects/EffMakeCylinder.java index abc4b49..6a75ee7 100644 --- a/src/me/TheBukor/effects/EffMakeCylinder.java +++ b/src/me/TheBukor/SkStuff/effects/EffMakeCylinder.java @@ -1,4 +1,4 @@ -package me.TheBukor.effects; +package me.TheBukor.SkStuff.effects; import javax.annotation.Nullable; diff --git a/src/me/TheBukor/effects/EffMakePyramid.java b/src/me/TheBukor/SkStuff/effects/EffMakePyramid.java similarity index 95% rename from src/me/TheBukor/effects/EffMakePyramid.java rename to src/me/TheBukor/SkStuff/effects/EffMakePyramid.java index 47b7718..822baca 100644 --- a/src/me/TheBukor/effects/EffMakePyramid.java +++ b/src/me/TheBukor/SkStuff/effects/EffMakePyramid.java @@ -1,4 +1,4 @@ -package me.TheBukor.effects; +package me.TheBukor.SkStuff.effects; import javax.annotation.Nullable; diff --git a/src/me/TheBukor/effects/EffMakeSphere.java b/src/me/TheBukor/SkStuff/effects/EffMakeSphere.java similarity index 95% rename from src/me/TheBukor/effects/EffMakeSphere.java rename to src/me/TheBukor/SkStuff/effects/EffMakeSphere.java index 77c9a64..a1e1698 100644 --- a/src/me/TheBukor/effects/EffMakeSphere.java +++ b/src/me/TheBukor/SkStuff/effects/EffMakeSphere.java @@ -1,4 +1,4 @@ -package me.TheBukor.effects; +package me.TheBukor.SkStuff.effects; import javax.annotation.Nullable; diff --git a/src/me/TheBukor/effects/EffMakeWalls.java b/src/me/TheBukor/SkStuff/effects/EffMakeWalls.java similarity index 95% rename from src/me/TheBukor/effects/EffMakeWalls.java rename to src/me/TheBukor/SkStuff/effects/EffMakeWalls.java index 16f13e5..82392dc 100644 --- a/src/me/TheBukor/effects/EffMakeWalls.java +++ b/src/me/TheBukor/SkStuff/effects/EffMakeWalls.java @@ -1,4 +1,4 @@ -package me.TheBukor.effects; +package me.TheBukor.SkStuff.effects; import javax.annotation.Nullable; diff --git a/src/me/TheBukor/effects/EffNaturalize.java b/src/me/TheBukor/SkStuff/effects/EffNaturalize.java similarity index 94% rename from src/me/TheBukor/effects/EffNaturalize.java rename to src/me/TheBukor/SkStuff/effects/EffNaturalize.java index 66f7653..24b3fa9 100644 --- a/src/me/TheBukor/effects/EffNaturalize.java +++ b/src/me/TheBukor/SkStuff/effects/EffNaturalize.java @@ -1,4 +1,4 @@ -package me.TheBukor.effects; +package me.TheBukor.SkStuff.effects; import javax.annotation.Nullable; diff --git a/src/me/TheBukor/effects/EffRememberChanges.java b/src/me/TheBukor/SkStuff/effects/EffRememberChanges.java similarity index 94% rename from src/me/TheBukor/effects/EffRememberChanges.java rename to src/me/TheBukor/SkStuff/effects/EffRememberChanges.java index 4a06c9f..91fd7d1 100644 --- a/src/me/TheBukor/effects/EffRememberChanges.java +++ b/src/me/TheBukor/SkStuff/effects/EffRememberChanges.java @@ -1,4 +1,4 @@ -package me.TheBukor.effects; +package me.TheBukor.SkStuff.effects; import javax.annotation.Nullable; diff --git a/src/me/TheBukor/effects/EffReplaceBlocksWE.java b/src/me/TheBukor/SkStuff/effects/EffReplaceBlocksWE.java similarity index 96% rename from src/me/TheBukor/effects/EffReplaceBlocksWE.java rename to src/me/TheBukor/SkStuff/effects/EffReplaceBlocksWE.java index 15fc124..5859f30 100644 --- a/src/me/TheBukor/effects/EffReplaceBlocksWE.java +++ b/src/me/TheBukor/SkStuff/effects/EffReplaceBlocksWE.java @@ -1,4 +1,4 @@ -package me.TheBukor.effects; +package me.TheBukor.SkStuff.effects; import java.util.HashSet; import java.util.Set; diff --git a/src/me/TheBukor/effects/EffSetBlocksWE.java b/src/me/TheBukor/SkStuff/effects/EffSetBlocksWE.java similarity index 95% rename from src/me/TheBukor/effects/EffSetBlocksWE.java rename to src/me/TheBukor/SkStuff/effects/EffSetBlocksWE.java index d9b241f..587f2c2 100644 --- a/src/me/TheBukor/effects/EffSetBlocksWE.java +++ b/src/me/TheBukor/SkStuff/effects/EffSetBlocksWE.java @@ -1,4 +1,4 @@ -package me.TheBukor.effects; +package me.TheBukor.SkStuff.effects; import javax.annotation.Nullable; diff --git a/src/me/TheBukor/effects/EffSimulateSnow.java b/src/me/TheBukor/SkStuff/effects/EffSimulateSnow.java similarity index 94% rename from src/me/TheBukor/effects/EffSimulateSnow.java rename to src/me/TheBukor/SkStuff/effects/EffSimulateSnow.java index a1ab205..0b9b045 100644 --- a/src/me/TheBukor/effects/EffSimulateSnow.java +++ b/src/me/TheBukor/SkStuff/effects/EffSimulateSnow.java @@ -1,4 +1,4 @@ -package me.TheBukor.effects; +package me.TheBukor.SkStuff.effects; import javax.annotation.Nullable; diff --git a/src/me/TheBukor/effects/EffUndoRedoSession.java b/src/me/TheBukor/SkStuff/effects/EffUndoRedoSession.java similarity index 93% rename from src/me/TheBukor/effects/EffUndoRedoSession.java rename to src/me/TheBukor/SkStuff/effects/EffUndoRedoSession.java index 16ba629..2ceff99 100644 --- a/src/me/TheBukor/effects/EffUndoRedoSession.java +++ b/src/me/TheBukor/SkStuff/effects/EffUndoRedoSession.java @@ -1,4 +1,4 @@ -package me.TheBukor.effects; +package me.TheBukor.SkStuff.effects; import javax.annotation.Nullable; diff --git a/src/me/TheBukor/SkStuff/events/EvtWorldEditChange.java b/src/me/TheBukor/SkStuff/events/EvtWorldEditChange.java new file mode 100644 index 0000000..75d21cc --- /dev/null +++ b/src/me/TheBukor/SkStuff/events/EvtWorldEditChange.java @@ -0,0 +1,40 @@ +package me.TheBukor.SkStuff.events; + +import org.bukkit.block.Block; +import org.bukkit.entity.Player; +import org.bukkit.event.Event; +import org.bukkit.event.HandlerList; + +public class EvtWorldEditChange extends Event { + static Player player; + static Block block; + static Block futureBlock; + + public EvtWorldEditChange(Player player, Block block, Block futureBlock) { + EvtWorldEditChange.player = player; + EvtWorldEditChange.block = block; + EvtWorldEditChange.futureBlock = futureBlock; + } + + public static Player getPlayer() { + return player; + } + + public static Block getBlock() { + return block; + } + + public static Block getFutureBlock() { + return futureBlock; + } + + private static final HandlerList handlers = new HandlerList(); + + public HandlerList getHandlers() { + return handlers; + } + + public static HandlerList getHandlerList() { + return handlers; + } +} \ No newline at end of file diff --git a/src/me/TheBukor/SkStuff/events/WorldEditChangeHandler.java b/src/me/TheBukor/SkStuff/events/WorldEditChangeHandler.java new file mode 100644 index 0000000..019e18c --- /dev/null +++ b/src/me/TheBukor/SkStuff/events/WorldEditChangeHandler.java @@ -0,0 +1,24 @@ +package me.TheBukor.SkStuff.events; + +import com.sk89q.worldedit.WorldEdit; +import com.sk89q.worldedit.bukkit.BukkitWorld; +import com.sk89q.worldedit.event.extent.EditSessionEvent; +import com.sk89q.worldedit.extension.platform.Actor; +import com.sk89q.worldedit.util.eventbus.Subscribe; +import com.sk89q.worldedit.world.World; + +public class WorldEditChangeHandler { + + public WorldEditChangeHandler() { + WorldEdit.getInstance().getEventBus().register(this); + } + + @Subscribe + public void wrapForLogging(EditSessionEvent event) { + Actor actor = event.getActor(); + World world = event.getWorld(); + if (world instanceof BukkitWorld) { + event.setExtent(new WorldEditExtent(actor, world, event.getExtent())); + } + } +} \ No newline at end of file diff --git a/src/me/TheBukor/SkStuff/events/WorldEditExtent.java b/src/me/TheBukor/SkStuff/events/WorldEditExtent.java new file mode 100644 index 0000000..a37a78a --- /dev/null +++ b/src/me/TheBukor/SkStuff/events/WorldEditExtent.java @@ -0,0 +1,41 @@ +package me.TheBukor.SkStuff.events; + +import org.bukkit.Bukkit; +import org.bukkit.World; +import org.bukkit.block.Block; +import org.bukkit.entity.Player; + +import com.sk89q.worldedit.Vector; +import com.sk89q.worldedit.blocks.BaseBlock; +import com.sk89q.worldedit.bukkit.BukkitUtil; +import com.sk89q.worldedit.bukkit.BukkitWorld; +import com.sk89q.worldedit.extension.platform.Actor; +import com.sk89q.worldedit.extent.Extent; +import com.sk89q.worldedit.extent.logging.AbstractLoggingExtent; + +import me.TheBukor.SkStuff.SkStuff; + +public class WorldEditExtent extends AbstractLoggingExtent { + + private final Actor actor; + private final World world; + + public WorldEditExtent(Actor actor, com.sk89q.worldedit.world.World weWorld, Extent extent) { + super(extent); + this.actor = actor; + this.world = ((BukkitWorld) weWorld).getWorld(); + } + + @Override + protected void onBlockChange(final Vector vec, BaseBlock baseBlock) { + final Block b = BukkitUtil.toLocation(world, vec).getBlock(); + final Player p = Bukkit.getPlayerExact(actor.getName()); + Bukkit.getScheduler().scheduleSyncDelayedTask(new SkStuff(), new Runnable() { + @Override + public void run() { + Block futureB = BukkitUtil.toLocation(world, vec).getBlock(); + Bukkit.getPluginManager().callEvent(new EvtWorldEditChange(p, b, futureB)); + } + }, 1L); + } +} \ No newline at end of file diff --git a/src/me/TheBukor/expressions/ExprAreaOfSchematic.java b/src/me/TheBukor/SkStuff/expressions/ExprAreaOfSchematic.java similarity index 94% rename from src/me/TheBukor/expressions/ExprAreaOfSchematic.java rename to src/me/TheBukor/SkStuff/expressions/ExprAreaOfSchematic.java index c22f5db..1464068 100644 --- a/src/me/TheBukor/expressions/ExprAreaOfSchematic.java +++ b/src/me/TheBukor/SkStuff/expressions/ExprAreaOfSchematic.java @@ -1,4 +1,4 @@ -package me.TheBukor.expressions; +package me.TheBukor.SkStuff.expressions; import java.io.File; import java.io.IOException; diff --git a/src/me/TheBukor/expressions/ExprAreaOfSelection.java b/src/me/TheBukor/SkStuff/expressions/ExprAreaOfSelection.java similarity index 93% rename from src/me/TheBukor/expressions/ExprAreaOfSelection.java rename to src/me/TheBukor/SkStuff/expressions/ExprAreaOfSelection.java index aacfd32..fe96939 100644 --- a/src/me/TheBukor/expressions/ExprAreaOfSelection.java +++ b/src/me/TheBukor/SkStuff/expressions/ExprAreaOfSelection.java @@ -1,4 +1,4 @@ -package me.TheBukor.expressions; +package me.TheBukor.SkStuff.expressions; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/src/me/TheBukor/expressions/ExprChangedBlocksSession.java b/src/me/TheBukor/SkStuff/expressions/ExprChangedBlocksSession.java similarity index 92% rename from src/me/TheBukor/expressions/ExprChangedBlocksSession.java rename to src/me/TheBukor/SkStuff/expressions/ExprChangedBlocksSession.java index a070a43..b329b61 100644 --- a/src/me/TheBukor/expressions/ExprChangedBlocksSession.java +++ b/src/me/TheBukor/SkStuff/expressions/ExprChangedBlocksSession.java @@ -1,4 +1,4 @@ -package me.TheBukor.expressions; +package me.TheBukor.SkStuff.expressions; import javax.annotation.Nullable; diff --git a/src/me/TheBukor/expressions/ExprEditSessionLimit.java b/src/me/TheBukor/SkStuff/expressions/ExprEditSessionLimit.java similarity index 94% rename from src/me/TheBukor/expressions/ExprEditSessionLimit.java rename to src/me/TheBukor/SkStuff/expressions/ExprEditSessionLimit.java index 0491bd3..e8eb951 100644 --- a/src/me/TheBukor/expressions/ExprEditSessionLimit.java +++ b/src/me/TheBukor/SkStuff/expressions/ExprEditSessionLimit.java @@ -1,4 +1,4 @@ -package me.TheBukor.expressions; +package me.TheBukor.SkStuff.expressions; import javax.annotation.Nullable; diff --git a/src/me/TheBukor/expressions/ExprFileNBTv1_8_R1.java b/src/me/TheBukor/SkStuff/expressions/ExprFileNBTv1_8_R1.java similarity index 95% rename from src/me/TheBukor/expressions/ExprFileNBTv1_8_R1.java rename to src/me/TheBukor/SkStuff/expressions/ExprFileNBTv1_8_R1.java index 967613e..7938ad6 100644 --- a/src/me/TheBukor/expressions/ExprFileNBTv1_8_R1.java +++ b/src/me/TheBukor/SkStuff/expressions/ExprFileNBTv1_8_R1.java @@ -1,4 +1,4 @@ -package me.TheBukor.expressions; +package me.TheBukor.SkStuff.expressions; import java.io.EOFException; import java.io.File; diff --git a/src/me/TheBukor/expressions/ExprFileNBTv1_8_R2.java b/src/me/TheBukor/SkStuff/expressions/ExprFileNBTv1_8_R2.java similarity index 95% rename from src/me/TheBukor/expressions/ExprFileNBTv1_8_R2.java rename to src/me/TheBukor/SkStuff/expressions/ExprFileNBTv1_8_R2.java index 6e36685..79293e2 100644 --- a/src/me/TheBukor/expressions/ExprFileNBTv1_8_R2.java +++ b/src/me/TheBukor/SkStuff/expressions/ExprFileNBTv1_8_R2.java @@ -1,4 +1,4 @@ -package me.TheBukor.expressions; +package me.TheBukor.SkStuff.expressions; import java.io.EOFException; import java.io.File; diff --git a/src/me/TheBukor/expressions/ExprFileNBTv1_8_R3.java b/src/me/TheBukor/SkStuff/expressions/ExprFileNBTv1_8_R3.java similarity index 95% rename from src/me/TheBukor/expressions/ExprFileNBTv1_8_R3.java rename to src/me/TheBukor/SkStuff/expressions/ExprFileNBTv1_8_R3.java index 5209cf2..eca1e9b 100644 --- a/src/me/TheBukor/expressions/ExprFileNBTv1_8_R3.java +++ b/src/me/TheBukor/SkStuff/expressions/ExprFileNBTv1_8_R3.java @@ -1,4 +1,4 @@ -package me.TheBukor.expressions; +package me.TheBukor.SkStuff.expressions; import java.io.EOFException; import java.io.File; diff --git a/src/me/TheBukor/expressions/ExprHeightOfSchematic.java b/src/me/TheBukor/SkStuff/expressions/ExprHeightOfSchematic.java similarity index 93% rename from src/me/TheBukor/expressions/ExprHeightOfSchematic.java rename to src/me/TheBukor/SkStuff/expressions/ExprHeightOfSchematic.java index 31aadd8..70ab12b 100644 --- a/src/me/TheBukor/expressions/ExprHeightOfSchematic.java +++ b/src/me/TheBukor/SkStuff/expressions/ExprHeightOfSchematic.java @@ -1,4 +1,4 @@ -package me.TheBukor.expressions; +package me.TheBukor.SkStuff.expressions; import java.io.File; import java.io.IOException; diff --git a/src/me/TheBukor/expressions/ExprHeightOfSelection.java b/src/me/TheBukor/SkStuff/expressions/ExprHeightOfSelection.java similarity index 93% rename from src/me/TheBukor/expressions/ExprHeightOfSelection.java rename to src/me/TheBukor/SkStuff/expressions/ExprHeightOfSelection.java index ce38e14..36bc28b 100644 --- a/src/me/TheBukor/expressions/ExprHeightOfSelection.java +++ b/src/me/TheBukor/SkStuff/expressions/ExprHeightOfSelection.java @@ -1,4 +1,4 @@ -package me.TheBukor.expressions; +package me.TheBukor.SkStuff.expressions; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/src/me/TheBukor/expressions/ExprItemNBTv1_7_R1.java b/src/me/TheBukor/SkStuff/expressions/ExprItemNBTv1_7_R1.java similarity index 94% rename from src/me/TheBukor/expressions/ExprItemNBTv1_7_R1.java rename to src/me/TheBukor/SkStuff/expressions/ExprItemNBTv1_7_R1.java index b8d0c35..35c7dcd 100644 --- a/src/me/TheBukor/expressions/ExprItemNBTv1_7_R1.java +++ b/src/me/TheBukor/SkStuff/expressions/ExprItemNBTv1_7_R1.java @@ -1,4 +1,4 @@ -package me.TheBukor.expressions; +package me.TheBukor.SkStuff.expressions; import javax.annotation.Nullable; diff --git a/src/me/TheBukor/expressions/ExprItemNBTv1_7_R2.java b/src/me/TheBukor/SkStuff/expressions/ExprItemNBTv1_7_R2.java similarity index 94% rename from src/me/TheBukor/expressions/ExprItemNBTv1_7_R2.java rename to src/me/TheBukor/SkStuff/expressions/ExprItemNBTv1_7_R2.java index 1ef7f86..f9dff85 100644 --- a/src/me/TheBukor/expressions/ExprItemNBTv1_7_R2.java +++ b/src/me/TheBukor/SkStuff/expressions/ExprItemNBTv1_7_R2.java @@ -1,4 +1,4 @@ -package me.TheBukor.expressions; +package me.TheBukor.SkStuff.expressions; import javax.annotation.Nullable; diff --git a/src/me/TheBukor/expressions/ExprItemNBTv1_7_R3.java b/src/me/TheBukor/SkStuff/expressions/ExprItemNBTv1_7_R3.java similarity index 94% rename from src/me/TheBukor/expressions/ExprItemNBTv1_7_R3.java rename to src/me/TheBukor/SkStuff/expressions/ExprItemNBTv1_7_R3.java index 0d4806e..8658ebe 100644 --- a/src/me/TheBukor/expressions/ExprItemNBTv1_7_R3.java +++ b/src/me/TheBukor/SkStuff/expressions/ExprItemNBTv1_7_R3.java @@ -1,4 +1,4 @@ -package me.TheBukor.expressions; +package me.TheBukor.SkStuff.expressions; import javax.annotation.Nullable; diff --git a/src/me/TheBukor/expressions/ExprItemNBTv1_7_R4.java b/src/me/TheBukor/SkStuff/expressions/ExprItemNBTv1_7_R4.java similarity index 94% rename from src/me/TheBukor/expressions/ExprItemNBTv1_7_R4.java rename to src/me/TheBukor/SkStuff/expressions/ExprItemNBTv1_7_R4.java index e195129..8f1b8e1 100644 --- a/src/me/TheBukor/expressions/ExprItemNBTv1_7_R4.java +++ b/src/me/TheBukor/SkStuff/expressions/ExprItemNBTv1_7_R4.java @@ -1,4 +1,4 @@ -package me.TheBukor.expressions; +package me.TheBukor.SkStuff.expressions; import javax.annotation.Nullable; diff --git a/src/me/TheBukor/expressions/ExprItemNBTv1_8_R1.java b/src/me/TheBukor/SkStuff/expressions/ExprItemNBTv1_8_R1.java similarity index 94% rename from src/me/TheBukor/expressions/ExprItemNBTv1_8_R1.java rename to src/me/TheBukor/SkStuff/expressions/ExprItemNBTv1_8_R1.java index 6e271c4..f7352b4 100644 --- a/src/me/TheBukor/expressions/ExprItemNBTv1_8_R1.java +++ b/src/me/TheBukor/SkStuff/expressions/ExprItemNBTv1_8_R1.java @@ -1,4 +1,4 @@ -package me.TheBukor.expressions; +package me.TheBukor.SkStuff.expressions; import javax.annotation.Nullable; diff --git a/src/me/TheBukor/expressions/ExprItemNBTv1_8_R2.java b/src/me/TheBukor/SkStuff/expressions/ExprItemNBTv1_8_R2.java similarity index 94% rename from src/me/TheBukor/expressions/ExprItemNBTv1_8_R2.java rename to src/me/TheBukor/SkStuff/expressions/ExprItemNBTv1_8_R2.java index f83ac33..0aaaed2 100644 --- a/src/me/TheBukor/expressions/ExprItemNBTv1_8_R2.java +++ b/src/me/TheBukor/SkStuff/expressions/ExprItemNBTv1_8_R2.java @@ -1,4 +1,4 @@ -package me.TheBukor.expressions; +package me.TheBukor.SkStuff.expressions; import javax.annotation.Nullable; diff --git a/src/me/TheBukor/expressions/ExprItemNBTv1_8_R3.java b/src/me/TheBukor/SkStuff/expressions/ExprItemNBTv1_8_R3.java similarity index 94% rename from src/me/TheBukor/expressions/ExprItemNBTv1_8_R3.java rename to src/me/TheBukor/SkStuff/expressions/ExprItemNBTv1_8_R3.java index bac390c..0b31ac5 100644 --- a/src/me/TheBukor/expressions/ExprItemNBTv1_8_R3.java +++ b/src/me/TheBukor/SkStuff/expressions/ExprItemNBTv1_8_R3.java @@ -1,4 +1,4 @@ -package me.TheBukor.expressions; +package me.TheBukor.SkStuff.expressions; import javax.annotation.Nullable; diff --git a/src/me/TheBukor/expressions/ExprLengthOfSchematic.java b/src/me/TheBukor/SkStuff/expressions/ExprLengthOfSchematic.java similarity index 93% rename from src/me/TheBukor/expressions/ExprLengthOfSchematic.java rename to src/me/TheBukor/SkStuff/expressions/ExprLengthOfSchematic.java index 965dbf3..786ed1b 100644 --- a/src/me/TheBukor/expressions/ExprLengthOfSchematic.java +++ b/src/me/TheBukor/SkStuff/expressions/ExprLengthOfSchematic.java @@ -1,4 +1,4 @@ -package me.TheBukor.expressions; +package me.TheBukor.SkStuff.expressions; import java.io.File; import java.io.IOException; diff --git a/src/me/TheBukor/expressions/ExprLengthOfSelection.java b/src/me/TheBukor/SkStuff/expressions/ExprLengthOfSelection.java similarity index 93% rename from src/me/TheBukor/expressions/ExprLengthOfSelection.java rename to src/me/TheBukor/SkStuff/expressions/ExprLengthOfSelection.java index b1c34f3..1d1d25a 100644 --- a/src/me/TheBukor/expressions/ExprLengthOfSelection.java +++ b/src/me/TheBukor/SkStuff/expressions/ExprLengthOfSelection.java @@ -1,4 +1,4 @@ -package me.TheBukor.expressions; +package me.TheBukor.SkStuff.expressions; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/src/me/TheBukor/expressions/ExprNBTv1_7_R1.java b/src/me/TheBukor/SkStuff/expressions/ExprNBTv1_7_R1.java similarity index 96% rename from src/me/TheBukor/expressions/ExprNBTv1_7_R1.java rename to src/me/TheBukor/SkStuff/expressions/ExprNBTv1_7_R1.java index 0472291..d43bb15 100644 --- a/src/me/TheBukor/expressions/ExprNBTv1_7_R1.java +++ b/src/me/TheBukor/SkStuff/expressions/ExprNBTv1_7_R1.java @@ -1,4 +1,4 @@ -package me.TheBukor.expressions; +package me.TheBukor.SkStuff.expressions; import javax.annotation.Nullable; diff --git a/src/me/TheBukor/expressions/ExprNBTv1_7_R2.java b/src/me/TheBukor/SkStuff/expressions/ExprNBTv1_7_R2.java similarity index 96% rename from src/me/TheBukor/expressions/ExprNBTv1_7_R2.java rename to src/me/TheBukor/SkStuff/expressions/ExprNBTv1_7_R2.java index f374e41..7f7099b 100644 --- a/src/me/TheBukor/expressions/ExprNBTv1_7_R2.java +++ b/src/me/TheBukor/SkStuff/expressions/ExprNBTv1_7_R2.java @@ -1,4 +1,4 @@ -package me.TheBukor.expressions; +package me.TheBukor.SkStuff.expressions; import javax.annotation.Nullable; diff --git a/src/me/TheBukor/expressions/ExprNBTv1_7_R3.java b/src/me/TheBukor/SkStuff/expressions/ExprNBTv1_7_R3.java similarity index 96% rename from src/me/TheBukor/expressions/ExprNBTv1_7_R3.java rename to src/me/TheBukor/SkStuff/expressions/ExprNBTv1_7_R3.java index abdfe5d..9bc407a 100644 --- a/src/me/TheBukor/expressions/ExprNBTv1_7_R3.java +++ b/src/me/TheBukor/SkStuff/expressions/ExprNBTv1_7_R3.java @@ -1,4 +1,4 @@ -package me.TheBukor.expressions; +package me.TheBukor.SkStuff.expressions; import javax.annotation.Nullable; diff --git a/src/me/TheBukor/expressions/ExprNBTv1_7_R4.java b/src/me/TheBukor/SkStuff/expressions/ExprNBTv1_7_R4.java similarity index 96% rename from src/me/TheBukor/expressions/ExprNBTv1_7_R4.java rename to src/me/TheBukor/SkStuff/expressions/ExprNBTv1_7_R4.java index 2d44eef..8c8a8b2 100644 --- a/src/me/TheBukor/expressions/ExprNBTv1_7_R4.java +++ b/src/me/TheBukor/SkStuff/expressions/ExprNBTv1_7_R4.java @@ -1,4 +1,4 @@ -package me.TheBukor.expressions; +package me.TheBukor.SkStuff.expressions; import javax.annotation.Nullable; diff --git a/src/me/TheBukor/expressions/ExprNBTv1_8_R1.java b/src/me/TheBukor/SkStuff/expressions/ExprNBTv1_8_R1.java similarity index 96% rename from src/me/TheBukor/expressions/ExprNBTv1_8_R1.java rename to src/me/TheBukor/SkStuff/expressions/ExprNBTv1_8_R1.java index 8814f46..279cdb9 100644 --- a/src/me/TheBukor/expressions/ExprNBTv1_8_R1.java +++ b/src/me/TheBukor/SkStuff/expressions/ExprNBTv1_8_R1.java @@ -1,4 +1,4 @@ -package me.TheBukor.expressions; +package me.TheBukor.SkStuff.expressions; import javax.annotation.Nullable; diff --git a/src/me/TheBukor/expressions/ExprNBTv1_8_R2.java b/src/me/TheBukor/SkStuff/expressions/ExprNBTv1_8_R2.java similarity index 96% rename from src/me/TheBukor/expressions/ExprNBTv1_8_R2.java rename to src/me/TheBukor/SkStuff/expressions/ExprNBTv1_8_R2.java index c5973a0..5a9c7a0 100644 --- a/src/me/TheBukor/expressions/ExprNBTv1_8_R2.java +++ b/src/me/TheBukor/SkStuff/expressions/ExprNBTv1_8_R2.java @@ -1,4 +1,4 @@ -package me.TheBukor.expressions; +package me.TheBukor.SkStuff.expressions; import javax.annotation.Nullable; diff --git a/src/me/TheBukor/expressions/ExprNBTv1_8_R3.java b/src/me/TheBukor/SkStuff/expressions/ExprNBTv1_8_R3.java similarity index 96% rename from src/me/TheBukor/expressions/ExprNBTv1_8_R3.java rename to src/me/TheBukor/SkStuff/expressions/ExprNBTv1_8_R3.java index 195a059..fd3831e 100644 --- a/src/me/TheBukor/expressions/ExprNBTv1_8_R3.java +++ b/src/me/TheBukor/SkStuff/expressions/ExprNBTv1_8_R3.java @@ -1,4 +1,4 @@ -package me.TheBukor.expressions; +package me.TheBukor.SkStuff.expressions; import javax.annotation.Nullable; diff --git a/src/me/TheBukor/expressions/ExprNewEditSession.java b/src/me/TheBukor/SkStuff/expressions/ExprNewEditSession.java similarity index 94% rename from src/me/TheBukor/expressions/ExprNewEditSession.java rename to src/me/TheBukor/SkStuff/expressions/ExprNewEditSession.java index e38595c..fd834e1 100644 --- a/src/me/TheBukor/expressions/ExprNewEditSession.java +++ b/src/me/TheBukor/SkStuff/expressions/ExprNewEditSession.java @@ -1,4 +1,4 @@ -package me.TheBukor.expressions; +package me.TheBukor.SkStuff.expressions; import javax.annotation.Nullable; diff --git a/src/me/TheBukor/expressions/ExprSelectionOfPlayer.java b/src/me/TheBukor/SkStuff/expressions/ExprSelectionOfPlayer.java similarity index 95% rename from src/me/TheBukor/expressions/ExprSelectionOfPlayer.java rename to src/me/TheBukor/SkStuff/expressions/ExprSelectionOfPlayer.java index b7dc4ce..e156a84 100644 --- a/src/me/TheBukor/expressions/ExprSelectionOfPlayer.java +++ b/src/me/TheBukor/SkStuff/expressions/ExprSelectionOfPlayer.java @@ -1,4 +1,4 @@ -package me.TheBukor.expressions; +package me.TheBukor.SkStuff.expressions; import javax.annotation.Nullable; diff --git a/src/me/TheBukor/expressions/ExprSelectionPos1.java b/src/me/TheBukor/SkStuff/expressions/ExprSelectionPos1.java similarity index 95% rename from src/me/TheBukor/expressions/ExprSelectionPos1.java rename to src/me/TheBukor/SkStuff/expressions/ExprSelectionPos1.java index 2c94078..f7353ca 100644 --- a/src/me/TheBukor/expressions/ExprSelectionPos1.java +++ b/src/me/TheBukor/SkStuff/expressions/ExprSelectionPos1.java @@ -1,4 +1,4 @@ -package me.TheBukor.expressions; +package me.TheBukor.SkStuff.expressions; import javax.annotation.Nullable; diff --git a/src/me/TheBukor/expressions/ExprSelectionPos2.java b/src/me/TheBukor/SkStuff/expressions/ExprSelectionPos2.java similarity index 95% rename from src/me/TheBukor/expressions/ExprSelectionPos2.java rename to src/me/TheBukor/SkStuff/expressions/ExprSelectionPos2.java index 2d0cf6a..230841e 100644 --- a/src/me/TheBukor/expressions/ExprSelectionPos2.java +++ b/src/me/TheBukor/SkStuff/expressions/ExprSelectionPos2.java @@ -1,4 +1,4 @@ -package me.TheBukor.expressions; +package me.TheBukor.SkStuff.expressions; import javax.annotation.Nullable; diff --git a/src/me/TheBukor/expressions/ExprTagOfv1_7_R1.java b/src/me/TheBukor/SkStuff/expressions/ExprTagOfv1_7_R1.java similarity index 96% rename from src/me/TheBukor/expressions/ExprTagOfv1_7_R1.java rename to src/me/TheBukor/SkStuff/expressions/ExprTagOfv1_7_R1.java index 680fdec..13eafe2 100644 --- a/src/me/TheBukor/expressions/ExprTagOfv1_7_R1.java +++ b/src/me/TheBukor/SkStuff/expressions/ExprTagOfv1_7_R1.java @@ -1,4 +1,4 @@ -package me.TheBukor.expressions; +package me.TheBukor.SkStuff.expressions; import javax.annotation.Nullable; diff --git a/src/me/TheBukor/expressions/ExprTagOfv1_7_R2.java b/src/me/TheBukor/SkStuff/expressions/ExprTagOfv1_7_R2.java similarity index 96% rename from src/me/TheBukor/expressions/ExprTagOfv1_7_R2.java rename to src/me/TheBukor/SkStuff/expressions/ExprTagOfv1_7_R2.java index cea46b2..7ecb212 100644 --- a/src/me/TheBukor/expressions/ExprTagOfv1_7_R2.java +++ b/src/me/TheBukor/SkStuff/expressions/ExprTagOfv1_7_R2.java @@ -1,4 +1,4 @@ -package me.TheBukor.expressions; +package me.TheBukor.SkStuff.expressions; import javax.annotation.Nullable; diff --git a/src/me/TheBukor/expressions/ExprTagOfv1_7_R3.java b/src/me/TheBukor/SkStuff/expressions/ExprTagOfv1_7_R3.java similarity index 96% rename from src/me/TheBukor/expressions/ExprTagOfv1_7_R3.java rename to src/me/TheBukor/SkStuff/expressions/ExprTagOfv1_7_R3.java index 2486ec2..63ecf36 100644 --- a/src/me/TheBukor/expressions/ExprTagOfv1_7_R3.java +++ b/src/me/TheBukor/SkStuff/expressions/ExprTagOfv1_7_R3.java @@ -1,4 +1,4 @@ -package me.TheBukor.expressions; +package me.TheBukor.SkStuff.expressions; import javax.annotation.Nullable; diff --git a/src/me/TheBukor/expressions/ExprTagOfv1_7_R4.java b/src/me/TheBukor/SkStuff/expressions/ExprTagOfv1_7_R4.java similarity index 96% rename from src/me/TheBukor/expressions/ExprTagOfv1_7_R4.java rename to src/me/TheBukor/SkStuff/expressions/ExprTagOfv1_7_R4.java index ec74167..b2024c1 100644 --- a/src/me/TheBukor/expressions/ExprTagOfv1_7_R4.java +++ b/src/me/TheBukor/SkStuff/expressions/ExprTagOfv1_7_R4.java @@ -1,4 +1,4 @@ -package me.TheBukor.expressions; +package me.TheBukor.SkStuff.expressions; import javax.annotation.Nullable; diff --git a/src/me/TheBukor/expressions/ExprTagOfv1_8_R1.java b/src/me/TheBukor/SkStuff/expressions/ExprTagOfv1_8_R1.java similarity index 96% rename from src/me/TheBukor/expressions/ExprTagOfv1_8_R1.java rename to src/me/TheBukor/SkStuff/expressions/ExprTagOfv1_8_R1.java index b4c5186..2916ad3 100644 --- a/src/me/TheBukor/expressions/ExprTagOfv1_8_R1.java +++ b/src/me/TheBukor/SkStuff/expressions/ExprTagOfv1_8_R1.java @@ -1,4 +1,4 @@ -package me.TheBukor.expressions; +package me.TheBukor.SkStuff.expressions; import javax.annotation.Nullable; diff --git a/src/me/TheBukor/expressions/ExprTagOfv1_8_R2.java b/src/me/TheBukor/SkStuff/expressions/ExprTagOfv1_8_R2.java similarity index 96% rename from src/me/TheBukor/expressions/ExprTagOfv1_8_R2.java rename to src/me/TheBukor/SkStuff/expressions/ExprTagOfv1_8_R2.java index 84abf4f..522dcf7 100644 --- a/src/me/TheBukor/expressions/ExprTagOfv1_8_R2.java +++ b/src/me/TheBukor/SkStuff/expressions/ExprTagOfv1_8_R2.java @@ -1,4 +1,4 @@ -package me.TheBukor.expressions; +package me.TheBukor.SkStuff.expressions; import javax.annotation.Nullable; diff --git a/src/me/TheBukor/expressions/ExprTagOfv1_8_R3.java b/src/me/TheBukor/SkStuff/expressions/ExprTagOfv1_8_R3.java similarity index 96% rename from src/me/TheBukor/expressions/ExprTagOfv1_8_R3.java rename to src/me/TheBukor/SkStuff/expressions/ExprTagOfv1_8_R3.java index 1813d79..80802d1 100644 --- a/src/me/TheBukor/expressions/ExprTagOfv1_8_R3.java +++ b/src/me/TheBukor/SkStuff/expressions/ExprTagOfv1_8_R3.java @@ -1,4 +1,4 @@ -package me.TheBukor.expressions; +package me.TheBukor.SkStuff.expressions; import javax.annotation.Nullable; diff --git a/src/me/TheBukor/expressions/ExprVolumeOfSchematic.java b/src/me/TheBukor/SkStuff/expressions/ExprVolumeOfSchematic.java similarity index 93% rename from src/me/TheBukor/expressions/ExprVolumeOfSchematic.java rename to src/me/TheBukor/SkStuff/expressions/ExprVolumeOfSchematic.java index 865feca..4e675b4 100644 --- a/src/me/TheBukor/expressions/ExprVolumeOfSchematic.java +++ b/src/me/TheBukor/SkStuff/expressions/ExprVolumeOfSchematic.java @@ -1,4 +1,4 @@ -package me.TheBukor.expressions; +package me.TheBukor.SkStuff.expressions; import java.io.File; import java.io.IOException; diff --git a/src/me/TheBukor/expressions/ExprVolumeOfSelection.java b/src/me/TheBukor/SkStuff/expressions/ExprVolumeOfSelection.java similarity index 93% rename from src/me/TheBukor/expressions/ExprVolumeOfSelection.java rename to src/me/TheBukor/SkStuff/expressions/ExprVolumeOfSelection.java index 47137d2..104636d 100644 --- a/src/me/TheBukor/expressions/ExprVolumeOfSelection.java +++ b/src/me/TheBukor/SkStuff/expressions/ExprVolumeOfSelection.java @@ -1,4 +1,4 @@ -package me.TheBukor.expressions; +package me.TheBukor.SkStuff.expressions; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/src/me/TheBukor/expressions/ExprWidthOfSchematic.java b/src/me/TheBukor/SkStuff/expressions/ExprWidthOfSchematic.java similarity index 93% rename from src/me/TheBukor/expressions/ExprWidthOfSchematic.java rename to src/me/TheBukor/SkStuff/expressions/ExprWidthOfSchematic.java index 1a5d0e4..3feb00c 100644 --- a/src/me/TheBukor/expressions/ExprWidthOfSchematic.java +++ b/src/me/TheBukor/SkStuff/expressions/ExprWidthOfSchematic.java @@ -1,4 +1,4 @@ -package me.TheBukor.expressions; +package me.TheBukor.SkStuff.expressions; import java.io.File; import java.io.IOException; diff --git a/src/me/TheBukor/expressions/ExprWidthOfSelection.java b/src/me/TheBukor/SkStuff/expressions/ExprWidthOfSelection.java similarity index 93% rename from src/me/TheBukor/expressions/ExprWidthOfSelection.java rename to src/me/TheBukor/SkStuff/expressions/ExprWidthOfSelection.java index 7a73ffa..bc32b76 100644 --- a/src/me/TheBukor/expressions/ExprWidthOfSelection.java +++ b/src/me/TheBukor/SkStuff/expressions/ExprWidthOfSelection.java @@ -1,4 +1,4 @@ -package me.TheBukor.expressions; +package me.TheBukor.SkStuff.expressions; import org.bukkit.Bukkit; import org.bukkit.entity.Player;