From 166fe75b68ac4257cca710560873b6ac22ca8ff4 Mon Sep 17 00:00:00 2001
From: Konloch <konloch@gmail.com>
Date: Sat, 26 Jun 2021 08:10:02 -0700
Subject: [PATCH] Resource Cleanup

---
 .../java/the/bytecode/club/bytecodeviewer/BytecodeViewer.java | 2 +-
 .../the/bytecode/club/bytecodeviewer/gui/MainViewerGUI.java   | 4 ++--
 .../{util => }/resources/ResourceDecompiling.java             | 2 +-
 .../{util => }/resources/ResourceExporting.java               | 2 +-
 .../{util => }/resources/importing/ImportResource.java        | 2 +-
 .../{util => }/resources/importing/ImportType.java            | 4 ++--
 .../{util => }/resources/importing/Importer.java              | 2 +-
 .../resources/importing/impl/APKResourceImporter.java         | 4 ++--
 .../resources/importing/impl/ClassResourceImporter.java       | 4 ++--
 .../resources/importing/impl/DEXResourceImporter.java         | 4 ++--
 .../resources/importing/impl/DirectoryResourceImporter.java   | 4 ++--
 .../resources/importing/impl/FileResourceImporter.java        | 4 ++--
 .../resources/importing/impl/ZipResourceImporter.java         | 4 ++--
 13 files changed, 21 insertions(+), 21 deletions(-)
 rename src/main/java/the/bytecode/club/bytecodeviewer/{util => }/resources/ResourceDecompiling.java (99%)
 rename src/main/java/the/bytecode/club/bytecodeviewer/{util => }/resources/ResourceExporting.java (99%)
 rename src/main/java/the/bytecode/club/bytecodeviewer/{util => }/resources/importing/ImportResource.java (97%)
 rename src/main/java/the/bytecode/club/bytecodeviewer/{util => }/resources/importing/ImportType.java (76%)
 rename src/main/java/the/bytecode/club/bytecodeviewer/{util => }/resources/importing/Importer.java (68%)
 rename src/main/java/the/bytecode/club/bytecodeviewer/{util => }/resources/importing/impl/APKResourceImporter.java (92%)
 rename src/main/java/the/bytecode/club/bytecodeviewer/{util => }/resources/importing/impl/ClassResourceImporter.java (89%)
 rename src/main/java/the/bytecode/club/bytecodeviewer/{util => }/resources/importing/impl/DEXResourceImporter.java (91%)
 rename src/main/java/the/bytecode/club/bytecodeviewer/{util => }/resources/importing/impl/DirectoryResourceImporter.java (91%)
 rename src/main/java/the/bytecode/club/bytecodeviewer/{util => }/resources/importing/impl/FileResourceImporter.java (82%)
 rename src/main/java/the/bytecode/club/bytecodeviewer/{util => }/resources/importing/impl/ZipResourceImporter.java (80%)

diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/BytecodeViewer.java b/src/main/java/the/bytecode/club/bytecodeviewer/BytecodeViewer.java
index 0ac28695..4b483834 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/BytecodeViewer.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/BytecodeViewer.java
@@ -32,7 +32,7 @@ import the.bytecode.club.bytecodeviewer.gui.resourceviewer.viewer.ResourceViewer
 import the.bytecode.club.bytecodeviewer.obfuscators.mapping.Refactorer;
 import the.bytecode.club.bytecodeviewer.plugin.PluginManager;
 import the.bytecode.club.bytecodeviewer.util.*;
-import the.bytecode.club.bytecodeviewer.util.resources.importing.ImportResource;
+import the.bytecode.club.bytecodeviewer.resources.importing.ImportResource;
 
 import static the.bytecode.club.bytecodeviewer.Constants.*;
 
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/MainViewerGUI.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/MainViewerGUI.java
index 4c761d79..33b4f864 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/gui/MainViewerGUI.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/gui/MainViewerGUI.java
@@ -35,8 +35,8 @@ import the.bytecode.club.bytecodeviewer.plugin.preinstalled.StackFramesRemover;
 import the.bytecode.club.bytecodeviewer.plugin.preinstalled.ZKMStringDecrypter;
 import the.bytecode.club.bytecodeviewer.plugin.preinstalled.ZStringArrayDecrypter;
 import the.bytecode.club.bytecodeviewer.util.*;
