From 1ec55c2d7ee21ae6542a944927790b148262ac4a Mon Sep 17 00:00:00 2001
From: GJ <gjmcferrin@gmail.com>
Date: Mon, 16 Sep 2013 12:05:39 -0400
Subject: [PATCH] Remove the last bits of Spout from our code.

---
 src/main/java/com/gmail/nossr50/mcMMO.java          |  5 -----
 .../com/gmail/nossr50/skills/repair/Repair.java     | 12 ------------
 .../net/shatteredlands/shatt/backup/ZipLibrary.java |  5 -----
 src/main/resources/locale/locale_en_US.properties   | 13 -------------
 4 files changed, 35 deletions(-)

diff --git a/src/main/java/com/gmail/nossr50/mcMMO.java b/src/main/java/com/gmail/nossr50/mcMMO.java
index 817c1369c..6cf665bfd 100644
--- a/src/main/java/com/gmail/nossr50/mcMMO.java
+++ b/src/main/java/com/gmail/nossr50/mcMMO.java
@@ -76,7 +76,6 @@ public class mcMMO extends JavaPlugin {
     private boolean updateAvailable;
 
     /* Plugin Checks */
-    private static boolean spoutEnabled;
     private static boolean combatTagEnabled;
 
     // Config Validation Check
@@ -257,10 +256,6 @@ public class mcMMO extends JavaPlugin {
         mcMMO.databaseManager = databaseManager;
     }
 
-    public static boolean isSpoutEnabled() {
-        return spoutEnabled;
-    }
-
     public static boolean isCombatTagEnabled() {
         return combatTagEnabled;
     }
diff --git a/src/main/java/com/gmail/nossr50/skills/repair/Repair.java b/src/main/java/com/gmail/nossr50/skills/repair/Repair.java
index cffd474ee..7af95af10 100644
--- a/src/main/java/com/gmail/nossr50/skills/repair/Repair.java
+++ b/src/main/java/com/gmail/nossr50/skills/repair/Repair.java
@@ -53,18 +53,6 @@ public class Repair {
         return "";
     }
 
-    public static String[] getSpoutAnvilMessages(Material type) {
-        if (type == repairAnvilMaterial) {
-            return new String[] {LocaleLoader.getString("Repair.AnvilPlaced.Spout1"), LocaleLoader.getString("Repair.AnvilPlaced.Spout2")};
-        }
-
-        if (type == salvageAnvilMaterial) {
-            return new String[] {"[mcMMO] Anvil Placed", "Right click to salvage!"}; //TODO: Localize
-        }
-
-        return new String[] {"", ""};
-    }
-
     /**
      * Search the inventory for an item and return the index.
      *
diff --git a/src/main/java/net/shatteredlands/shatt/backup/ZipLibrary.java b/src/main/java/net/shatteredlands/shatt/backup/ZipLibrary.java
index 0e55aadf6..14dabb272 100644
--- a/src/main/java/net/shatteredlands/shatt/backup/ZipLibrary.java
+++ b/src/main/java/net/shatteredlands/shatt/backup/ZipLibrary.java
@@ -23,7 +23,6 @@ public class ZipLibrary {
     private static File ConfigFile = new File(mcMMO.getMainDirectory() + "config.yml");
     private static File TreasuresFile = new File(mcMMO.getMainDirectory() + "treasures.yml");
     private static File AdvancedConfigFile = new File(mcMMO.getMainDirectory() + "advanced.yml");
-    private static File SpoutFile = new File(mcMMO.getMainDirectory() + "spout.yml");
     private static File RepairFile = new File(mcMMO.getMainDirectory() + "repair.vanilla.yml");
 
     public static void mcMMObackup() throws IOException {
@@ -59,10 +58,6 @@ public class ZipLibrary {
             sources.add(ModFileDirectory);
         }
 
-        if (SpoutFile.exists()) {
-            sources.add(SpoutFile);
-        }
-
         // Actually do something
         mcMMO.p.debug("Backing up your mcMMO Configuration... ");
 
diff --git a/src/main/resources/locale/locale_en_US.properties b/src/main/resources/locale/locale_en_US.properties
index 3a5f2ffc0..fdb57ae60 100644
--- a/src/main/resources/locale/locale_en_US.properties
+++ b/src/main/resources/locale/locale_en_US.properties
@@ -202,8 +202,6 @@ Mining.Blast.Other.On=[[GREEN]]{0}[[DARK_GREEN]] has used [[RED]]Blast Mining!
 Mining.Blast.Refresh=[[GREEN]]Your [[YELLOW]]Blast Mining [[GREEN]]ability is refreshed!
 
 #REPAIR
-Repair.AnvilPlaced.Spout1=[mcMMO] Anvil Placed
-Repair.AnvilPlaced.Spout2=Right click to repair!
 Repair.Effect.0=Repair
 Repair.Effect.1=Repair Tools & Armor
 Repair.Effect.10=Gold Repair ({0}+ SKILL)
@@ -700,17 +698,6 @@ Hardcore.Vampirism.Victim.Failure=[[GOLD]][mcMMO] [[YELLOW]]{0}[[GRAY]] was unab
 Hardcore.Vampirism.Victim.Success=[[GOLD]][mcMMO] [[YELLOW]]{0}[[DARK_RED]] has stolen [[BLUE]]{1}[[DARK_RED]] levels from you!
 Hardcore.Vampirism.PercentageChanged=[[GOLD]][mcMMO] The stat leech percentage was changed to {0}.
 
-#SPOUT
-Spout.Donate=[[YELLOW]][mcMMO] Donate!
-Spout.LevelUp.1=[[GREEN]]Level Up!
-Spout.LevelUp.2=[[YELLOW]]{0}[[DARK_AQUA]] ([[GREEN]]{1}[[DARK_AQUA]])
-Spout.Menu.Exit=[[GRAY]]Press ESCAPE to exit!
-Spout.Menu.ExitButton=EXIT
-Spout.Menu.HudButton.1=HUD Type: {0}
-Spout.Menu.HudButton.2=Change your HUD style!
-Spout.Menu.Title=[[GOLD]]~mcMMO Menu~
-Spout.Title={0}\n[[YELLOW]]P[[GOLD]]lvl[[WHITE]].[[GREEN]]{1}
-
 #MOTD
 MOTD.Donate=[[DARK_AQUA]]Donation Info:
 MOTD.Hardcore.Enabled=[[GOLD]][mcMMO] [[DARK_AQUA]]Hardcore Mode enabled: [[DARK_RED]]{0}