Merge pull request #108 from Raieverr/master

Plugin Cleanup and Organization

runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java

@@ -65,9 +65,9 @@ import net.runelite.client.util.ImageUtil;
 @PluginDescriptor(
 	name = "Barbarian Assault",
 	description = "Show a timer to the next call change and game/wave duration in chat.",
-	tags = {"minigame", "overlay", "timer"},
-	type = PluginType.PVM
+	tags = {"minigame", "overlay", "timer"}
 )
+
 public class BarbarianAssaultPlugin extends Plugin {
 	private static final int BA_WAVE_NUM_INDEX = 2;
 	private static final String START_WAVE = "1";

runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java

@@ -282,14 +282,24 @@ public interface MenuEntrySwapperConfig extends Config
 	{
 		return true;
 	}
+	
+	@ConfigItem(
+		keyName = "rockCake",
+		name = "Rock Cake Guzzle",
+		description = "Enables Left Click Guzzle to Rock Cake"
+	)
+	default boolean rockCake() 
+	{ 
+		return false;
+	}
 
 	@ConfigItem(
-			keyName = "swapRogueschests",
-			name = "Rogueschests",
-			description = "Swap Rogueschests from open to Search for traps"
+		keyName = "swapRogueschests",
+		name = "Rogueschests",
+		description = "Swap Rogueschests from open to Search for traps"
 	)
 	default boolean swapRogueschests()
 	{
 		return true;
 	}
-}
+}

runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java

@@ -450,30 +450,32 @@ public class MenuEntrySwapperPlugin extends Plugin
 				swap("quick-travel", option, target, true);
 			}
 		}
+		
 		else if (config.swapTravel() && option.equals("pass") && target.equals("energy barrier"))
 		{
 			swap("pay-toll(2-ecto)", option, target, true);
 		}
+		
 		else if (config.swapTravel() && option.equals("open") && target.equals("gate"))
 		{
 			swap("pay-toll(10gp)", option, target, true);
 		}
+		
 		else if (config.swapTravel() && option.equals("inspect") && target.equals("trapdoor"))
 		{
 			swap("travel", option, target, true);
 		}
-		else if (config.swapTravel() && option.equals("board") && target.equals("travel cart"))
-		{
-			swap("pay-fare", option, target, true);
-		}
+		
 		else if (config.swapHarpoon() && option.equals("cage"))
 		{
 			swap("harpoon", option, target, true);
 		}
+		
 		else if (config.swapHarpoon() && (option.equals("big net") || option.equals("net")))
 		{
 			swap("harpoon", option, target, true);
 		}
+		
 		else if (config.swapHomePortal() != HouseMode.ENTER && option.equals("enter"))
 		{
 			switch (config.swapHomePortal())
@@ -501,57 +503,76 @@ public class MenuEntrySwapperPlugin extends Plugin
 				swap("configure", option, target, false);
 			}
 		}
+		
 		else if (config.swapFairyRing() == FairyRingMode.ZANARIS && option.equals("tree"))
 		{
 			swap("zanaris", option, target, false);
 		}
+		
 		else if (config.swapBoxTrap() && (option.equals("check") || option.equals("dismantle")))
 		{
 			swap("reset", option, target, true);
 		}
+		
 		else if (config.swapBoxTrap() && option.equals("take"))
 		{
 			swap("lay", option, target, true);
 		}
+		
 		else if (config.swapChase() && option.equals("pick-up"))
 		{
 			swap("chase", option, target, true);
 		}
+		
 		else if (config.swapBirdhouseEmpty() && option.equals("interact") && target.contains("birdhouse"))
 		{
 			swap("empty", option, target, true);
 		}
+		
 		else if (config.swapQuick() && option.equals("ring"))
 		{
 			swap("quick-start", option, target, true);
 		}
+		
 		else if (config.swapQuick() && option.equals("pass"))
 		{
 			swap("quick-pass", option, target, true);
 			swap("quick pass", option, target, true);
 		}
+		
 		else if (config.swapQuick() && option.equals("open"))
 		{
 			swap("quick-open", option, target, true);
 		}