-import the.bytecode.club.bytecodeviewer.util.resources.ResourceDecompiling;
-import the.bytecode.club.bytecodeviewer.util.resources.ResourceExporting;
+import the.bytecode.club.bytecodeviewer.resources.ResourceDecompiling;
+import the.bytecode.club.bytecodeviewer.resources.ResourceExporting;
 
 import static the.bytecode.club.bytecodeviewer.Constants.*;
 
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/util/resources/ResourceDecompiling.java b/src/main/java/the/bytecode/club/bytecodeviewer/resources/ResourceDecompiling.java
similarity index 99%
rename from src/main/java/the/bytecode/club/bytecodeviewer/util/resources/ResourceDecompiling.java
rename to src/main/java/the/bytecode/club/bytecodeviewer/resources/ResourceDecompiling.java
index 84ce24bc..298baf23 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/util/resources/ResourceDecompiling.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/resources/ResourceDecompiling.java
@@ -1,4 +1,4 @@
-package the.bytecode.club.bytecodeviewer.util.resources;
+package the.bytecode.club.bytecodeviewer.resources;
 
 import me.konloch.kontainer.io.DiskWriter;
 import org.objectweb.asm.ClassWriter;
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/util/resources/ResourceExporting.java b/src/main/java/the/bytecode/club/bytecodeviewer/resources/ResourceExporting.java
similarity index 99%
rename from src/main/java/the/bytecode/club/bytecodeviewer/util/resources/ResourceExporting.java
rename to src/main/java/the/bytecode/club/bytecodeviewer/resources/ResourceExporting.java
index a9ac0040..5b13130a 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/util/resources/ResourceExporting.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/resources/ResourceExporting.java
@@ -1,4 +1,4 @@
-package the.bytecode.club.bytecodeviewer.util.resources;
+package the.bytecode.club.bytecodeviewer.resources;
 
 import the.bytecode.club.bytecodeviewer.BytecodeViewer;
 import the.bytecode.club.bytecodeviewer.Configuration;
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/util/resources/importing/ImportResource.java b/src/main/java/the/bytecode/club/bytecodeviewer/resources/importing/ImportResource.java
similarity index 97%
rename from src/main/java/the/bytecode/club/bytecodeviewer/util/resources/importing/ImportResource.java
rename to src/main/java/the/bytecode/club/bytecodeviewer/resources/importing/ImportResource.java
index f2b10451..0de6562a 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/util/resources/importing/ImportResource.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/resources/importing/ImportResource.java
@@ -1,4 +1,4 @@
-package the.bytecode.club.bytecodeviewer.util.resources.importing;
+package the.bytecode.club.bytecodeviewer.resources.importing;
 
 import the.bytecode.club.bytecodeviewer.BytecodeViewer;
 import the.bytecode.club.bytecodeviewer.api.ExceptionUI;
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/util/resources/importing/ImportType.java b/src/main/java/the/bytecode/club/bytecodeviewer/resources/importing/ImportType.java
similarity index 76%
rename from src/main/java/the/bytecode/club/bytecodeviewer/util/resources/importing/ImportType.java
rename to src/main/java/the/bytecode/club/bytecodeviewer/resources/importing/ImportType.java
index d822d4fb..26281e2f 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/util/resources/importing/ImportType.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/resources/importing/ImportType.java
@@ -1,6 +1,6 @@
-package the.bytecode.club.bytecodeviewer.util.resources.importing;
+package the.bytecode.club.bytecodeviewer.resources.importing;
 
