Merge remote-tracking branch 'upstream/master' into idlelele

README.md

@@ -15,7 +15,8 @@
 - [cache](cache/src/main/java/net/runelite/cache) - Libraries used for reading/writing cache files, as well as the data in it
 - [deobfuscator](deobfuscator/src/main/java/net/runelite/deob) - Can decompile and cleanup gamepacks as well as map updates to newer revs
 - [http-api](http-api/src/main/java/net/runelite/http/api) - API for runelite and runeliteplus
-- [http-service](http-service/src/main/java/net/runelite/http/service) - Service for https://api.runelitepl.us
+- [http-service](http-service/src/main/java/net/runelite/http/service) - Service for https://api.runelite.net
+- [http-service-plus](http-service-plus/src/main/java/net/runelite/http/service) - Service for https://api.runelitepl.us
 - [injector-plugin](injector-plugin/src/main/java/net/runelite/injector) - Tool for implementing our modifications to the gamepack
 - [runelite-api](runelite-api/src/main/java/net/runelite/api) - RuneLite API, interfaces for accessing the client
 - [runelite-mixins](runelite-mixins/src/main/java/net/runelite) - Classes containing the Objects to be injected using the injector-plugin

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

@@ -1628,11 +1628,23 @@ public interface MenuEntrySwapperConfig extends Config
 		return false;
 	}
 
+	@ConfigItem(
+		keyName = "hideDestroyLootingBag",
+		name = "Hide Destroy on Looting bag",
+		description = "Hides the 'Destroy' option when right clicking a Looting bag.",
+		position = 5,
+		group = "Untradeables"
+	)
+	default boolean hideDestroyLootingBag()
+	{
+		return false;
+	}
+
 	@ConfigItem(
 		keyName = "hideDropRunecraftingPouch",
 		name = "Hide Drop on RC pouches",
 		description = "Hides the 'Drop' option when right clicking a Small, Medium, Large, or Giant pouch.",
-		position = 5,
+		position = 6,
 		group = "Untradeables"
 	)
 	default boolean hideDropRunecraftingPouch()

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

@@ -305,6 +305,7 @@ public class MenuEntrySwapperPlugin extends Plugin
 	private boolean hideDestroyHerbsack;
 	private boolean hideDestroyBoltpouch;
 	private boolean hideDestroyGembag;
+	private boolean hideDestroyLootingBag;
 	private boolean hideDropRunecraftingPouch;
 	private boolean hideCastToB;
 	private Set<String> hideCastIgnoredToB;
@@ -569,6 +570,10 @@ public class MenuEntrySwapperPlugin extends Plugin
 				{
 					continue;
 				}
+				if (this.hideDestroyLootingBag && entry.getTarget().contains("Looting bag"))
+				{
+					continue;
+				}
 				if (this.hideDestroyGembag && entry.getTarget().contains("Gem bag"))
 				{
 					continue;
@@ -1924,6 +1929,7 @@ public class MenuEntrySwapperPlugin extends Plugin
 		this.hideDestroyCoalbag = config.hideDestroyCoalbag();
 		this.hideDestroyHerbsack = config.hideDestroyHerbsack();
 		this.hideDestroyBoltpouch = config.hideDestroyBoltpouch();
+		this.hideDestroyLootingBag = config.hideDestroyLootingBag();
 		this.hideDestroyGembag = config.hideDestroyGembag();
 		this.hideDropRunecraftingPouch = config.hideDropRunecraftingPouch();
 		this.hideCastToB = config.hideCastToB();