+		
 		else if (config.swapAdmire() && option.equals("admire"))
 		{
 			swap("teleport", option, target, true);
 			swap("spellbook", option, target, true);
 			swap("perks", option, target, true);
 		}
+		
 		else if (config.swapPrivate() && option.equals("shared"))
 		{
 			swap("private", option, target, true);
 		}
+		
 		else if (config.swapPick() && option.equals("pick"))
 		{
 			swap("pick-lots", option, target, true);
 		}
+		
 		else if (config.swapRogueschests() && target.contains("chest"))
 		{
 			swap("search for traps", option, target, true);
 		}
+		
+		else if (config.rockCake() && option.equals("eat"))
+		{
+			swap("guzzle", option, target, true); 
+		}
+		
+		
 		else if (config.shiftClickCustomization() && shiftModifier && !option.equals("use"))
 		{
 			Integer customOption = getSwapConfig(eventId);
@@ -561,6 +582,7 @@ public class MenuEntrySwapperPlugin extends Plugin
 				swap("use", option, target, true);
 			}
 		}
+		
 		// Put all item-related swapping after shift-click
 		else if (config.swapTeleportItem() && option.equals("wear"))
 		{

runelite-client/src/main/java/net/runelite/client/plugins/musicmodifier/MusicCustomizerPlugin.java

@@ -37,11 +37,13 @@ import net.runelite.client.plugins.PluginDescriptor;
 
 import javax.inject.Inject;
 import java.io.File;
+import net.runelite.client.plugins.PluginType;
 
 @PluginDescriptor(
     name = "Music Track Customizer",
     description = "Customize what track plays and how it sounds, with local files",
     tags = {"music", "sound"},
+    type = PluginType.UTILITY,
     enabledByDefault = false
 )
 

runelite-client/src/main/java/net/runelite/client/plugins/smelting/SmeltingPlugin.java

@@ -38,13 +38,15 @@ import net.runelite.client.eventbus.Subscribe;
 import net.runelite.client.plugins.Plugin;
 import net.runelite.client.plugins.PluginDependency;
 import net.runelite.client.plugins.PluginDescriptor;
+import net.runelite.client.plugins.PluginType;
 import net.runelite.client.plugins.xptracker.XpTrackerPlugin;
 import net.runelite.client.ui.overlay.OverlayManager;
 
 @PluginDescriptor(
 		name = "Smelting",
 		description = "Show Smelting stats",
-		tags = {"overlay", "skilling"}
+		tags = {"overlay", "skilling"},
+		type = PluginType.UTILITY
 )
 @PluginDependency(XpTrackerPlugin.class)
 public class SmeltingPlugin extends Plugin
@@ -127,4 +129,3 @@ public class SmeltingPlugin extends Plugin
 		}
 	}
 }
-

runelite-client/src/main/java/net/runelite/client/plugins/tarnslair/TarnsLairPlugin.java

@@ -44,13 +44,16 @@ import net.runelite.api.events.GroundObjectSpawned;
 import net.runelite.client.eventbus.Subscribe;
 import net.runelite.client.plugins.Plugin;
 import net.runelite.client.plugins.PluginDescriptor;
+import net.runelite.client.plugins.PluginType;
 import net.runelite.client.ui.overlay.OverlayManager;
 
 @PluginDescriptor(
 	name = "Tarn's Lair",
 	description = "Mark tiles and clickboxes to help traverse the maze",
-	tags = {"agility", "maze", "minigame", "overlay"}
+	tags = {"agility", "maze", "minigame", "overlay"},
+	type = PluginType.UTILITY
 )
+
 @Slf4j
 public class TarnsLairPlugin extends Plugin
 {

runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathPlugin.java

@@ -21,7 +21,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
 import net.runelite.client.util.ImageUtil;
 
 @PluginDescriptor(
-	name = "Vorkath",
+	name = "Vorkath Helper",
 	description = "Count vorkath attacks, and which phase is coming next",
 	tags = {"combat", "overlay", "pve", "pvm"},
 	type = PluginType.PVM
@@ -192,4 +192,4 @@ public class VorkathPlugin extends Plugin
 			vorkath.setLastTickAnimation(animationId);
 		}
 	}
-}
+}