-import the.bytecode.club.bytecodeviewer.util.resources.importing.impl.*;
+import the.bytecode.club.bytecodeviewer.resources.importing.impl.*;
 
 /**
  * @author Konloch
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/util/resources/importing/Importer.java b/src/main/java/the/bytecode/club/bytecodeviewer/resources/importing/Importer.java
similarity index 68%
rename from src/main/java/the/bytecode/club/bytecodeviewer/util/resources/importing/Importer.java
rename to src/main/java/the/bytecode/club/bytecodeviewer/resources/importing/Importer.java
index 565bd44f..56dafda6 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/util/resources/importing/Importer.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/resources/importing/Importer.java
@@ -1,4 +1,4 @@
-package the.bytecode.club.bytecodeviewer.util.resources.importing;
+package the.bytecode.club.bytecodeviewer.resources.importing;
 
 import java.io.File;
 
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/util/resources/importing/impl/APKResourceImporter.java b/src/main/java/the/bytecode/club/bytecodeviewer/resources/importing/impl/APKResourceImporter.java
similarity index 92%
rename from src/main/java/the/bytecode/club/bytecodeviewer/util/resources/importing/impl/APKResourceImporter.java
rename to src/main/java/the/bytecode/club/bytecodeviewer/resources/importing/impl/APKResourceImporter.java
index b1273bed..324ae5ef 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/util/resources/importing/impl/APKResourceImporter.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/resources/importing/impl/APKResourceImporter.java
@@ -1,10 +1,10 @@
-package the.bytecode.club.bytecodeviewer.util.resources.importing.impl;
+package the.bytecode.club.bytecodeviewer.resources.importing.impl;
 
 import org.apache.commons.io.FileUtils;
 import the.bytecode.club.bytecodeviewer.BytecodeViewer;
 import the.bytecode.club.bytecodeviewer.api.ExceptionUI;
+import the.bytecode.club.bytecodeviewer.resources.importing.Importer;
 import the.bytecode.club.bytecodeviewer.util.*;
-import the.bytecode.club.bytecodeviewer.util.resources.importing.Importer;
 
 import java.io.File;
 import java.util.Objects;
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/util/resources/importing/impl/ClassResourceImporter.java b/src/main/java/the/bytecode/club/bytecodeviewer/resources/importing/impl/ClassResourceImporter.java
similarity index 89%
rename from src/main/java/the/bytecode/club/bytecodeviewer/util/resources/importing/impl/ClassResourceImporter.java
rename to src/main/java/the/bytecode/club/bytecodeviewer/resources/importing/impl/ClassResourceImporter.java
index 421b9223..b5ce4436 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/util/resources/importing/impl/ClassResourceImporter.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/resources/importing/impl/ClassResourceImporter.java
@@ -1,11 +1,11 @@
-package the.bytecode.club.bytecodeviewer.util.resources.importing.impl;
+package the.bytecode.club.bytecodeviewer.resources.importing.impl;
 
 import org.objectweb.asm.tree.ClassNode;
 import the.bytecode.club.bytecodeviewer.BytecodeViewer;
 import the.bytecode.club.bytecodeviewer.api.ExceptionUI;
+import the.bytecode.club.bytecodeviewer.resources.importing.Importer;
 import the.bytecode.club.bytecodeviewer.util.FileContainer;
 import the.bytecode.club.bytecodeviewer.util.JarUtils;
-import the.bytecode.club.bytecodeviewer.util.resources.importing.Importer;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/util/resources/importing/impl/DEXResourceImporter.java b/src/main/java/the/bytecode/club/bytecodeviewer/resources/importing/impl/DEXResourceImporter.java
similarity index 91%
rename from src/main/java/the/bytecode/club/bytecodeviewer/util/resources/importing/impl/DEXResourceImporter.java
rename to src/main/java/the/bytecode/club/bytecodeviewer/resources/importing/impl/DEXResourceImporter.java
index ed782622..d14be645 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/util/resources/importing/impl/DEXResourceImporter.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/resources/importing/impl/DEXResourceImporter.java
@@ -1,10 +1,10 @@
-package the.bytecode.club.bytecodeviewer.util.resources.importing.impl;
+package the.bytecode.club.bytecodeviewer.resources.importing.impl;
 
 import org.apache.commons.io.FileUtils;
 import the.bytecode.club.bytecodeviewer.BytecodeViewer;
 import the.bytecode.club.bytecodeviewer.api.ExceptionUI;
+import the.bytecode.club.bytecodeviewer.resources.importing.Importer;
 import the.bytecode.club.bytecodeviewer.util.*;
-import the.bytecode.club.bytecodeviewer.util.resources.importing.Importer;
 
 import java.io.File;
 
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/util/resources/importing/impl/DirectoryResourceImporter.java b/src/main/java/the/bytecode/club/bytecodeviewer/resources/importing/impl/DirectoryResourceImporter.java
similarity index 91%
rename from src/main/java/the/bytecode/club/bytecodeviewer/util/resources/importing/impl/DirectoryResourceImporter.java
rename to src/main/java/the/bytecode/club/bytecodeviewer/resources/importing/impl/DirectoryResourceImporter.java
index ec64d487..a3f57cfb 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/util/resources/importing/impl/DirectoryResourceImporter.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/resources/importing/impl/DirectoryResourceImporter.java
@@ -1,8 +1,8 @@
-package the.bytecode.club.bytecodeviewer.util.resources.importing.impl;
+package the.bytecode.club.bytecodeviewer.resources.importing.impl;
 
 import the.bytecode.club.bytecodeviewer.BytecodeViewer;
+import the.bytecode.club.bytecodeviewer.resources.importing.Importer;
 import the.bytecode.club.bytecodeviewer.util.FileContainer;
-import the.bytecode.club.bytecodeviewer.util.resources.importing.Importer;
 
 import java.io.File;
 import java.nio.file.Files;
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/util/resources/importing/impl/FileResourceImporter.java b/src/main/java/the/bytecode/club/bytecodeviewer/resources/importing/impl/FileResourceImporter.java
similarity index 82%
rename from src/main/java/the/bytecode/club/bytecodeviewer/util/resources/importing/impl/FileResourceImporter.java
rename to src/main/java/the/bytecode/club/bytecodeviewer/resources/importing/impl/FileResourceImporter.java
index 3036e7e8..4f32b29a 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/util/resources/importing/impl/FileResourceImporter.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/resources/importing/impl/FileResourceImporter.java
@@ -1,9 +1,9 @@
-package the.bytecode.club.bytecodeviewer.util.resources.importing.impl;
+package the.bytecode.club.bytecodeviewer.resources.importing.impl;
 
 import the.bytecode.club.bytecodeviewer.BytecodeViewer;
+import the.bytecode.club.bytecodeviewer.resources.importing.Importer;
 import the.bytecode.club.bytecodeviewer.util.FileContainer;
 import the.bytecode.club.bytecodeviewer.util.JarUtils;
-import the.bytecode.club.bytecodeviewer.util.resources.importing.Importer;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/util/resources/importing/impl/ZipResourceImporter.java b/src/main/java/the/bytecode/club/bytecodeviewer/resources/importing/impl/ZipResourceImporter.java
similarity index 80%
rename from src/main/java/the/bytecode/club/bytecodeviewer/util/resources/importing/impl/ZipResourceImporter.java
rename to src/main/java/the/bytecode/club/bytecodeviewer/resources/importing/impl/ZipResourceImporter.java
index 077ce5da..405e3d79 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/util/resources/importing/impl/ZipResourceImporter.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/resources/importing/impl/ZipResourceImporter.java
@@ -1,8 +1,8 @@
-package the.bytecode.club.bytecodeviewer.util.resources.importing.impl;
+package the.bytecode.club.bytecodeviewer.resources.importing.impl;
 
 import the.bytecode.club.bytecodeviewer.api.ExceptionUI;
+import the.bytecode.club.bytecodeviewer.resources.importing.Importer;
 import the.bytecode.club.bytecodeviewer.util.JarUtils;
-import the.bytecode.club.bytecodeviewer.util.resources.importing.Importer;
 
 import java.io.File;
 import java.io.IOException;