From d818d9790004e23d45f24f374bd5467f5275ace8 Mon Sep 17 00:00:00 2001
From: Collin Smith <collinsmith70@gmail.com>
Date: Sat, 9 Mar 2019 16:14:30 -0800
Subject: [PATCH] Removed virtual MPQ file support

Removed virtual MPQ file support -- was for previous version where I was making fake assets
Other minor changes
See #8 on some MPQ read issues I've noticed
---
 core/src/com/riiablo/mpq/MPQ.java                   |  5 ++---
 core/src/com/riiablo/mpq/MPQFileHandle.java         |  2 +-
 core/src/com/riiablo/mpq/MPQFileHandleResolver.java | 12 +-----------
 core/src/com/riiablo/mpq/VirtualMPQFileHandle.java  |  9 ---------
 core/src/com/riiablo/mpq/virtual/VirtualUtils.java  |  9 ---------
 5 files changed, 4 insertions(+), 33 deletions(-)
 delete mode 100644 core/src/com/riiablo/mpq/VirtualMPQFileHandle.java
 delete mode 100644 core/src/com/riiablo/mpq/virtual/VirtualUtils.java

diff --git a/core/src/com/riiablo/mpq/MPQ.java b/core/src/com/riiablo/mpq/MPQ.java
index 7817766b..155c1e4c 100644
--- a/core/src/com/riiablo/mpq/MPQ.java
+++ b/core/src/com/riiablo/mpq/MPQ.java
@@ -5,6 +5,7 @@ import com.badlogic.gdx.files.FileHandle;
 import com.badlogic.gdx.utils.GdxRuntimeException;
 import com.badlogic.gdx.utils.StreamUtils;
 import com.riiablo.mpq.util.Decryptor;
+import com.riiablo.util.BufferUtils;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringEscapeUtils;
@@ -18,11 +19,9 @@ import java.nio.ByteOrder;
 import java.nio.channels.FileChannel;
 import java.util.Objects;
 
-import com.riiablo.util.BufferUtils;
-
 public class MPQ {
   private static final String TAG = MPQ.class.getSimpleName();
-  private static final boolean DEBUG = false;
+  private static final boolean DEBUG = !true;
 
   final FileHandle file;
   final Header     header;
diff --git a/core/src/com/riiablo/mpq/MPQFileHandle.java b/core/src/com/riiablo/mpq/MPQFileHandle.java
index d13d635d..6d3df2f9 100644
--- a/core/src/com/riiablo/mpq/MPQFileHandle.java
+++ b/core/src/com/riiablo/mpq/MPQFileHandle.java
@@ -10,7 +10,7 @@ import java.io.InputStream;
 public class MPQFileHandle extends FileHandle {
   private static final String TAG = "MPQFileHandle";
 
-  public final MPQ    mpq;
+  public final MPQ mpq;
   public final String fileName;
 
   public MPQFileHandle(MPQ mpq, String fileName) {
diff --git a/core/src/com/riiablo/mpq/MPQFileHandleResolver.java b/core/src/com/riiablo/mpq/MPQFileHandleResolver.java
index 8450d0f1..42203096 100644
--- a/core/src/com/riiablo/mpq/MPQFileHandleResolver.java
+++ b/core/src/com/riiablo/mpq/MPQFileHandleResolver.java
@@ -8,7 +8,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
 
 public class MPQFileHandleResolver implements FileHandleResolver {
   private static final String TAG = "MPQFileHandleResolver";
-  private static final boolean DEBUG = false;
+  private static final boolean DEBUG = !true;
 
   private final CopyOnWriteArrayList<MPQ> mpqs = new CopyOnWriteArrayList<>();
 
@@ -21,10 +21,6 @@ public class MPQFileHandleResolver implements FileHandleResolver {
   }
 
   public boolean contains(String fileName) {
-    if (fileName.startsWith("virtual:")) {
-      return true;
-    }
-
     for (MPQ mpq : mpqs) {
       if (mpq.contains(fileName)) {
         return true;
@@ -38,12 +34,6 @@ public class MPQFileHandleResolver implements FileHandleResolver {
   public FileHandle resolve(String fileName) {
     if (DEBUG) Gdx.app.debug(TAG, "Resolving " + fileName);
     if (fileName == null) return null;
-    if (fileName.startsWith("virtual:")) {
-      fileName = fileName.substring(8);
-      if (DEBUG) Gdx.app.debug(TAG, "Resolving virtual file " + fileName);
-      return new VirtualMPQFileHandle(fileName);
-    }
-
     for (MPQ mpq : mpqs) {
       if (mpq.contains(fileName)) {
         if (DEBUG) Gdx.app.debug(TAG, fileName + " found in " + mpq);
diff --git a/core/src/com/riiablo/mpq/VirtualMPQFileHandle.java b/core/src/com/riiablo/mpq/VirtualMPQFileHandle.java
deleted file mode 100644
index c65fd891..00000000
--- a/core/src/com/riiablo/mpq/VirtualMPQFileHandle.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.riiablo.mpq;
-
-public class VirtualMPQFileHandle extends MPQFileHandle {
-
-  VirtualMPQFileHandle(String fileName) {
-    super(null, fileName);
-  }
-
-}
diff --git a/core/src/com/riiablo/mpq/virtual/VirtualUtils.java b/core/src/com/riiablo/mpq/virtual/VirtualUtils.java
deleted file mode 100644
index 9a0a2b1a..00000000
--- a/core/src/com/riiablo/mpq/virtual/VirtualUtils.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.riiablo.mpq.virtual;
-
-public class VirtualUtils {
-  private VirtualUtils() {}
-
-  public static String createPalettePath(String palette) {
-    return "data/global/palette/" + palette + "/pal.dat";
-  }
-}