6 files changed, 5 insertions, 64 deletions

diff --git a/src/main/java/oml/ast/transformers/InvalidIdentifierFix.java b/src/main/java/cuchaz/enigma/source/procyon/transformers/InvalidIdentifierFix.java
index 3e052ded..34d95fa5 100644
--- a/src/main/java/oml/ast/transformers/InvalidIdentifierFix.java
+++ b/src/main/java/cuchaz/enigma/source/procyon/transformers/InvalidIdentifierFix.java
@@ -1,4 +1,4 @@
-package oml.ast.transformers;
+package cuchaz.enigma.source.procyon.transformers;
 
 import com.strobel.decompiler.languages.java.ast.AstNode;
 import com.strobel.decompiler.languages.java.ast.DepthFirstAstVisitor;
diff --git a/src/main/java/oml/ast/transformers/Java8Generics.java b/src/main/java/cuchaz/enigma/source/procyon/transformers/Java8Generics.java
index 0f8a84c1..8accfc7c 100644
--- a/src/main/java/oml/ast/transformers/Java8Generics.java
+++ b/src/main/java/cuchaz/enigma/source/procyon/transformers/Java8Generics.java
@@ -1,4 +1,4 @@
-package oml.ast.transformers;
+package cuchaz.enigma.source.procyon.transformers;
 
 import com.strobel.assembler.metadata.BuiltinTypes;
 import com.strobel.assembler.metadata.CommonTypeReferences;
diff --git a/src/main/java/oml/ast/transformers/ObfuscatedEnumSwitchRewriterTransform.java b/src/main/java/cuchaz/enigma/source/procyon/transformers/ObfuscatedEnumSwitchRewriterTransform.java
index 6005b7f7..32bb72f4 100644
--- a/src/main/java/oml/ast/transformers/ObfuscatedEnumSwitchRewriterTransform.java
+++ b/src/main/java/cuchaz/enigma/source/procyon/transformers/ObfuscatedEnumSwitchRewriterTransform.java
@@ -15,7 +15,7 @@
  * You must not remove this notice, or any other, from this software.
  */
 
-package oml.ast.transformers;
+package cuchaz.enigma.source.procyon.transformers;
 
 import com.strobel.assembler.metadata.BuiltinTypes;
 import com.strobel.assembler.metadata.FieldDefinition;
diff --git a/src/main/java/oml/ast/transformers/RemoveObjectCasts.java b/src/main/java/cuchaz/enigma/source/procyon/transformers/RemoveObjectCasts.java
index d7c3c4a6..cf0376f3 100644
--- a/src/main/java/oml/ast/transformers/RemoveObjectCasts.java
+++ b/src/main/java/cuchaz/enigma/source/procyon/transformers/RemoveObjectCasts.java
@@ -1,4 +1,4 @@
-package oml.ast.transformers;
+package cuchaz.enigma.source.procyon.transformers;
 
 import com.strobel.assembler.metadata.BuiltinTypes;
 import com.strobel.decompiler.DecompilerContext;
diff --git a/src/main/java/oml/ast/transformers/VarargsFixer.java b/src/main/java/cuchaz/enigma/source/procyon/transformers/VarargsFixer.java
index 5810373d..d3ddaab6 100644
--- a/src/main/java/oml/ast/transformers/VarargsFixer.java
+++ b/src/main/java/cuchaz/enigma/source/procyon/transformers/VarargsFixer.java
@@ -1,4 +1,4 @@
-package oml.ast.transformers;
+package cuchaz.enigma.source.procyon.transformers;
 
 import com.strobel.assembler.metadata.MemberReference;
 import com.strobel.assembler.metadata.MetadataFilters;
diff --git a/src/main/java/oml/ExtraClasspathTypeLoader.java b/src/main/java/oml/ExtraClasspathTypeLoader.java
deleted file mode 100644
index f8ec2e0c..00000000
--- a/src/main/java/oml/ExtraClasspathTypeLoader.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package oml;
-
-import com.strobel.assembler.metadata.Buffer;
-import com.strobel.assembler.metadata.ITypeLoader;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.Arrays;
-
-/**
- * Copy of ClasspathTypeLoader supporting a classpath constructor.
- */
-public class ExtraClasspathTypeLoader implements ITypeLoader {
-        private final ClassLoader _loader;
-
-        public ExtraClasspathTypeLoader(String extraClasspath){
-                _loader = new URLClassLoader(Arrays.stream(extraClasspath.split(File.pathSeparator)).map(path-> {
-                        try {
-                                return new File(path).toURI().toURL();
-                        } catch (MalformedURLException e) {
-                                throw new RuntimeException(e);
-                        }
-                }).toArray(URL[]::new));
-        }
-
-        @Override
-        public boolean tryLoadType(final String internalName, final Buffer buffer) {
-
-                final String path = internalName.concat(".class");
-                final URL resource = _loader.getResource(path);
-
-                if (resource == null) {
-                        return false;
-                }
-
-                try (final InputStream stream = _loader.getResourceAsStream(path)) {
-                        final byte[] temp = new byte[4096];
-
-                        int bytesRead;
-
-                        while ((bytesRead = stream.read(temp, 0, temp.length)) > 0) {
-                                //buffer.ensureWriteableBytes(bytesRead);
-                                buffer.putByteArray(temp, 0, bytesRead);
-                        }
-
-                        buffer.flip();
-
-
-                        return true;
-                }
-                catch (final IOException ignored) {
-                        return false;
-                }
-        }
-}