updates

Author: nicol

src/main/java/org/magic/servers/impl/DiscordBotServer.java

@@ -34,7 +34,6 @@
 import org.magic.api.sorters.PricesCardsShakeSorter;
 import org.magic.api.sorters.PricesCardsShakeSorter.SORT;
 import org.magic.services.MTGConstants;
-import org.magic.services.tools.MTG;
 import org.magic.services.tools.UITools;
 
 import com.github.ygimenez.method.Pages;
@@ -196,7 +195,7 @@ private void reponseSetSearch(SlashCommandInteractionEvent event, MessageInfo in
 	try {
 	    var ed = getEnabledPlugin(MTGCardsProvider.class)
 		    .getSetByName(event.getOption(COMMAND_OPTION_SETNAME).getAsString());
-	    var results = MTG.getEnabledPlugin(MTGDashBoard.class).getShakesForEdition(ed).getShakes();
+	    var results = getEnabledPlugin(MTGDashBoard.class).getShakesForEdition(ed).getShakes();
 
 	    var up = results.stream().sorted(new PricesCardsShakeSorter(SORT.DAY_PERCENT_CHANGE, false))
 		    .limit(getInt(CARD_SHAKE_LIMIT));
@@ -231,7 +230,7 @@ private void reponseFormatSearch(SlashCommandInteractionEvent event, MessageInfo
 	eb.setTitle(event.getOption(COMMAND_OPTION_FORMATNAME).getAsString());
 	try {
 
-	    var results = MTG.getEnabledPlugin(MTGDashBoard.class)
+	    var results = getEnabledPlugin(MTGDashBoard.class)
 		    .getShakerFor(FORMATS.valueOf(event.getOption(COMMAND_OPTION_FORMATNAME).getAsString()));
 
 	    var up = results.stream().sorted(new PricesCardsShakeSorter(SORT.DAY_PERCENT_CHANGE, false))
@@ -247,7 +246,7 @@ else if (cs.getPercentDayChange() < 0)
 		    icon = ":arrow_lower_right: ";
 
 		try {
-		    var ed = MTG.getEnabledPlugin(MTGCardsProvider.class).getSetById(cs.getEd());
+		    var ed = getEnabledPlugin(MTGCardsProvider.class).getSetById(cs.getEd());
 
 		    eb.addField(cs.getName() + " (" + ed + ")",
 			    icon + UITools.formatDouble(cs.getPercentDayChange() * 100) + "% " + " : " + cs.getPrice(),
@@ -343,9 +342,9 @@ private MessageEmbed createCardEmbedMessage(MTGCard mc, boolean price, MessageIn
 	}
 
 	if (getString(THUMBNAIL_IMAGE).equalsIgnoreCase(THUMBNAIL))
-	    eb.setThumbnail(MTG.getEnabledPlugin(MTGPictureProvider.class).generateUrl(mc, false));
+	    eb.setThumbnail(getEnabledPlugin(MTGPictureProvider.class).generateUrl(mc, false));
 	else
-	    eb.setImage(MTG.getEnabledPlugin(MTGPictureProvider.class).generateUrl(mc, false));
+	    eb.setImage(getEnabledPlugin(MTGPictureProvider.class).generateUrl(mc, false));
 
 	if (price) {
 

src/main/java/org/magic/services/PluginRegistry.java

@@ -333,11 +333,11 @@ public <T extends MTGPlugin> List<T> listEnabledPlugins(Class<T> t) {
 	}
 
 	public <T extends MTGPlugin> T getEnabledPlugins(Class<T> t) {
-		return listPlugins(t).stream().filter(MTGPlugin::isEnable).findFirst().orElse(null);
+		return listPlugins(t).stream().filter(MTGPlugin::isEnable).findFirst().get();
 	}
 
 	public MTGPlugin getPluginById(String id) {
-		return listPlugins().stream().filter(p -> p.getId().equals(id)).findFirst().orElse(null);
+		return listPlugins().stream().filter(p -> p.getId().equals(id)).findFirst().get();
 	}
 
 }

src/main/java/org/magic/services/tools/MTG.java

@@ -36,8 +36,7 @@ public static <T extends MTGPlugin> T getEnabledPlugin(Class<T> t) {
 	}
 
 	public static <T extends MTGPlugin> List<T> listEnabledPlugins(Class<T> t) {
-		return PluginRegistry.inst().listEnabledPlugins(t).stream().sorted(Comparator.comparing(MTGPlugin::getName))
-				.toList();
+		return PluginRegistry.inst().listEnabledPlugins(t).stream().sorted(Comparator.comparing(MTGPlugin::getName)).toList();
 	}
 
 	public static <T extends MTGPlugin> T getPlugin(String name, Class<T> type) {