From cf397524ffeae777f4970d036409070f2819840c Mon Sep 17 00:00:00 2001
From: Jesse Boyd <jessepaleg@gmail.com>
Date: Wed, 22 Jun 2016 16:02:50 +1000
Subject: [PATCH] Fix other forge compile issues

---
 .../com/boydti/fawe/wrappers/LocationMaskedPlayerWrapper.java | 1 -
 forge1710/src/main/java/com/boydti/fawe/forge/ForgeMain.java  | 2 +-
 forge189/src/main/java/com/boydti/fawe/forge/ForgeMain.java   | 2 +-
 sponge/src/main/java/com/boydti/fawe/sponge/FaweSponge.java   | 2 +-
 sponge/src/main/java/com/boydti/fawe/sponge/SpongeMain.java   | 2 +-
 .../java/com/boydti/fawe/sponge/v1_8/SpongeQueue_ALL.java     | 4 ++--
 6 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/core/src/main/java/com/boydti/fawe/wrappers/LocationMaskedPlayerWrapper.java b/core/src/main/java/com/boydti/fawe/wrappers/LocationMaskedPlayerWrapper.java
index 4bdd38ce..3fc5d575 100644
--- a/core/src/main/java/com/boydti/fawe/wrappers/LocationMaskedPlayerWrapper.java
+++ b/core/src/main/java/com/boydti/fawe/wrappers/LocationMaskedPlayerWrapper.java
@@ -36,7 +36,6 @@ public class LocationMaskedPlayerWrapper extends PlayerWrapper {
 
     @Override
     public void setPosition(Vector pos, float pitch, float yaw) {
-        System.out.println("SET POSITION");
         this.position = pos;
     }
 }
diff --git a/forge1710/src/main/java/com/boydti/fawe/forge/ForgeMain.java b/forge1710/src/main/java/com/boydti/fawe/forge/ForgeMain.java
index b35bed61..b49efea9 100644
--- a/forge1710/src/main/java/com/boydti/fawe/forge/ForgeMain.java
+++ b/forge1710/src/main/java/com/boydti/fawe/forge/ForgeMain.java
@@ -67,7 +67,7 @@ public class ForgeMain {
         FawePlayer fp = FawePlayer.wrap(player);
         if (fp.getMeta("lastWorld") != event.world) {
             fp.setMeta("lastWorld", event.world);
-            if (Settings.STORE_HISTORY_ON_DISK) {
+            if (Settings.HISTORY.USE_DISK) {
                 fp.getSession().clearHistory();
                 fp.loadSessionsFromDisk(fp.getWorld());
             }
diff --git a/forge189/src/main/java/com/boydti/fawe/forge/ForgeMain.java b/forge189/src/main/java/com/boydti/fawe/forge/ForgeMain.java
index d0556a68..38633cdb 100644
--- a/forge189/src/main/java/com/boydti/fawe/forge/ForgeMain.java
+++ b/forge189/src/main/java/com/boydti/fawe/forge/ForgeMain.java
@@ -67,7 +67,7 @@ public class ForgeMain {
         FawePlayer fp = FawePlayer.wrap(player);
         if (fp.getMeta("lastWorld") != event.world) {
             fp.setMeta("lastWorld", event.world);
-            if (Settings.STORE_HISTORY_ON_DISK) {
+            if (Settings.HISTORY.USE_DISK) {
                 fp.getSession().clearHistory();
                 fp.loadSessionsFromDisk(fp.getWorld());
             }
diff --git a/sponge/src/main/java/com/boydti/fawe/sponge/FaweSponge.java b/sponge/src/main/java/com/boydti/fawe/sponge/FaweSponge.java
index 3aa3cf1a..46c17b35 100644
--- a/sponge/src/main/java/com/boydti/fawe/sponge/FaweSponge.java
+++ b/sponge/src/main/java/com/boydti/fawe/sponge/FaweSponge.java
@@ -111,7 +111,7 @@ public class FaweSponge implements IFawe {
 
     @Override
     public FaweQueue getNewQueue(String world, boolean fast) {
-        if (fast || Settings.COMBINE_HISTORY_STAGE) {
+        if (fast || Settings.HISTORY.COMBINE_STAGES) {
             try {
                 return new SpongeQueue_1_8(world);
             } catch (Throwable e) {
diff --git a/sponge/src/main/java/com/boydti/fawe/sponge/SpongeMain.java b/sponge/src/main/java/com/boydti/fawe/sponge/SpongeMain.java
index 14e9e506..05de2a2f 100644
--- a/sponge/src/main/java/com/boydti/fawe/sponge/SpongeMain.java
+++ b/sponge/src/main/java/com/boydti/fawe/sponge/SpongeMain.java
@@ -64,7 +64,7 @@ public class SpongeMain {
 
     @Listener
     public void onMove(DisplaceEntityEvent.TargetPlayer event) {
-        if (Settings.STORE_HISTORY_ON_DISK) {
+        if (Settings.HISTORY.USE_DISK) {
             World from = event.getFromTransform().getExtent();
             World to = event.getToTransform().getExtent();
             if (!from.equals(to)) {
diff --git a/sponge/src/main/java/com/boydti/fawe/sponge/v1_8/SpongeQueue_ALL.java b/sponge/src/main/java/com/boydti/fawe/sponge/v1_8/SpongeQueue_ALL.java
index be3d0615..972545e2 100644
--- a/sponge/src/main/java/com/boydti/fawe/sponge/v1_8/SpongeQueue_ALL.java
+++ b/sponge/src/main/java/com/boydti/fawe/sponge/v1_8/SpongeQueue_ALL.java
@@ -236,7 +236,7 @@ public class SpongeQueue_ALL extends NMSMappedFaweQueue<World, net.minecraft.wor
     @Override
     public boolean setComponents(FaweChunk fc, RunnableVal<FaweChunk> changeTask) {
         if (changeTask != null) {
-            Settings.COMBINE_HISTORY_STAGE = false;
+            Settings.HISTORY.COMBINE_STAGES = false;
             throw new UnsupportedOperationException("Combine stages not supported");
         }
         SpongeChunk_1_8 fs = (SpongeChunk_1_8) fc;
@@ -296,7 +296,7 @@ public class SpongeQueue_ALL extends NMSMappedFaweQueue<World, net.minecraft.wor
 
     @Override
     public CharFaweChunk getPrevious(CharFaweChunk fs, ExtendedBlockStorage[] sections, Map<?, ?> tilesGeneric, Collection<?>[] entitiesGeneric, Set<UUID> createdEntities, boolean all) throws Exception {
-        Settings.COMBINE_HISTORY_STAGE = false;
+        Settings.HISTORY.COMBINE_STAGES = false;
         throw new UnsupportedOperationException("Combine stages not supported");
     }