From f1cdcdaf3e5d97c2e10549adfe229ca32cdf9bbf Mon Sep 17 00:00:00 2001 From: CocoTheOwner Date: Tue, 9 Mar 2021 09:56:21 +0100 Subject: [PATCH] Move commands into folders --- lint/ChangeLog.txt | 266 +++++++++--------- lint/renaming-log.xml | 44 +-- src/main/java/com/volmit/iris/Iris.java | 2 +- .../iris/manager/command/CommandIris.java | 8 +- .../{ => jigsaw}/CommandIrisJigsaw.java | 5 +- .../{ => jigsaw}/CommandIrisJigsawEdit.java | 2 +- .../{ => jigsaw}/CommandIrisJigsawNew.java | 2 +- .../{ => jigsaw}/CommandIrisJigsawPlace.java | 2 +- .../{ => jigsaw}/CommandIrisJigsawSave.java | 2 +- .../{ => object}/CommandIrisObject.java | 4 +- .../CommandIrisObjectContract.java | 2 +- .../{ => object}/CommandIrisObjectDust.java | 2 +- .../{ => object}/CommandIrisObjectExpand.java | 2 +- .../{ => object}/CommandIrisObjectP1.java | 2 +- .../{ => object}/CommandIrisObjectP2.java | 2 +- .../{ => object}/CommandIrisObjectPaste.java | 2 +- .../{ => object}/CommandIrisObjectSave.java | 2 +- .../{ => object}/CommandIrisObjectShift.java | 2 +- .../{ => object}/CommandIrisObjectWand.java | 2 +- .../{ => object}/CommandIrisObjectXAY.java | 2 +- .../{ => object}/CommandIrisObjectXPY.java | 2 +- .../{ => studio}/CommandIrisStudio.java | 4 +- .../{ => studio}/CommandIrisStudioClose.java | 2 +- .../CommandIrisStudioConvert.java | 2 +- .../{ => studio}/CommandIrisStudioCreate.java | 2 +- .../CommandIrisStudioEditBiome.java | 2 +- .../CommandIrisStudioExplorer.java | 2 +- .../CommandIrisStudioExplorerGenerator.java | 2 +- .../{ => studio}/CommandIrisStudioGoto.java | 2 +- .../CommandIrisStudioHotload.java | 2 +- .../{ => studio}/CommandIrisStudioLoot.java | 2 +- .../{ => studio}/CommandIrisStudioMap.java | 2 +- .../{ => studio}/CommandIrisStudioOpen.java | 2 +- .../CommandIrisStudioPackage.java | 2 +- .../{ => studio}/CommandIrisStudioSummon.java | 2 +- .../CommandIrisStudioTPStudio.java | 2 +- .../{ => studio}/CommandIrisStudioUpdate.java | 2 +- .../command/{ => what}/CommandIrisWhat.java | 6 +- .../{ => what}/CommandIrisWhatBiome.java | 2 +- .../{ => what}/CommandIrisWhatBlock.java | 2 +- .../{ => what}/CommandIrisWhatHand.java | 2 +- .../CommandIrisWhatObjects.java} | 48 ++-- .../{ => world}/CommandIrisCreate.java | 4 +- .../command/{ => world}/CommandIrisFix.java | 2 +- .../{ => world}/CommandIrisPregen.java | 2 +- .../command/{ => world}/CommandIrisRegen.java | 2 +- .../{ => world}/CommandIrisUpdateWorld.java | 2 +- .../command/{ => world}/CommandLocate.java | 2 +- 48 files changed, 231 insertions(+), 236 deletions(-) rename src/main/java/com/volmit/iris/manager/command/{ => jigsaw}/CommandIrisJigsaw.java (92%) rename src/main/java/com/volmit/iris/manager/command/{ => jigsaw}/CommandIrisJigsawEdit.java (96%) rename src/main/java/com/volmit/iris/manager/command/{ => jigsaw}/CommandIrisJigsawNew.java (97%) rename src/main/java/com/volmit/iris/manager/command/{ => jigsaw}/CommandIrisJigsawPlace.java (97%) rename src/main/java/com/volmit/iris/manager/command/{ => jigsaw}/CommandIrisJigsawSave.java (96%) rename src/main/java/com/volmit/iris/manager/command/{ => object}/CommandIrisObject.java (93%) rename src/main/java/com/volmit/iris/manager/command/{ => object}/CommandIrisObjectContract.java (97%) rename src/main/java/com/volmit/iris/manager/command/{ => object}/CommandIrisObjectDust.java (96%) rename src/main/java/com/volmit/iris/manager/command/{ => object}/CommandIrisObjectExpand.java (97%) rename src/main/java/com/volmit/iris/manager/command/{ => object}/CommandIrisObjectP1.java (97%) rename src/main/java/com/volmit/iris/manager/command/{ => object}/CommandIrisObjectP2.java (97%) rename src/main/java/com/volmit/iris/manager/command/{ => object}/CommandIrisObjectPaste.java (98%) rename src/main/java/com/volmit/iris/manager/command/{ => object}/CommandIrisObjectSave.java (97%) rename src/main/java/com/volmit/iris/manager/command/{ => object}/CommandIrisObjectShift.java (97%) rename src/main/java/com/volmit/iris/manager/command/{ => object}/CommandIrisObjectWand.java (96%) rename src/main/java/com/volmit/iris/manager/command/{ => object}/CommandIrisObjectXAY.java (98%) rename src/main/java/com/volmit/iris/manager/command/{ => object}/CommandIrisObjectXPY.java (97%) rename src/main/java/com/volmit/iris/manager/command/{ => studio}/CommandIrisStudio.java (94%) rename src/main/java/com/volmit/iris/manager/command/{ => studio}/CommandIrisStudioClose.java (97%) rename src/main/java/com/volmit/iris/manager/command/{ => studio}/CommandIrisStudioConvert.java (94%) rename src/main/java/com/volmit/iris/manager/command/{ => studio}/CommandIrisStudioCreate.java (96%) rename src/main/java/com/volmit/iris/manager/command/{ => studio}/CommandIrisStudioEditBiome.java (96%) rename src/main/java/com/volmit/iris/manager/command/{ => studio}/CommandIrisStudioExplorer.java (96%) rename src/main/java/com/volmit/iris/manager/command/{ => studio}/CommandIrisStudioExplorerGenerator.java (97%) rename src/main/java/com/volmit/iris/manager/command/{ => studio}/CommandIrisStudioGoto.java (98%) rename src/main/java/com/volmit/iris/manager/command/{ => studio}/CommandIrisStudioHotload.java (96%) rename src/main/java/com/volmit/iris/manager/command/{ => studio}/CommandIrisStudioLoot.java (98%) rename src/main/java/com/volmit/iris/manager/command/{ => studio}/CommandIrisStudioMap.java (96%) rename src/main/java/com/volmit/iris/manager/command/{ => studio}/CommandIrisStudioOpen.java (97%) rename src/main/java/com/volmit/iris/manager/command/{ => studio}/CommandIrisStudioPackage.java (96%) rename src/main/java/com/volmit/iris/manager/command/{ => studio}/CommandIrisStudioSummon.java (97%) rename src/main/java/com/volmit/iris/manager/command/{ => studio}/CommandIrisStudioTPStudio.java (96%) rename src/main/java/com/volmit/iris/manager/command/{ => studio}/CommandIrisStudioUpdate.java (96%) rename src/main/java/com/volmit/iris/manager/command/{ => what}/CommandIrisWhat.java (85%) rename src/main/java/com/volmit/iris/manager/command/{ => what}/CommandIrisWhatBiome.java (96%) rename src/main/java/com/volmit/iris/manager/command/{ => what}/CommandIrisWhatBlock.java (97%) rename src/main/java/com/volmit/iris/manager/command/{ => what}/CommandIrisWhatHand.java (97%) rename src/main/java/com/volmit/iris/manager/command/{CommandIrisCapture.java => what/CommandIrisWhatObjects.java} (88%) rename src/main/java/com/volmit/iris/manager/command/{ => world}/CommandIrisCreate.java (98%) rename src/main/java/com/volmit/iris/manager/command/{ => world}/CommandIrisFix.java (97%) rename src/main/java/com/volmit/iris/manager/command/{ => world}/CommandIrisPregen.java (98%) rename src/main/java/com/volmit/iris/manager/command/{ => world}/CommandIrisRegen.java (97%) rename src/main/java/com/volmit/iris/manager/command/{ => world}/CommandIrisUpdateWorld.java (95%) rename src/main/java/com/volmit/iris/manager/command/{ => world}/CommandLocate.java (97%) diff --git a/lint/ChangeLog.txt b/lint/ChangeLog.txt index e3858e4d3..50c927481 100644 --- a/lint/ChangeLog.txt +++ b/lint/ChangeLog.txt @@ -1738,11 +1738,11 @@ Class: public com.volmit.iris.activation.IrisActivation2 NameNotChanged Class: public com.volmit.iris.manager.command.CommandIris NameNotChanged Source: "CommandIris.java" FieldsOf: com.volmit.iris.manager.command.CommandIris - private com.volmit.iris.manager.command.CommandIrisCreate create => j - private com.volmit.iris.manager.command.CommandIrisObject object => k + private com.volmit.iris.manager.command.world.CommandIrisCreate create => j + private com.volmit.iris.manager.command.object.CommandIrisObject object => k private com.volmit.iris.manager.command.CommandIrisStructure structure => g - private com.volmit.iris.manager.command.CommandIrisStudio studio => i - private com.volmit.iris.manager.command.CommandIrisWhat what => h + private com.volmit.iris.manager.command.studio.CommandIrisStudio studio => i + private com.volmit.iris.manager.command.what.CommandIrisWhat what => h MethodsOf: com.volmit.iris.manager.command.CommandIris static void () SignatureNotChanged public void () SignatureNotChanged @@ -1757,10 +1757,10 @@ Class: public com.volmit.iris.manager.command.CommandIris NameNotChanged 36 => 1 42 => 3 -Class: public com.volmit.iris.manager.command.CommandIrisCreate NameNotChanged +Class: public com.volmit.iris.manager.command.world.CommandIrisCreate NameNotChanged Source: "CommandIrisCreate.java" - FieldsOf: com.volmit.iris.manager.command.CommandIrisCreate - MethodsOf: com.volmit.iris.manager.command.CommandIrisCreate + FieldsOf: com.volmit.iris.manager.command.world.CommandIrisCreate + MethodsOf: com.volmit.iris.manager.command.world.CommandIrisCreate static void () SignatureNotChanged public void () SignatureNotChanged protected java.lang.String getArgsUsage() SignatureNotChanged @@ -1769,7 +1769,7 @@ Class: public com.volmit.iris.manager.command.CommandIrisCreate NameNotChanged private static synthetic void lambda$handle$1(com.volmit.iris.util.O) SignatureNotChanged private static synthetic void lambda$handle$3(com.volmit.iris.util.O, org.bukkit.World, com.volmit.iris.util.MortarSender, boolean, java.io.File) SignatureNotChanged private static synthetic void lambda$null$2(org.bukkit.World, com.volmit.iris.util.MortarSender, boolean, java.io.File) SignatureNotChanged - LineNumbersOf: com.volmit.iris.manager.command.CommandIrisCreate + LineNumbersOf: com.volmit.iris.manager.command.world.CommandIrisCreate 28 => 34 29 => 63 30 => 43 @@ -2081,25 +2081,25 @@ Class: public com.volmit.iris.manager.command.CommandIrisMetrics NameNotChanged 48 => 17 54 => 19 -Class: public com.volmit.iris.manager.command.CommandIrisObject NameNotChanged +Class: public com.volmit.iris.manager.command.object.CommandIrisObject NameNotChanged Source: "CommandIrisObject.java" - FieldsOf: com.volmit.iris.manager.command.CommandIrisObject - private com.volmit.iris.manager.command.CommandIrisObjectContract contract => m - private com.volmit.iris.manager.command.CommandIrisObjectExpand expand => p - private com.volmit.iris.manager.command.CommandIrisObjectP1 p1 => l - private com.volmit.iris.manager.command.CommandIrisObjectP2 p2 => n - private com.volmit.iris.manager.command.CommandIrisObjectPaste paste => i - private com.volmit.iris.manager.command.CommandIrisObjectSave save => j - private com.volmit.iris.manager.command.CommandIrisObjectShift shift => h - private com.volmit.iris.manager.command.CommandIrisObjectWand wand => g - private com.volmit.iris.manager.command.CommandIrisObjectXAY xay => k - private com.volmit.iris.manager.command.CommandIrisObjectXPY xpy => o - MethodsOf: com.volmit.iris.manager.command.CommandIrisObject + FieldsOf: com.volmit.iris.manager.command.object.CommandIrisObject + private com.volmit.iris.manager.command.object.CommandIrisObjectContract contract => m + private com.volmit.iris.manager.command.object.CommandIrisObjectExpand expand => p + private com.volmit.iris.manager.command.object.CommandIrisObjectP1 p1 => l + private com.volmit.iris.manager.command.object.CommandIrisObjectP2 p2 => n + private com.volmit.iris.manager.command.object.CommandIrisObjectPaste paste => i + private com.volmit.iris.manager.command.object.CommandIrisObjectSave save => j + private com.volmit.iris.manager.command.object.CommandIrisObjectShift shift => h + private com.volmit.iris.manager.command.object.CommandIrisObjectWand wand => g + private com.volmit.iris.manager.command.object.CommandIrisObjectXAY xay => k + private com.volmit.iris.manager.command.object.CommandIrisObjectXPY xpy => o + MethodsOf: com.volmit.iris.manager.command.object.CommandIrisObject static void () SignatureNotChanged public void () SignatureNotChanged protected java.lang.String getArgsUsage() SignatureNotChanged public boolean handle(com.volmit.iris.util.MortarSender, java.lang.String[]) SignatureNotChanged - LineNumbersOf: com.volmit.iris.manager.command.CommandIrisObject + LineNumbersOf: com.volmit.iris.manager.command.object.CommandIrisObject 42 => 8 43 => 7 44 => 2 @@ -2110,15 +2110,15 @@ Class: public com.volmit.iris.manager.command.CommandIrisObject NameNotChanged 53 => 1 59 => 3 -Class: public com.volmit.iris.manager.command.CommandIrisObjectContract NameNotChanged +Class: public com.volmit.iris.manager.command.object.CommandIrisObjectContract NameNotChanged Source: "CommandIrisObjectContract.java" - FieldsOf: com.volmit.iris.manager.command.CommandIrisObjectContract - MethodsOf: com.volmit.iris.manager.command.CommandIrisObjectContract + FieldsOf: com.volmit.iris.manager.command.object.CommandIrisObjectContract + MethodsOf: com.volmit.iris.manager.command.object.CommandIrisObjectContract static void () SignatureNotChanged public void () SignatureNotChanged protected java.lang.String getArgsUsage() SignatureNotChanged public boolean handle(com.volmit.iris.util.MortarSender, java.lang.String[]) SignatureNotChanged - LineNumbersOf: com.volmit.iris.manager.command.CommandIrisObjectContract + LineNumbersOf: com.volmit.iris.manager.command.object.CommandIrisObjectContract 18 => 23 19 => 18 20 => 3 @@ -2146,15 +2146,15 @@ Class: public com.volmit.iris.manager.command.CommandIrisObjectContract NameNotC 54 => 13 60 => 16 -Class: public com.volmit.iris.manager.command.CommandIrisObjectExpand NameNotChanged +Class: public com.volmit.iris.manager.command.object.CommandIrisObjectExpand NameNotChanged Source: "CommandIrisObjectExpand.java" - FieldsOf: com.volmit.iris.manager.command.CommandIrisObjectExpand - MethodsOf: com.volmit.iris.manager.command.CommandIrisObjectExpand + FieldsOf: com.volmit.iris.manager.command.object.CommandIrisObjectExpand + MethodsOf: com.volmit.iris.manager.command.object.CommandIrisObjectExpand static void () SignatureNotChanged public void () SignatureNotChanged protected java.lang.String getArgsUsage() SignatureNotChanged public boolean handle(com.volmit.iris.util.MortarSender, java.lang.String[]) SignatureNotChanged - LineNumbersOf: com.volmit.iris.manager.command.CommandIrisObjectExpand + LineNumbersOf: com.volmit.iris.manager.command.object.CommandIrisObjectExpand 18 => 3 19 => 2 20 => 17 @@ -2182,15 +2182,15 @@ Class: public com.volmit.iris.manager.command.CommandIrisObjectExpand NameNotCha 54 => 5 60 => 12 -Class: public com.volmit.iris.manager.command.CommandIrisObjectP1 NameNotChanged +Class: public com.volmit.iris.manager.command.object.CommandIrisObjectP1 NameNotChanged Source: "CommandIrisObjectP1.java" - FieldsOf: com.volmit.iris.manager.command.CommandIrisObjectP1 - MethodsOf: com.volmit.iris.manager.command.CommandIrisObjectP1 + FieldsOf: com.volmit.iris.manager.command.object.CommandIrisObjectP1 + MethodsOf: com.volmit.iris.manager.command.object.CommandIrisObjectP1 static void () SignatureNotChanged public void () SignatureNotChanged protected java.lang.String getArgsUsage() SignatureNotChanged public boolean handle(com.volmit.iris.util.MortarSender, java.lang.String[]) SignatureNotChanged - LineNumbersOf: com.volmit.iris.manager.command.CommandIrisObjectP1 + LineNumbersOf: com.volmit.iris.manager.command.object.CommandIrisObjectP1 19 => 18 20 => 7 21 => 17 @@ -2213,15 +2213,15 @@ Class: public com.volmit.iris.manager.command.CommandIrisObjectP1 NameNotChanged 58 => 1 64 => 21 -Class: public com.volmit.iris.manager.command.CommandIrisObjectP2 NameNotChanged +Class: public com.volmit.iris.manager.command.object.CommandIrisObjectP2 NameNotChanged Source: "CommandIrisObjectP2.java" - FieldsOf: com.volmit.iris.manager.command.CommandIrisObjectP2 - MethodsOf: com.volmit.iris.manager.command.CommandIrisObjectP2 + FieldsOf: com.volmit.iris.manager.command.object.CommandIrisObjectP2 + MethodsOf: com.volmit.iris.manager.command.object.CommandIrisObjectP2 static void () SignatureNotChanged public void () SignatureNotChanged protected java.lang.String getArgsUsage() SignatureNotChanged public boolean handle(com.volmit.iris.util.MortarSender, java.lang.String[]) SignatureNotChanged - LineNumbersOf: com.volmit.iris.manager.command.CommandIrisObjectP2 + LineNumbersOf: com.volmit.iris.manager.command.object.CommandIrisObjectP2 19 => 10 20 => 18 21 => 12 @@ -2244,15 +2244,15 @@ Class: public com.volmit.iris.manager.command.CommandIrisObjectP2 NameNotChanged 58 => 20 64 => 7 -Class: public com.volmit.iris.manager.command.CommandIrisObjectPaste NameNotChanged +Class: public com.volmit.iris.manager.command.object.CommandIrisObjectPaste NameNotChanged Source: "CommandIrisObjectPaste.java" - FieldsOf: com.volmit.iris.manager.command.CommandIrisObjectPaste - MethodsOf: com.volmit.iris.manager.command.CommandIrisObjectPaste + FieldsOf: com.volmit.iris.manager.command.object.CommandIrisObjectPaste + MethodsOf: com.volmit.iris.manager.command.object.CommandIrisObjectPaste static void () SignatureNotChanged public void () SignatureNotChanged protected java.lang.String getArgsUsage() SignatureNotChanged public boolean handle(com.volmit.iris.util.MortarSender, java.lang.String[]) SignatureNotChanged - LineNumbersOf: com.volmit.iris.manager.command.CommandIrisObjectPaste + LineNumbersOf: com.volmit.iris.manager.command.object.CommandIrisObjectPaste 22 => 1 23 => 9 24 => 8 @@ -2286,16 +2286,16 @@ Class: public com.volmit.iris.manager.command.CommandIrisObjectPaste NameNotChan 77 => 3 83 => 33 -Class: public com.volmit.iris.manager.command.CommandIrisObjectSave NameNotChanged +Class: public com.volmit.iris.manager.command.object.CommandIrisObjectSave NameNotChanged Source: "CommandIrisObjectSave.java" - FieldsOf: com.volmit.iris.manager.command.CommandIrisObjectSave - MethodsOf: com.volmit.iris.manager.command.CommandIrisObjectSave + FieldsOf: com.volmit.iris.manager.command.object.CommandIrisObjectSave + MethodsOf: com.volmit.iris.manager.command.object.CommandIrisObjectSave static void () SignatureNotChanged public void () SignatureNotChanged private static java.lang.Throwable a(java.lang.Throwable) SignatureNotChanged protected java.lang.String getArgsUsage() SignatureNotChanged public boolean handle(com.volmit.iris.util.MortarSender, java.lang.String[]) SignatureNotChanged - LineNumbersOf: com.volmit.iris.manager.command.CommandIrisObjectSave + LineNumbersOf: com.volmit.iris.manager.command.object.CommandIrisObjectSave 19 => 22 20 => 1 21 => 7 @@ -2330,15 +2330,15 @@ Class: public com.volmit.iris.manager.command.CommandIrisObjectSave NameNotChang 79 => 10 85 => 4 -Class: public com.volmit.iris.manager.command.CommandIrisObjectShift NameNotChanged +Class: public com.volmit.iris.manager.command.object.CommandIrisObjectShift NameNotChanged Source: "CommandIrisObjectShift.java" - FieldsOf: com.volmit.iris.manager.command.CommandIrisObjectShift - MethodsOf: com.volmit.iris.manager.command.CommandIrisObjectShift + FieldsOf: com.volmit.iris.manager.command.object.CommandIrisObjectShift + MethodsOf: com.volmit.iris.manager.command.object.CommandIrisObjectShift static void () SignatureNotChanged public void () SignatureNotChanged protected java.lang.String getArgsUsage() SignatureNotChanged public boolean handle(com.volmit.iris.util.MortarSender, java.lang.String[]) SignatureNotChanged - LineNumbersOf: com.volmit.iris.manager.command.CommandIrisObjectShift + LineNumbersOf: com.volmit.iris.manager.command.object.CommandIrisObjectShift 18 => 26 19 => 12 20 => 19 @@ -2367,15 +2367,15 @@ Class: public com.volmit.iris.manager.command.CommandIrisObjectShift NameNotChan 55 => 8 61 => 21 -Class: public com.volmit.iris.manager.command.CommandIrisObjectWand NameNotChanged +Class: public com.volmit.iris.manager.command.object.CommandIrisObjectWand NameNotChanged Source: "CommandIrisObjectWand.java" - FieldsOf: com.volmit.iris.manager.command.CommandIrisObjectWand - MethodsOf: com.volmit.iris.manager.command.CommandIrisObjectWand + FieldsOf: com.volmit.iris.manager.command.object.CommandIrisObjectWand + MethodsOf: com.volmit.iris.manager.command.object.CommandIrisObjectWand static void () SignatureNotChanged public void () SignatureNotChanged protected java.lang.String getArgsUsage() SignatureNotChanged public boolean handle(com.volmit.iris.util.MortarSender, java.lang.String[]) SignatureNotChanged - LineNumbersOf: com.volmit.iris.manager.command.CommandIrisObjectWand + LineNumbersOf: com.volmit.iris.manager.command.object.CommandIrisObjectWand 14 => 4 15 => 5 16 => 2 @@ -2389,15 +2389,15 @@ Class: public com.volmit.iris.manager.command.CommandIrisObjectWand NameNotChang 32 => 12 38 => 1 -Class: public com.volmit.iris.manager.command.CommandIrisObjectXAY NameNotChanged +Class: public com.volmit.iris.manager.command.object.CommandIrisObjectXAY NameNotChanged Source: "CommandIrisObjectXAY.java" - FieldsOf: com.volmit.iris.manager.command.CommandIrisObjectXAY - MethodsOf: com.volmit.iris.manager.command.CommandIrisObjectXAY + FieldsOf: com.volmit.iris.manager.command.object.CommandIrisObjectXAY + MethodsOf: com.volmit.iris.manager.command.object.CommandIrisObjectXAY static void () SignatureNotChanged public void () SignatureNotChanged protected java.lang.String getArgsUsage() SignatureNotChanged public boolean handle(com.volmit.iris.util.MortarSender, java.lang.String[]) SignatureNotChanged - LineNumbersOf: com.volmit.iris.manager.command.CommandIrisObjectXAY + LineNumbersOf: com.volmit.iris.manager.command.object.CommandIrisObjectXAY 20 => 44 21 => 37 22 => 20 @@ -2444,15 +2444,15 @@ Class: public com.volmit.iris.manager.command.CommandIrisObjectXAY NameNotChange 83 => 22 89 => 26 -Class: public com.volmit.iris.manager.command.CommandIrisObjectXPY NameNotChanged +Class: public com.volmit.iris.manager.command.object.CommandIrisObjectXPY NameNotChanged Source: "CommandIrisObjectXPY.java" - FieldsOf: com.volmit.iris.manager.command.CommandIrisObjectXPY - MethodsOf: com.volmit.iris.manager.command.CommandIrisObjectXPY + FieldsOf: com.volmit.iris.manager.command.object.CommandIrisObjectXPY + MethodsOf: com.volmit.iris.manager.command.object.CommandIrisObjectXPY static void () SignatureNotChanged public void () SignatureNotChanged protected java.lang.String getArgsUsage() SignatureNotChanged public boolean handle(com.volmit.iris.util.MortarSender, java.lang.String[]) SignatureNotChanged - LineNumbersOf: com.volmit.iris.manager.command.CommandIrisObjectXPY + LineNumbersOf: com.volmit.iris.manager.command.object.CommandIrisObjectXPY 20 => 15 21 => 34 22 => 12 @@ -2492,16 +2492,16 @@ Class: public com.volmit.iris.manager.command.CommandIrisObjectXPY NameNotChange 71 => 29 77 => 3 -Class: public com.volmit.iris.manager.command.CommandIrisPregen NameNotChanged +Class: public com.volmit.iris.manager.command.world.CommandIrisPregen NameNotChanged Source: "CommandIrisPregen.java" - FieldsOf: com.volmit.iris.manager.command.CommandIrisPregen - MethodsOf: com.volmit.iris.manager.command.CommandIrisPregen + FieldsOf: com.volmit.iris.manager.command.world.CommandIrisPregen + MethodsOf: com.volmit.iris.manager.command.world.CommandIrisPregen static void () SignatureNotChanged public void () SignatureNotChanged protected java.lang.String getArgsUsage() SignatureNotChanged public boolean handle(com.volmit.iris.util.MortarSender, java.lang.String[]) SignatureNotChanged private static synthetic void lambda$handle$0() SignatureNotChanged - LineNumbersOf: com.volmit.iris.manager.command.CommandIrisPregen + LineNumbersOf: com.volmit.iris.manager.command.world.CommandIrisPregen 15 => 17 16 => 20 17 => 1 @@ -2737,11 +2737,11 @@ Class: public com.volmit.iris.manager.command.CommandIrisStructureVariants NameN 40 => 8 46 => 14 -Class: public com.volmit.iris.manager.command.CommandIrisStudio NameNotChanged +Class: public com.volmit.iris.manager.command.studio.CommandIrisStudio NameNotChanged Source: "CommandIrisStudio.java" - FieldsOf: com.volmit.iris.manager.command.CommandIrisStudio - private com.volmit.iris.manager.command.CommandIrisStudioClose close => g - private com.volmit.iris.manager.command.CommandIrisStudioCreate create => u + FieldsOf: com.volmit.iris.manager.command.studio.CommandIrisStudio + private com.volmit.iris.manager.command.studio.CommandIrisStudioClose close => g + private com.volmit.iris.manager.command.studio.CommandIrisStudioCreate create => u private com.volmit.iris.manager.command.CommandIrisEditBiome ebiome => s private com.volmit.iris.manager.command.CommandIrisGoto got0 => j private com.volmit.iris.manager.command.CommandIrisHotload hotload => p @@ -2749,19 +2749,19 @@ Class: public com.volmit.iris.manager.command.CommandIrisStudio NameNotChanged private com.volmit.iris.manager.command.CommandIrisLoot loot => k private com.volmit.iris.manager.command.CommandIrisMap map => h private com.volmit.iris.manager.command.CommandIrisMetrics metrics => q - private com.volmit.iris.manager.command.CommandIrisStudioOpen open => l - private com.volmit.iris.manager.command.CommandIrisStudioPackage pkg => t - private com.volmit.iris.manager.command.CommandIrisPregen pregen => o + private com.volmit.iris.manager.command.studio.CommandIrisStudioOpen open => l + private com.volmit.iris.manager.command.studio.CommandIrisStudioPackage pkg => t + private com.volmit.iris.manager.command.world.CommandIrisPregen pregen => o private com.volmit.iris.manager.command.CommandIrisTC tc => v - private com.volmit.iris.manager.command.CommandIrisStudioUpdate update => m + private com.volmit.iris.manager.command.studio.CommandIrisStudioUpdate update => m private com.volmit.iris.manager.command.CommandIrisStudioVerify verify => r - private com.volmit.iris.manager.command.CommandIrisPregen world => n - MethodsOf: com.volmit.iris.manager.command.CommandIrisStudio + private com.volmit.iris.manager.command.world.CommandIrisPregen world => n + MethodsOf: com.volmit.iris.manager.command.studio.CommandIrisStudio static void () SignatureNotChanged public void () SignatureNotChanged protected java.lang.String getArgsUsage() SignatureNotChanged public boolean handle(com.volmit.iris.util.MortarSender, java.lang.String[]) SignatureNotChanged - LineNumbersOf: com.volmit.iris.manager.command.CommandIrisStudio + LineNumbersOf: com.volmit.iris.manager.command.studio.CommandIrisStudio 60 => 8 61 => 1 62 => 7 @@ -2771,15 +2771,15 @@ Class: public com.volmit.iris.manager.command.CommandIrisStudio NameNotChanged 70 => 2 76 => 6 -Class: public com.volmit.iris.manager.command.CommandIrisStudioClose NameNotChanged +Class: public com.volmit.iris.manager.command.studio.CommandIrisStudioClose NameNotChanged Source: "CommandIrisStudioClose.java" - FieldsOf: com.volmit.iris.manager.command.CommandIrisStudioClose - MethodsOf: com.volmit.iris.manager.command.CommandIrisStudioClose + FieldsOf: com.volmit.iris.manager.command.studio.CommandIrisStudioClose + MethodsOf: com.volmit.iris.manager.command.studio.CommandIrisStudioClose static void () SignatureNotChanged public void () SignatureNotChanged protected java.lang.String getArgsUsage() SignatureNotChanged public boolean handle(com.volmit.iris.util.MortarSender, java.lang.String[]) SignatureNotChanged - LineNumbersOf: com.volmit.iris.manager.command.CommandIrisStudioClose + LineNumbersOf: com.volmit.iris.manager.command.studio.CommandIrisStudioClose 15 => 15 16 => 19 17 => 5 @@ -2807,15 +2807,15 @@ Class: public com.volmit.iris.manager.command.CommandIrisStudioClose NameNotChan 64 => 13 70 => 20 -Class: public com.volmit.iris.manager.command.CommandIrisStudioCreate NameNotChanged +Class: public com.volmit.iris.manager.command.studio.CommandIrisStudioCreate NameNotChanged Source: "CommandIrisStudioCreate.java" - FieldsOf: com.volmit.iris.manager.command.CommandIrisStudioCreate - MethodsOf: com.volmit.iris.manager.command.CommandIrisStudioCreate + FieldsOf: com.volmit.iris.manager.command.studio.CommandIrisStudioCreate + MethodsOf: com.volmit.iris.manager.command.studio.CommandIrisStudioCreate static void () SignatureNotChanged public void () SignatureNotChanged protected java.lang.String getArgsUsage() SignatureNotChanged public boolean handle(com.volmit.iris.util.MortarSender, java.lang.String[]) SignatureNotChanged - LineNumbersOf: com.volmit.iris.manager.command.CommandIrisStudioCreate + LineNumbersOf: com.volmit.iris.manager.command.studio.CommandIrisStudioCreate 12 => 12 13 => 10 14 => 11 @@ -2858,15 +2858,15 @@ Class: public com.volmit.iris.manager.command.CommandIrisStudioList NameNotChang 46 => 13 52 => 9 -Class: public com.volmit.iris.manager.command.CommandIrisStudioOpen NameNotChanged +Class: public com.volmit.iris.manager.command.studio.CommandIrisStudioOpen NameNotChanged Source: "CommandIrisStudioOpen.java" - FieldsOf: com.volmit.iris.manager.command.CommandIrisStudioOpen - MethodsOf: com.volmit.iris.manager.command.CommandIrisStudioOpen + FieldsOf: com.volmit.iris.manager.command.studio.CommandIrisStudioOpen + MethodsOf: com.volmit.iris.manager.command.studio.CommandIrisStudioOpen static void () SignatureNotChanged public void () SignatureNotChanged protected java.lang.String getArgsUsage() SignatureNotChanged public boolean handle(com.volmit.iris.util.MortarSender, java.lang.String[]) SignatureNotChanged - LineNumbersOf: com.volmit.iris.manager.command.CommandIrisStudioOpen + LineNumbersOf: com.volmit.iris.manager.command.studio.CommandIrisStudioOpen 11 => 5 12 => 8 13 => 10 @@ -2878,16 +2878,16 @@ Class: public com.volmit.iris.manager.command.CommandIrisStudioOpen NameNotChang 26 => 2 32 => 3 -Class: public com.volmit.iris.manager.command.CommandIrisStudioPackage NameNotChanged +Class: public com.volmit.iris.manager.command.studio.CommandIrisStudioPackage NameNotChanged Source: "CommandIrisStudioPackage.java" - FieldsOf: com.volmit.iris.manager.command.CommandIrisStudioPackage - MethodsOf: com.volmit.iris.manager.command.CommandIrisStudioPackage + FieldsOf: com.volmit.iris.manager.command.studio.CommandIrisStudioPackage + MethodsOf: com.volmit.iris.manager.command.studio.CommandIrisStudioPackage static void () SignatureNotChanged public void () SignatureNotChanged protected java.lang.String getArgsUsage() SignatureNotChanged public boolean handle(com.volmit.iris.util.MortarSender, java.lang.String[]) SignatureNotChanged private static synthetic void lambda$handle$0(java.lang.String[], com.volmit.iris.util.MortarSender) SignatureNotChanged - LineNumbersOf: com.volmit.iris.manager.command.CommandIrisStudioPackage + LineNumbersOf: com.volmit.iris.manager.command.studio.CommandIrisStudioPackage 12 => 12 13 => 5 14 => 18 @@ -2907,15 +2907,15 @@ Class: public com.volmit.iris.manager.command.CommandIrisStudioPackage NameNotCh 43 => 6 49 => 3 -Class: public com.volmit.iris.manager.command.CommandIrisStudioUpdate NameNotChanged +Class: public com.volmit.iris.manager.command.studio.CommandIrisStudioUpdate NameNotChanged Source: "CommandIrisStudioUpdate.java" - FieldsOf: com.volmit.iris.manager.command.CommandIrisStudioUpdate - MethodsOf: com.volmit.iris.manager.command.CommandIrisStudioUpdate + FieldsOf: com.volmit.iris.manager.command.studio.CommandIrisStudioUpdate + MethodsOf: com.volmit.iris.manager.command.studio.CommandIrisStudioUpdate static void () SignatureNotChanged public void () SignatureNotChanged protected java.lang.String getArgsUsage() SignatureNotChanged public boolean handle(com.volmit.iris.util.MortarSender, java.lang.String[]) SignatureNotChanged - LineNumbersOf: com.volmit.iris.manager.command.CommandIrisStudioUpdate + LineNumbersOf: com.volmit.iris.manager.command.studio.CommandIrisStudioUpdate 9 => 1 10 => 5 11 => 3 @@ -2990,17 +2990,17 @@ Class: public com.volmit.iris.manager.command.CommandIrisTC NameNotChanged 47 => 13 53 => 5 -Class: public com.volmit.iris.manager.command.CommandIrisWhat NameNotChanged +Class: public com.volmit.iris.manager.command.what.CommandIrisWhat NameNotChanged Source: "CommandIrisWhat.java" - FieldsOf: com.volmit.iris.manager.command.CommandIrisWhat - private com.volmit.iris.manager.command.CommandIrisWhatBlock block => h - private com.volmit.iris.manager.command.CommandIrisWhatHand hand => g - MethodsOf: com.volmit.iris.manager.command.CommandIrisWhat + FieldsOf: com.volmit.iris.manager.command.what.CommandIrisWhat + private com.volmit.iris.manager.command.what.CommandIrisWhatBlock block => h + private com.volmit.iris.manager.command.what.CommandIrisWhatHand hand => g + MethodsOf: com.volmit.iris.manager.command.what.CommandIrisWhat static void () SignatureNotChanged public void () SignatureNotChanged protected java.lang.String getArgsUsage() SignatureNotChanged public boolean handle(com.volmit.iris.util.MortarSender, java.lang.String[]) SignatureNotChanged - LineNumbersOf: com.volmit.iris.manager.command.CommandIrisWhat + LineNumbersOf: com.volmit.iris.manager.command.what.CommandIrisWhat 25 => 8 26 => 15 27 => 18 @@ -3022,15 +3022,15 @@ Class: public com.volmit.iris.manager.command.CommandIrisWhat NameNotChanged 55 => 9 61 => 13 -Class: public com.volmit.iris.manager.command.CommandIrisWhatBlock NameNotChanged +Class: public com.volmit.iris.manager.command.what.CommandIrisWhatBlock NameNotChanged Source: "CommandIrisWhatBlock.java" - FieldsOf: com.volmit.iris.manager.command.CommandIrisWhatBlock - MethodsOf: com.volmit.iris.manager.command.CommandIrisWhatBlock + FieldsOf: com.volmit.iris.manager.command.what.CommandIrisWhatBlock + MethodsOf: com.volmit.iris.manager.command.what.CommandIrisWhatBlock static void () SignatureNotChanged public void () SignatureNotChanged protected java.lang.String getArgsUsage() SignatureNotChanged public boolean handle(com.volmit.iris.util.MortarSender, java.lang.String[]) SignatureNotChanged - LineNumbersOf: com.volmit.iris.manager.command.CommandIrisWhatBlock + LineNumbersOf: com.volmit.iris.manager.command.what.CommandIrisWhatBlock 16 => 7 17 => 3 18 => 6 @@ -3047,15 +3047,15 @@ Class: public com.volmit.iris.manager.command.CommandIrisWhatBlock NameNotChange 39 => 15 45 => 8 -Class: public com.volmit.iris.manager.command.CommandIrisWhatHand NameNotChanged +Class: public com.volmit.iris.manager.command.what.CommandIrisWhatHand NameNotChanged Source: "CommandIrisWhatHand.java" - FieldsOf: com.volmit.iris.manager.command.CommandIrisWhatHand - MethodsOf: com.volmit.iris.manager.command.CommandIrisWhatHand + FieldsOf: com.volmit.iris.manager.command.what.CommandIrisWhatHand + MethodsOf: com.volmit.iris.manager.command.what.CommandIrisWhatHand static void () SignatureNotChanged public void () SignatureNotChanged protected java.lang.String getArgsUsage() SignatureNotChanged public boolean handle(com.volmit.iris.util.MortarSender, java.lang.String[]) SignatureNotChanged - LineNumbersOf: com.volmit.iris.manager.command.CommandIrisWhatHand + LineNumbersOf: com.volmit.iris.manager.command.what.CommandIrisWhatHand 15 => 9 16 => 6 17 => 8 @@ -20123,25 +20123,25 @@ MemberClass: com.volmit.iris.WandManager Data: 2660 MemberClass: com.volmit.iris.activation.IrisActivation1 Data: 4187 K MemberClass: com.volmit.iris.activation.IrisActivation2 Data: 4188 v MemberClass: com.volmit.iris.manager.command.CommandIris Data: 3461 -MemberClass: com.volmit.iris.manager.command.CommandIrisCreate Data: 4057 +MemberClass: com.volmit.iris.manager.command.world.CommandIrisCreate Data: 4057 MemberClass: com.volmit.iris.manager.command.CommandIrisEditBiome Data: 4343 MemberClass: com.volmit.iris.manager.command.CommandIrisGoto Data: 3870 MemberClass: com.volmit.iris.manager.command.CommandIrisHotload Data: 4176 MemberClass: com.volmit.iris.manager.command.CommandIrisLoot Data: 3875 MemberClass: com.volmit.iris.manager.command.CommandIrisMap Data: 3747 MemberClass: com.volmit.iris.manager.command.CommandIrisMetrics Data: 4188 -MemberClass: com.volmit.iris.manager.command.CommandIrisObject Data: 4060 -MemberClass: com.volmit.iris.manager.command.CommandIrisObjectContract Data: 4890 -MemberClass: com.volmit.iris.manager.command.CommandIrisObjectExpand Data: 4668 -MemberClass: com.volmit.iris.manager.command.CommandIrisObjectP1 Data: 4189 -MemberClass: com.volmit.iris.manager.command.CommandIrisObjectP2 Data: 4190 -MemberClass: com.volmit.iris.manager.command.CommandIrisObjectPaste Data: 4569 -MemberClass: com.volmit.iris.manager.command.CommandIrisObjectSave Data: 4459 -MemberClass: com.volmit.iris.manager.command.CommandIrisObjectShift Data: 4570 -MemberClass: com.volmit.iris.manager.command.CommandIrisObjectWand Data: 4454 -MemberClass: com.volmit.iris.manager.command.CommandIrisObjectXAY Data: 4302 -MemberClass: com.volmit.iris.manager.command.CommandIrisObjectXPY Data: 4317 -MemberClass: com.volmit.iris.manager.command.CommandIrisPregen Data: 4070 +MemberClass: com.volmit.iris.manager.command.object.CommandIrisObject Data: 4060 +MemberClass: com.volmit.iris.manager.command.object.CommandIrisObjectContract Data: 4890 +MemberClass: com.volmit.iris.manager.command.object.CommandIrisObjectExpand Data: 4668 +MemberClass: com.volmit.iris.manager.command.object.CommandIrisObjectP1 Data: 4189 +MemberClass: com.volmit.iris.manager.command.object.CommandIrisObjectP2 Data: 4190 +MemberClass: com.volmit.iris.manager.command.object.CommandIrisObjectPaste Data: 4569 +MemberClass: com.volmit.iris.manager.command.object.CommandIrisObjectSave Data: 4459 +MemberClass: com.volmit.iris.manager.command.object.CommandIrisObjectShift Data: 4570 +MemberClass: com.volmit.iris.manager.command.object.CommandIrisObjectWand Data: 4454 +MemberClass: com.volmit.iris.manager.command.object.CommandIrisObjectXAY Data: 4302 +MemberClass: com.volmit.iris.manager.command.object.CommandIrisObjectXPY Data: 4317 +MemberClass: com.volmit.iris.manager.command.world.CommandIrisPregen Data: 4070 MemberClass: com.volmit.iris.manager.command.CommandIrisStructure Data: 4438 MemberClass: com.volmit.iris.manager.command.CommandIrisStructureClose Data: 4940 MemberClass: com.volmit.iris.manager.command.CommandIrisStructureCreate Data: 5034 @@ -20150,18 +20150,18 @@ MemberClass: com.volmit.iris.manager.command.CommandIrisStructureMore Data: 4841 MemberClass: com.volmit.iris.manager.command.CommandIrisStructureOpen Data: 4840 MemberClass: com.volmit.iris.manager.command.CommandIrisStructureSave Data: 4837 MemberClass: com.volmit.iris.manager.command.CommandIrisStructureVariants Data: 5278 -MemberClass: com.volmit.iris.manager.command.CommandIrisStudio Data: 4093 -MemberClass: com.volmit.iris.manager.command.CommandIrisStudioClose Data: 4595 -MemberClass: com.volmit.iris.manager.command.CommandIrisStudioCreate Data: 4689 +MemberClass: com.volmit.iris.manager.command.studio.CommandIrisStudio Data: 4093 +MemberClass: com.volmit.iris.manager.command.studio.CommandIrisStudioClose Data: 4595 +MemberClass: com.volmit.iris.manager.command.studio.CommandIrisStudioCreate Data: 4689 MemberClass: com.volmit.iris.manager.command.CommandIrisStudioList Data: 4505 r -MemberClass: com.volmit.iris.manager.command.CommandIrisStudioOpen Data: 4495 -MemberClass: com.volmit.iris.manager.command.CommandIrisStudioPackage Data: 4777 -MemberClass: com.volmit.iris.manager.command.CommandIrisStudioUpdate Data: 4704 +MemberClass: com.volmit.iris.manager.command.studio.CommandIrisStudioOpen Data: 4495 +MemberClass: com.volmit.iris.manager.command.studio.CommandIrisStudioPackage Data: 4777 +MemberClass: com.volmit.iris.manager.command.studio.CommandIrisStudioUpdate Data: 4704 MemberClass: com.volmit.iris.manager.command.CommandIrisStudioVerify Data: 4722 A MemberClass: com.volmit.iris.manager.command.CommandIrisTC Data: 3612 -MemberClass: com.volmit.iris.manager.command.CommandIrisWhat Data: 3865 -MemberClass: com.volmit.iris.manager.command.CommandIrisWhatBlock Data: 4356 -MemberClass: com.volmit.iris.manager.command.CommandIrisWhatHand Data: 4244 +MemberClass: com.volmit.iris.manager.command.what.CommandIrisWhat Data: 3865 +MemberClass: com.volmit.iris.manager.command.what.CommandIrisWhatBlock Data: 4356 +MemberClass: com.volmit.iris.manager.command.what.CommandIrisWhatHand Data: 4244 MemberClass: com.volmit.iris.manager.command.PermissionIris Data: 3823 MemberClass: com.volmit.iris.manager.command.PermissionIrisStudio Data: 4455 MemberClass: com.volmit.iris.generator.ContextualChunkGenerator Data: 4434 X diff --git a/lint/renaming-log.xml b/lint/renaming-log.xml index bea792454..20aaf460e 100644 --- a/lint/renaming-log.xml +++ b/lint/renaming-log.xml @@ -587,7 +587,7 @@ - + @@ -672,7 +672,7 @@ - + @@ -781,7 +781,7 @@ - + @@ -893,7 +893,7 @@ - + @@ -2476,7 +2476,7 @@ - + @@ -2668,7 +2668,7 @@ - + @@ -3435,7 +3435,7 @@ - + @@ -4113,7 +4113,7 @@ - + @@ -6064,7 +6064,7 @@ - + @@ -8532,7 +8532,7 @@ - + @@ -9128,7 +9128,7 @@ - + @@ -9462,7 +9462,7 @@ - + @@ -10004,7 +10004,7 @@ - + @@ -11873,7 +11873,7 @@ - + @@ -12817,7 +12817,7 @@ - + @@ -13103,7 +13103,7 @@ - + @@ -13907,7 +13907,7 @@ - + @@ -14973,7 +14973,7 @@ - + @@ -15194,7 +15194,7 @@ - + @@ -15301,7 +15301,7 @@ - + @@ -15385,7 +15385,7 @@ - + @@ -15480,7 +15480,7 @@ - + diff --git a/src/main/java/com/volmit/iris/Iris.java b/src/main/java/com/volmit/iris/Iris.java index d1a583767..b39583667 100644 --- a/src/main/java/com/volmit/iris/Iris.java +++ b/src/main/java/com/volmit/iris/Iris.java @@ -2,7 +2,7 @@ package com.volmit.iris; import com.volmit.iris.manager.*; import com.volmit.iris.manager.command.CommandIris; -import com.volmit.iris.manager.command.CommandLocate; +import com.volmit.iris.manager.command.world.CommandLocate; import com.volmit.iris.manager.command.PermissionIris; import com.volmit.iris.manager.link.BKLink; import com.volmit.iris.manager.link.CitizensLink; diff --git a/src/main/java/com/volmit/iris/manager/command/CommandIris.java b/src/main/java/com/volmit/iris/manager/command/CommandIris.java index 08af9100f..d75111b80 100644 --- a/src/main/java/com/volmit/iris/manager/command/CommandIris.java +++ b/src/main/java/com/volmit/iris/manager/command/CommandIris.java @@ -1,6 +1,11 @@ package com.volmit.iris.manager.command; import com.volmit.iris.Iris; +import com.volmit.iris.manager.command.jigsaw.CommandIrisJigsaw; +import com.volmit.iris.manager.command.object.CommandIrisObject; +import com.volmit.iris.manager.command.studio.CommandIrisStudio; +import com.volmit.iris.manager.command.what.CommandIrisWhat; +import com.volmit.iris.manager.command.world.*; import com.volmit.iris.util.Command; import com.volmit.iris.util.KList; import com.volmit.iris.util.MortarCommand; @@ -47,9 +52,6 @@ public class CommandIris extends MortarCommand @Command private CommandIrisReload reload; - @Command - private CommandIrisCapture capture; - public CommandIris() { super("iris", "ir", "irs"); diff --git a/src/main/java/com/volmit/iris/manager/command/CommandIrisJigsaw.java b/src/main/java/com/volmit/iris/manager/command/jigsaw/CommandIrisJigsaw.java similarity index 92% rename from src/main/java/com/volmit/iris/manager/command/CommandIrisJigsaw.java rename to src/main/java/com/volmit/iris/manager/command/jigsaw/CommandIrisJigsaw.java index 8486a9ff3..515143c5f 100644 --- a/src/main/java/com/volmit/iris/manager/command/CommandIrisJigsaw.java +++ b/src/main/java/com/volmit/iris/manager/command/jigsaw/CommandIrisJigsaw.java @@ -1,4 +1,4 @@ -package com.volmit.iris.manager.command; +package com.volmit.iris.manager.command.jigsaw; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; @@ -48,7 +48,8 @@ public class CommandIrisJigsaw extends MortarCommand sender.sendMessage("Ingame only"); return true; } - sender.sendMessage("Iris Jigsaw Commands"); + + sender.sendMessage("Iris Jigsaw Commands:"); printHelp(sender); return true; } diff --git a/src/main/java/com/volmit/iris/manager/command/CommandIrisJigsawEdit.java b/src/main/java/com/volmit/iris/manager/command/jigsaw/CommandIrisJigsawEdit.java similarity index 96% rename from src/main/java/com/volmit/iris/manager/command/CommandIrisJigsawEdit.java rename to src/main/java/com/volmit/iris/manager/command/jigsaw/CommandIrisJigsawEdit.java index efa1086d9..579a65683 100644 --- a/src/main/java/com/volmit/iris/manager/command/CommandIrisJigsawEdit.java +++ b/src/main/java/com/volmit/iris/manager/command/jigsaw/CommandIrisJigsawEdit.java @@ -1,4 +1,4 @@ -package com.volmit.iris.manager.command; +package com.volmit.iris.manager.command.jigsaw; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; diff --git a/src/main/java/com/volmit/iris/manager/command/CommandIrisJigsawNew.java b/src/main/java/com/volmit/iris/manager/command/jigsaw/CommandIrisJigsawNew.java similarity index 97% rename from src/main/java/com/volmit/iris/manager/command/CommandIrisJigsawNew.java rename to src/main/java/com/volmit/iris/manager/command/jigsaw/CommandIrisJigsawNew.java index 8583e9405..49e90f8a5 100644 --- a/src/main/java/com/volmit/iris/manager/command/CommandIrisJigsawNew.java +++ b/src/main/java/com/volmit/iris/manager/command/jigsaw/CommandIrisJigsawNew.java @@ -1,4 +1,4 @@ -package com.volmit.iris.manager.command; +package com.volmit.iris.manager.command.jigsaw; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; diff --git a/src/main/java/com/volmit/iris/manager/command/CommandIrisJigsawPlace.java b/src/main/java/com/volmit/iris/manager/command/jigsaw/CommandIrisJigsawPlace.java similarity index 97% rename from src/main/java/com/volmit/iris/manager/command/CommandIrisJigsawPlace.java rename to src/main/java/com/volmit/iris/manager/command/jigsaw/CommandIrisJigsawPlace.java index f83273dfc..822bd473c 100644 --- a/src/main/java/com/volmit/iris/manager/command/CommandIrisJigsawPlace.java +++ b/src/main/java/com/volmit/iris/manager/command/jigsaw/CommandIrisJigsawPlace.java @@ -1,4 +1,4 @@ -package com.volmit.iris.manager.command; +package com.volmit.iris.manager.command.jigsaw; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; diff --git a/src/main/java/com/volmit/iris/manager/command/CommandIrisJigsawSave.java b/src/main/java/com/volmit/iris/manager/command/jigsaw/CommandIrisJigsawSave.java similarity index 96% rename from src/main/java/com/volmit/iris/manager/command/CommandIrisJigsawSave.java rename to src/main/java/com/volmit/iris/manager/command/jigsaw/CommandIrisJigsawSave.java index 44537648f..f9335ef50 100644 --- a/src/main/java/com/volmit/iris/manager/command/CommandIrisJigsawSave.java +++ b/src/main/java/com/volmit/iris/manager/command/jigsaw/CommandIrisJigsawSave.java @@ -1,4 +1,4 @@ -package com.volmit.iris.manager.command; +package com.volmit.iris.manager.command.jigsaw; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; diff --git a/src/main/java/com/volmit/iris/manager/command/CommandIrisObject.java b/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObject.java similarity index 93% rename from src/main/java/com/volmit/iris/manager/command/CommandIrisObject.java rename to src/main/java/com/volmit/iris/manager/command/object/CommandIrisObject.java index 5d1f387cb..0042de0a0 100644 --- a/src/main/java/com/volmit/iris/manager/command/CommandIrisObject.java +++ b/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObject.java @@ -1,4 +1,4 @@ -package com.volmit.iris.manager.command; +package com.volmit.iris.manager.command.object; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; @@ -64,7 +64,7 @@ public class CommandIrisObject extends MortarCommand return true; } - sender.sendMessage("Iris Object Commands"); + sender.sendMessage("Iris Object Commands:"); printHelp(sender); return true; } diff --git a/src/main/java/com/volmit/iris/manager/command/CommandIrisObjectContract.java b/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectContract.java similarity index 97% rename from src/main/java/com/volmit/iris/manager/command/CommandIrisObjectContract.java rename to src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectContract.java index dcc80bbc1..047a980da 100644 --- a/src/main/java/com/volmit/iris/manager/command/CommandIrisObjectContract.java +++ b/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectContract.java @@ -1,4 +1,4 @@ -package com.volmit.iris.manager.command; +package com.volmit.iris.manager.command.object; import com.volmit.iris.util.*; import org.bukkit.Location; diff --git a/src/main/java/com/volmit/iris/manager/command/CommandIrisObjectDust.java b/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectDust.java similarity index 96% rename from src/main/java/com/volmit/iris/manager/command/CommandIrisObjectDust.java rename to src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectDust.java index acb04ac31..9b3160750 100644 --- a/src/main/java/com/volmit/iris/manager/command/CommandIrisObjectDust.java +++ b/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectDust.java @@ -1,4 +1,4 @@ -package com.volmit.iris.manager.command; +package com.volmit.iris.manager.command.object; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; diff --git a/src/main/java/com/volmit/iris/manager/command/CommandIrisObjectExpand.java b/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectExpand.java similarity index 97% rename from src/main/java/com/volmit/iris/manager/command/CommandIrisObjectExpand.java rename to src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectExpand.java index fb8101df6..0b9c60c7c 100644 --- a/src/main/java/com/volmit/iris/manager/command/CommandIrisObjectExpand.java +++ b/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectExpand.java @@ -1,4 +1,4 @@ -package com.volmit.iris.manager.command; +package com.volmit.iris.manager.command.object; import com.volmit.iris.util.*; import org.bukkit.Location; diff --git a/src/main/java/com/volmit/iris/manager/command/CommandIrisObjectP1.java b/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectP1.java similarity index 97% rename from src/main/java/com/volmit/iris/manager/command/CommandIrisObjectP1.java rename to src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectP1.java index 69ff8bf49..76bbcb287 100644 --- a/src/main/java/com/volmit/iris/manager/command/CommandIrisObjectP1.java +++ b/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectP1.java @@ -1,4 +1,4 @@ -package com.volmit.iris.manager.command; +package com.volmit.iris.manager.command.object; import java.util.Set; diff --git a/src/main/java/com/volmit/iris/manager/command/CommandIrisObjectP2.java b/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectP2.java similarity index 97% rename from src/main/java/com/volmit/iris/manager/command/CommandIrisObjectP2.java rename to src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectP2.java index e6af8a14b..4fe8060d1 100644 --- a/src/main/java/com/volmit/iris/manager/command/CommandIrisObjectP2.java +++ b/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectP2.java @@ -1,4 +1,4 @@ -package com.volmit.iris.manager.command; +package com.volmit.iris.manager.command.object; import java.util.Set; diff --git a/src/main/java/com/volmit/iris/manager/command/CommandIrisObjectPaste.java b/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectPaste.java similarity index 98% rename from src/main/java/com/volmit/iris/manager/command/CommandIrisObjectPaste.java rename to src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectPaste.java index 28d32059d..b09061f55 100644 --- a/src/main/java/com/volmit/iris/manager/command/CommandIrisObjectPaste.java +++ b/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectPaste.java @@ -1,4 +1,4 @@ -package com.volmit.iris.manager.command; +package com.volmit.iris.manager.command.object; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; diff --git a/src/main/java/com/volmit/iris/manager/command/CommandIrisObjectSave.java b/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectSave.java similarity index 97% rename from src/main/java/com/volmit/iris/manager/command/CommandIrisObjectSave.java rename to src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectSave.java index 8ff5f0f43..300d04038 100644 --- a/src/main/java/com/volmit/iris/manager/command/CommandIrisObjectSave.java +++ b/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectSave.java @@ -1,4 +1,4 @@ -package com.volmit.iris.manager.command; +package com.volmit.iris.manager.command.object; import java.io.File; diff --git a/src/main/java/com/volmit/iris/manager/command/CommandIrisObjectShift.java b/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectShift.java similarity index 97% rename from src/main/java/com/volmit/iris/manager/command/CommandIrisObjectShift.java rename to src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectShift.java index 08a56230f..a30274912 100644 --- a/src/main/java/com/volmit/iris/manager/command/CommandIrisObjectShift.java +++ b/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectShift.java @@ -1,4 +1,4 @@ -package com.volmit.iris.manager.command; +package com.volmit.iris.manager.command.object; import com.volmit.iris.util.*; import org.bukkit.Location; diff --git a/src/main/java/com/volmit/iris/manager/command/CommandIrisObjectWand.java b/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectWand.java similarity index 96% rename from src/main/java/com/volmit/iris/manager/command/CommandIrisObjectWand.java rename to src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectWand.java index 01ca0e6f2..5f4591de4 100644 --- a/src/main/java/com/volmit/iris/manager/command/CommandIrisObjectWand.java +++ b/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectWand.java @@ -1,4 +1,4 @@ -package com.volmit.iris.manager.command; +package com.volmit.iris.manager.command.object; import com.volmit.iris.util.KList; import org.bukkit.Sound; diff --git a/src/main/java/com/volmit/iris/manager/command/CommandIrisObjectXAY.java b/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectXAY.java similarity index 98% rename from src/main/java/com/volmit/iris/manager/command/CommandIrisObjectXAY.java rename to src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectXAY.java index 215b29994..71349c626 100644 --- a/src/main/java/com/volmit/iris/manager/command/CommandIrisObjectXAY.java +++ b/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectXAY.java @@ -1,4 +1,4 @@ -package com.volmit.iris.manager.command; +package com.volmit.iris.manager.command.object; import com.volmit.iris.util.KList; import org.bukkit.Location; diff --git a/src/main/java/com/volmit/iris/manager/command/CommandIrisObjectXPY.java b/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectXPY.java similarity index 97% rename from src/main/java/com/volmit/iris/manager/command/CommandIrisObjectXPY.java rename to src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectXPY.java index 0da7e2628..b2a3b1dcd 100644 --- a/src/main/java/com/volmit/iris/manager/command/CommandIrisObjectXPY.java +++ b/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectXPY.java @@ -1,4 +1,4 @@ -package com.volmit.iris.manager.command; +package com.volmit.iris.manager.command.object; import com.volmit.iris.util.KList; import org.bukkit.Location; diff --git a/src/main/java/com/volmit/iris/manager/command/CommandIrisStudio.java b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudio.java similarity index 94% rename from src/main/java/com/volmit/iris/manager/command/CommandIrisStudio.java rename to src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudio.java index 5f5b55e3d..159a0aa23 100644 --- a/src/main/java/com/volmit/iris/manager/command/CommandIrisStudio.java +++ b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudio.java @@ -1,4 +1,4 @@ -package com.volmit.iris.manager.command; +package com.volmit.iris.manager.command.studio; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; @@ -72,7 +72,7 @@ public class CommandIrisStudio extends MortarCommand return true; } - sender.sendMessage("Iris Studio Commands"); + sender.sendMessage("Iris Studio Commands:"); printHelp(sender); return true; } diff --git a/src/main/java/com/volmit/iris/manager/command/CommandIrisStudioClose.java b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioClose.java similarity index 97% rename from src/main/java/com/volmit/iris/manager/command/CommandIrisStudioClose.java rename to src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioClose.java index ffc5f33a2..99e545957 100644 --- a/src/main/java/com/volmit/iris/manager/command/CommandIrisStudioClose.java +++ b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioClose.java @@ -1,4 +1,4 @@ -package com.volmit.iris.manager.command; +package com.volmit.iris.manager.command.studio; import com.volmit.iris.util.KList; import org.bukkit.Bukkit; diff --git a/src/main/java/com/volmit/iris/manager/command/CommandIrisStudioConvert.java b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioConvert.java similarity index 94% rename from src/main/java/com/volmit/iris/manager/command/CommandIrisStudioConvert.java rename to src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioConvert.java index 8b6338e60..87aaeed80 100644 --- a/src/main/java/com/volmit/iris/manager/command/CommandIrisStudioConvert.java +++ b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioConvert.java @@ -1,4 +1,4 @@ -package com.volmit.iris.manager.command; +package com.volmit.iris.manager.command.studio; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; diff --git a/src/main/java/com/volmit/iris/manager/command/CommandIrisStudioCreate.java b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioCreate.java similarity index 96% rename from src/main/java/com/volmit/iris/manager/command/CommandIrisStudioCreate.java rename to src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioCreate.java index cd6b75106..972c374aa 100644 --- a/src/main/java/com/volmit/iris/manager/command/CommandIrisStudioCreate.java +++ b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioCreate.java @@ -1,4 +1,4 @@ -package com.volmit.iris.manager.command; +package com.volmit.iris.manager.command.studio; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; diff --git a/src/main/java/com/volmit/iris/manager/command/CommandIrisStudioEditBiome.java b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioEditBiome.java similarity index 96% rename from src/main/java/com/volmit/iris/manager/command/CommandIrisStudioEditBiome.java rename to src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioEditBiome.java index b391e3b8a..6b0ae1ce2 100644 --- a/src/main/java/com/volmit/iris/manager/command/CommandIrisStudioEditBiome.java +++ b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioEditBiome.java @@ -1,4 +1,4 @@ -package com.volmit.iris.manager.command; +package com.volmit.iris.manager.command.studio; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; diff --git a/src/main/java/com/volmit/iris/manager/command/CommandIrisStudioExplorer.java b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioExplorer.java similarity index 96% rename from src/main/java/com/volmit/iris/manager/command/CommandIrisStudioExplorer.java rename to src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioExplorer.java index f4b0d4dfb..5b9b39d18 100644 --- a/src/main/java/com/volmit/iris/manager/command/CommandIrisStudioExplorer.java +++ b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioExplorer.java @@ -1,4 +1,4 @@ -package com.volmit.iris.manager.command; +package com.volmit.iris.manager.command.studio; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; diff --git a/src/main/java/com/volmit/iris/manager/command/CommandIrisStudioExplorerGenerator.java b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioExplorerGenerator.java similarity index 97% rename from src/main/java/com/volmit/iris/manager/command/CommandIrisStudioExplorerGenerator.java rename to src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioExplorerGenerator.java index 52a9aa82c..dfd93f7f2 100644 --- a/src/main/java/com/volmit/iris/manager/command/CommandIrisStudioExplorerGenerator.java +++ b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioExplorerGenerator.java @@ -1,4 +1,4 @@ -package com.volmit.iris.manager.command; +package com.volmit.iris.manager.command.studio; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; diff --git a/src/main/java/com/volmit/iris/manager/command/CommandIrisStudioGoto.java b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioGoto.java similarity index 98% rename from src/main/java/com/volmit/iris/manager/command/CommandIrisStudioGoto.java rename to src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioGoto.java index fcd45785e..e143dddf3 100644 --- a/src/main/java/com/volmit/iris/manager/command/CommandIrisStudioGoto.java +++ b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioGoto.java @@ -1,4 +1,4 @@ -package com.volmit.iris.manager.command; +package com.volmit.iris.manager.command.studio; import com.volmit.iris.Iris; import com.volmit.iris.manager.IrisDataManager; diff --git a/src/main/java/com/volmit/iris/manager/command/CommandIrisStudioHotload.java b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioHotload.java similarity index 96% rename from src/main/java/com/volmit/iris/manager/command/CommandIrisStudioHotload.java rename to src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioHotload.java index b22071040..7caae5c2e 100644 --- a/src/main/java/com/volmit/iris/manager/command/CommandIrisStudioHotload.java +++ b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioHotload.java @@ -1,4 +1,4 @@ -package com.volmit.iris.manager.command; +package com.volmit.iris.manager.command.studio; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; diff --git a/src/main/java/com/volmit/iris/manager/command/CommandIrisStudioLoot.java b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioLoot.java similarity index 98% rename from src/main/java/com/volmit/iris/manager/command/CommandIrisStudioLoot.java rename to src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioLoot.java index e51e5c3b7..f475de168 100644 --- a/src/main/java/com/volmit/iris/manager/command/CommandIrisStudioLoot.java +++ b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioLoot.java @@ -1,4 +1,4 @@ -package com.volmit.iris.manager.command; +package com.volmit.iris.manager.command.studio; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; diff --git a/src/main/java/com/volmit/iris/manager/command/CommandIrisStudioMap.java b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioMap.java similarity index 96% rename from src/main/java/com/volmit/iris/manager/command/CommandIrisStudioMap.java rename to src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioMap.java index 35b070a68..1596d32f8 100644 --- a/src/main/java/com/volmit/iris/manager/command/CommandIrisStudioMap.java +++ b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioMap.java @@ -1,4 +1,4 @@ -package com.volmit.iris.manager.command; +package com.volmit.iris.manager.command.studio; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; diff --git a/src/main/java/com/volmit/iris/manager/command/CommandIrisStudioOpen.java b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioOpen.java similarity index 97% rename from src/main/java/com/volmit/iris/manager/command/CommandIrisStudioOpen.java rename to src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioOpen.java index 6b503c836..7590a9c93 100644 --- a/src/main/java/com/volmit/iris/manager/command/CommandIrisStudioOpen.java +++ b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioOpen.java @@ -1,4 +1,4 @@ -package com.volmit.iris.manager.command; +package com.volmit.iris.manager.command.studio; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; diff --git a/src/main/java/com/volmit/iris/manager/command/CommandIrisStudioPackage.java b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioPackage.java similarity index 96% rename from src/main/java/com/volmit/iris/manager/command/CommandIrisStudioPackage.java rename to src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioPackage.java index 977e0c4b8..d1cc8eed8 100644 --- a/src/main/java/com/volmit/iris/manager/command/CommandIrisStudioPackage.java +++ b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioPackage.java @@ -1,4 +1,4 @@ -package com.volmit.iris.manager.command; +package com.volmit.iris.manager.command.studio; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; diff --git a/src/main/java/com/volmit/iris/manager/command/CommandIrisStudioSummon.java b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioSummon.java similarity index 97% rename from src/main/java/com/volmit/iris/manager/command/CommandIrisStudioSummon.java rename to src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioSummon.java index 74663debe..426d6c5f5 100644 --- a/src/main/java/com/volmit/iris/manager/command/CommandIrisStudioSummon.java +++ b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioSummon.java @@ -1,4 +1,4 @@ -package com.volmit.iris.manager.command; +package com.volmit.iris.manager.command.studio; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; diff --git a/src/main/java/com/volmit/iris/manager/command/CommandIrisStudioTPStudio.java b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioTPStudio.java similarity index 96% rename from src/main/java/com/volmit/iris/manager/command/CommandIrisStudioTPStudio.java rename to src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioTPStudio.java index e7423ca7d..bcc6ca615 100644 --- a/src/main/java/com/volmit/iris/manager/command/CommandIrisStudioTPStudio.java +++ b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioTPStudio.java @@ -1,4 +1,4 @@ -package com.volmit.iris.manager.command; +package com.volmit.iris.manager.command.studio; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; diff --git a/src/main/java/com/volmit/iris/manager/command/CommandIrisStudioUpdate.java b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioUpdate.java similarity index 96% rename from src/main/java/com/volmit/iris/manager/command/CommandIrisStudioUpdate.java rename to src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioUpdate.java index 38fe63300..3cbb432cc 100644 --- a/src/main/java/com/volmit/iris/manager/command/CommandIrisStudioUpdate.java +++ b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioUpdate.java @@ -1,4 +1,4 @@ -package com.volmit.iris.manager.command; +package com.volmit.iris.manager.command.studio; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; diff --git a/src/main/java/com/volmit/iris/manager/command/CommandIrisWhat.java b/src/main/java/com/volmit/iris/manager/command/what/CommandIrisWhat.java similarity index 85% rename from src/main/java/com/volmit/iris/manager/command/CommandIrisWhat.java rename to src/main/java/com/volmit/iris/manager/command/what/CommandIrisWhat.java index 3ec752393..e8d2327f1 100644 --- a/src/main/java/com/volmit/iris/manager/command/CommandIrisWhat.java +++ b/src/main/java/com/volmit/iris/manager/command/what/CommandIrisWhat.java @@ -1,4 +1,4 @@ -package com.volmit.iris.manager.command; +package com.volmit.iris.manager.command.what; import com.volmit.iris.Iris; import com.volmit.iris.util.Command; @@ -17,6 +17,9 @@ public class CommandIrisWhat extends MortarCommand @Command private CommandIrisWhatBiome biome; + @Command + private CommandIrisWhatObjects objects; + public CommandIrisWhat() { super("what", "w", "?"); @@ -34,6 +37,7 @@ public class CommandIrisWhat extends MortarCommand @Override public boolean handle(MortarSender sender, String[] args) { + sender.sendMessage("Iris 'What' Commands:"); printHelp(sender); return true; } diff --git a/src/main/java/com/volmit/iris/manager/command/CommandIrisWhatBiome.java b/src/main/java/com/volmit/iris/manager/command/what/CommandIrisWhatBiome.java similarity index 96% rename from src/main/java/com/volmit/iris/manager/command/CommandIrisWhatBiome.java rename to src/main/java/com/volmit/iris/manager/command/what/CommandIrisWhatBiome.java index 105ca0575..957982a38 100644 --- a/src/main/java/com/volmit/iris/manager/command/CommandIrisWhatBiome.java +++ b/src/main/java/com/volmit/iris/manager/command/what/CommandIrisWhatBiome.java @@ -1,4 +1,4 @@ -package com.volmit.iris.manager.command; +package com.volmit.iris.manager.command.what; import com.volmit.iris.Iris; import com.volmit.iris.object.IrisBiome; diff --git a/src/main/java/com/volmit/iris/manager/command/CommandIrisWhatBlock.java b/src/main/java/com/volmit/iris/manager/command/what/CommandIrisWhatBlock.java similarity index 97% rename from src/main/java/com/volmit/iris/manager/command/CommandIrisWhatBlock.java rename to src/main/java/com/volmit/iris/manager/command/what/CommandIrisWhatBlock.java index 67eab2494..3faf70dd6 100644 --- a/src/main/java/com/volmit/iris/manager/command/CommandIrisWhatBlock.java +++ b/src/main/java/com/volmit/iris/manager/command/what/CommandIrisWhatBlock.java @@ -1,4 +1,4 @@ -package com.volmit.iris.manager.command; +package com.volmit.iris.manager.command.what; import com.volmit.iris.util.*; import org.bukkit.FluidCollisionMode; diff --git a/src/main/java/com/volmit/iris/manager/command/CommandIrisWhatHand.java b/src/main/java/com/volmit/iris/manager/command/what/CommandIrisWhatHand.java similarity index 97% rename from src/main/java/com/volmit/iris/manager/command/CommandIrisWhatHand.java rename to src/main/java/com/volmit/iris/manager/command/what/CommandIrisWhatHand.java index c5fe3ed8c..fe9d8f1f6 100644 --- a/src/main/java/com/volmit/iris/manager/command/CommandIrisWhatHand.java +++ b/src/main/java/com/volmit/iris/manager/command/what/CommandIrisWhatHand.java @@ -1,4 +1,4 @@ -package com.volmit.iris.manager.command; +package com.volmit.iris.manager.command.what; import com.volmit.iris.util.KList; import org.bukkit.Material; diff --git a/src/main/java/com/volmit/iris/manager/command/CommandIrisCapture.java b/src/main/java/com/volmit/iris/manager/command/what/CommandIrisWhatObjects.java similarity index 88% rename from src/main/java/com/volmit/iris/manager/command/CommandIrisCapture.java rename to src/main/java/com/volmit/iris/manager/command/what/CommandIrisWhatObjects.java index e06f5b36b..cc426b7f8 100644 --- a/src/main/java/com/volmit/iris/manager/command/CommandIrisCapture.java +++ b/src/main/java/com/volmit/iris/manager/command/what/CommandIrisWhatObjects.java @@ -1,4 +1,4 @@ -package com.volmit.iris.manager.command; +package com.volmit.iris.manager.command.what; import com.volmit.iris.Iris; import com.volmit.iris.object.IrisBiome; @@ -21,12 +21,13 @@ import java.nio.file.attribute.FileTime; import java.time.Duration; import java.time.temporal.ChronoUnit; import java.util.Date; +import java.util.Objects; -public class CommandIrisCapture extends MortarCommand +public class CommandIrisWhatObjects extends MortarCommand { - public CommandIrisCapture() + public CommandIrisWhatObjects() { - super("capture", "report", "capt"); + super("objects", "o", "obj", "capture", "capt"); setDescription("Capture nearby information to help with reporting problems"); requiresPermission(Iris.perm.studio); setCategory("World"); @@ -80,10 +81,11 @@ public class CommandIrisCapture extends MortarCommand File ff = Iris.instance.getDataFile("reports/" + M.ms() + ".txt"); PrintWriter pw = new PrintWriter(ff); pw.println("=== Iris Chunk Report ==="); + pw.println("== General Info =="); pw.println("Iris Version: " + Iris.instance.getDescription().getVersion()); pw.println("Bukkit Version: " + Bukkit.getBukkitVersion()); pw.println("MC Version: " + Bukkit.getVersion()); - pw.println("PaperSpigot: " + (PaperLib.isPaper() ? "Yup!" : "Not Paper")); + pw.println("PaperSpigot: " + (PaperLib.isPaper() ? "Yup!" : "Nope!")); pw.println("Report Captured At: " + new Date().toString()); pw.println("Chunks: (" + chunks.size() + "): "); @@ -98,7 +100,7 @@ public class CommandIrisCapture extends MortarCommand try { - for(File i : new File(world.getWorldFolder(), "region").listFiles()) + for(File i : Objects.requireNonNull(new File(world.getWorldFolder(), "region").listFiles())) { if(i.isFile()) { @@ -107,7 +109,7 @@ public class CommandIrisCapture extends MortarCommand } } - catch(Throwable e) + catch(Throwable ignored) { } @@ -117,7 +119,7 @@ public class CommandIrisCapture extends MortarCommand FileTime creationTime = (FileTime) Files.getAttribute(world.getWorldFolder().toPath(), "creationTime"); age = hrf(Duration.of(M.ms() - creationTime.toMillis(), ChronoUnit.MILLIS)); } - catch(IOException ex) + catch(IOException ignored) { } @@ -130,18 +132,11 @@ public class CommandIrisCapture extends MortarCommand { for(int j = 0; j < 16; j += 3) { - if(j >= 16) - { - continue; - } for(int k = 0; k < 16; k += 3) { - if(k >= 16) - { - continue; - } + assert g != null; IrisBiome bb = g.getBiome((i.getX() * 16) + j, (i.getZ() * 16) + k); IrisBiome bxf = g.getCaveBiome((i.getX() * 16) + j, (i.getZ() * 16) + k); biomes.addIfMissing(bb.getName() + " [" + Form.capitalize(bb.getInferredType().name().toLowerCase()) + "] " + " (" + bb.getLoadFile().getName() + ")"); @@ -152,16 +147,18 @@ public class CommandIrisCapture extends MortarCommand } } + regions = Objects.requireNonNull(new File(world.getWorldFolder().getPath() + "/region").list()).length; + pw.println(); - pw.println("====== World Info ======="); + pw.println("== World Info =="); pw.println("World Name: " + world.getName()); pw.println("Age: " + age); pw.println("Folder: " + world.getWorldFolder().getPath()); pw.println("Regions: " + Form.f(regions)); - pw.println("Chunks: <" + Form.f(regions * 32 * 32)); - pw.println("World Size: >" + Form.fileSize(size)); + pw.println("Chunks: max. " + Form.f(regions * 32 * 32)); + pw.println("World Size: min. " + Form.fileSize(size)); pw.println(); - pw.println("===== Nearby Biomes ====="); + pw.println("== Biome Info =="); pw.println("Found " + biomes.size() + " Biome(s): "); for(String i : biomes) @@ -170,16 +167,7 @@ public class CommandIrisCapture extends MortarCommand } pw.println(); - pw.println("Found " + caveBiomes.size() + " Underground Biome(s): "); - - for(String i : caveBiomes) - { - pw.println("- " + i); - } - - pw.println(); - - pw.println("======== Objects ========"); + pw.println("== Object Info =="); for(String i : objects.k()) { diff --git a/src/main/java/com/volmit/iris/manager/command/CommandIrisCreate.java b/src/main/java/com/volmit/iris/manager/command/world/CommandIrisCreate.java similarity index 98% rename from src/main/java/com/volmit/iris/manager/command/CommandIrisCreate.java rename to src/main/java/com/volmit/iris/manager/command/world/CommandIrisCreate.java index 5a631ae9f..f99f92ce4 100644 --- a/src/main/java/com/volmit/iris/manager/command/CommandIrisCreate.java +++ b/src/main/java/com/volmit/iris/manager/command/world/CommandIrisCreate.java @@ -1,4 +1,4 @@ -package com.volmit.iris.manager.command; +package com.volmit.iris.manager.command.world; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; @@ -19,7 +19,7 @@ public class CommandIrisCreate extends MortarCommand { public CommandIrisCreate() { - super("create", "new", "+"); + super("create", "c", "cr", "new", "+"); requiresPermission(Iris.perm.studio); setCategory("Create"); setDescription("Create a new Iris World!"); diff --git a/src/main/java/com/volmit/iris/manager/command/CommandIrisFix.java b/src/main/java/com/volmit/iris/manager/command/world/CommandIrisFix.java similarity index 97% rename from src/main/java/com/volmit/iris/manager/command/CommandIrisFix.java rename to src/main/java/com/volmit/iris/manager/command/world/CommandIrisFix.java index 1ec9b5080..6c883fefd 100644 --- a/src/main/java/com/volmit/iris/manager/command/CommandIrisFix.java +++ b/src/main/java/com/volmit/iris/manager/command/world/CommandIrisFix.java @@ -1,4 +1,4 @@ -package com.volmit.iris.manager.command; +package com.volmit.iris.manager.command.world; import com.volmit.iris.Iris; import com.volmit.iris.scaffold.IrisWorlds; diff --git a/src/main/java/com/volmit/iris/manager/command/CommandIrisPregen.java b/src/main/java/com/volmit/iris/manager/command/world/CommandIrisPregen.java similarity index 98% rename from src/main/java/com/volmit/iris/manager/command/CommandIrisPregen.java rename to src/main/java/com/volmit/iris/manager/command/world/CommandIrisPregen.java index 65a46ba22..c46d850ac 100644 --- a/src/main/java/com/volmit/iris/manager/command/CommandIrisPregen.java +++ b/src/main/java/com/volmit/iris/manager/command/world/CommandIrisPregen.java @@ -1,4 +1,4 @@ -package com.volmit.iris.manager.command; +package com.volmit.iris.manager.command.world; import com.volmit.iris.Iris; import com.volmit.iris.pregen.Pregenerator; diff --git a/src/main/java/com/volmit/iris/manager/command/CommandIrisRegen.java b/src/main/java/com/volmit/iris/manager/command/world/CommandIrisRegen.java similarity index 97% rename from src/main/java/com/volmit/iris/manager/command/CommandIrisRegen.java rename to src/main/java/com/volmit/iris/manager/command/world/CommandIrisRegen.java index ee47ac819..e271af18e 100644 --- a/src/main/java/com/volmit/iris/manager/command/CommandIrisRegen.java +++ b/src/main/java/com/volmit/iris/manager/command/world/CommandIrisRegen.java @@ -1,4 +1,4 @@ -package com.volmit.iris.manager.command; +package com.volmit.iris.manager.command.world; import com.volmit.iris.Iris; import com.volmit.iris.util.KList; diff --git a/src/main/java/com/volmit/iris/manager/command/CommandIrisUpdateWorld.java b/src/main/java/com/volmit/iris/manager/command/world/CommandIrisUpdateWorld.java similarity index 95% rename from src/main/java/com/volmit/iris/manager/command/CommandIrisUpdateWorld.java rename to src/main/java/com/volmit/iris/manager/command/world/CommandIrisUpdateWorld.java index f484368b2..1ab7d4ff9 100644 --- a/src/main/java/com/volmit/iris/manager/command/CommandIrisUpdateWorld.java +++ b/src/main/java/com/volmit/iris/manager/command/world/CommandIrisUpdateWorld.java @@ -1,4 +1,4 @@ -package com.volmit.iris.manager.command; +package com.volmit.iris.manager.command.world; import java.io.File; diff --git a/src/main/java/com/volmit/iris/manager/command/CommandLocate.java b/src/main/java/com/volmit/iris/manager/command/world/CommandLocate.java similarity index 97% rename from src/main/java/com/volmit/iris/manager/command/CommandLocate.java rename to src/main/java/com/volmit/iris/manager/command/world/CommandLocate.java index 168429034..39efdbf8f 100644 --- a/src/main/java/com/volmit/iris/manager/command/CommandLocate.java +++ b/src/main/java/com/volmit/iris/manager/command/world/CommandLocate.java @@ -1,4 +1,4 @@ -package com.volmit.iris.manager.command; +package com.volmit.iris.manager.command.world; import com.volmit.iris.Iris; import com.volmit.iris.scaffold.IrisWorlds;