source clean

src/main/java/org/magic/api/beans/abstracts/AbstractMessage.java

@@ -6,7 +6,9 @@
 import java.util.UUID;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.logging.log4j.Logger;
 import org.magic.game.model.Player;
+import org.magic.services.logging.MTGLogger;
 import org.magic.services.tools.CryptoUtils;
 
 public abstract class AbstractMessage extends AbstractAuditableItem {
@@ -19,7 +21,8 @@ public enum MSG_TYPE { CONNECT, CHANGESTATUS, DISCONNECT, TALK, SYSTEM, SEARCH,
 	private MSG_TYPE  typeMessage;
 	private String message;
 	private Color color;
-
+	protected transient Logger logger = MTGLogger.getLogger(this.getClass());
+
 
 	protected AbstractMessage() {
 		setId(CryptoUtils.generateMD5(UUID.randomUUID().toString()+new Date()+typeMessage));

src/main/java/org/magic/api/beans/enums/EnumExtra.java

@@ -11,7 +11,7 @@ public enum EnumExtra {
 	VIP ("vip"),
 	WELCOME("default"),	
 	JUMP ("jumpstart"),
-	INTRO("default"),
+	INTRO("intro"),
 	PLANESWALKER("default"),
 	STARTER("starter"),
 	BRAWL("default");

src/main/java/org/magic/api/beans/enums/EnumItems.java

@@ -15,6 +15,7 @@ public enum EnumItems
 	CHALLENGERDECK ("Challenger deck"),
 	FATPACK ("Fat Pack"),
 	DECK ("Deck"),  
+	COMMANDER_DECK ("Commander Deck"),
 	CASE ("Case of Sealed product"), 
 	DRAFT_PACK ("3 boosters pack"),
 	WELCOME ("Welcome pack");

src/main/java/org/magic/api/beans/messages/TalkMessage.java

@@ -1,15 +1,15 @@
 package org.magic.api.beans.messages;
 
 import java.awt.Color;
+import java.util.regex.Pattern;
 
 import org.magic.api.beans.abstracts.AbstractMessage;
 
 public class TalkMessage extends AbstractMessage{
 
 	private static final long serialVersionUID = 1L;
-
+	private static final String REGEX = "\\{(.*?)\\}";
 
-
 
 	public String toChatString() {
 		return getAuthor().getName() + " : " + getMessage();
@@ -19,6 +19,16 @@ public TalkMessage(String message, Color color) {
 		setTypeMessage(MSG_TYPE.TALK);
 		setMessage(message);
 		setColor(color);
+
+		var m = Pattern.compile(REGEX).matcher(message);
+		if(m.find())
+		{
+			logger.info("founnd card");
+		}
+
 	}
 
+
+
+
 }

src/main/java/org/magic/api/network/impl/ActiveMQNetworkClient.java

@@ -126,10 +126,13 @@ public void disableConsummer() {
 
 	@Override
 	protected String read() throws IOException {
-		ClientMessage msg;
+		ClientMessage msg=null;
 		try {
-			msg = consumer.receive();
-			logger.debug("consume {}",msg);
+
+			if(!consumer.isClosed()) {
+				msg = consumer.receive();
+				logger.debug("consume {}",msg);
+			}
 		} catch (ActiveMQException e) {
 			throw new IOException(e);
 		}

src/main/java/org/magic/api/providers/impl/Mtgjson5Provider.java

@@ -702,6 +702,8 @@ private MagicEdition generateEdition(String id) {
 					sp.setTypeProduct(parseType(el.getAsJsonObject().get("category").getAsString()));
 					sp.setNum(itemId++);
 					sp.setLang("en");
+
+					if(el.getAsJsonObject().get("subtype")!=null) {
 					var extra=el.getAsJsonObject().get("subtype").getAsString();
 
 					if(extra.equals("starter"))
@@ -713,8 +715,7 @@ private MagicEdition generateEdition(String id) {
 						sp.setExtra(parseExtra(extra));	
 					}
 
-
-
+					}
 					if(sp.getName().contains(" Gift "))
 						sp.setExtra(EnumExtra.GIFT);
 
@@ -763,7 +764,7 @@ private EnumItems parseType(String category) {
 			case "bundle" : return EnumItems.BUNDLE;
 			case "prerelease_pack" : return EnumItems.PRERELEASEPACK;
 			case "deck" : return EnumItems.DECK;
-			case "commander_deck" : return EnumItems.DECK;
+			case "commander_deck" : return EnumItems.COMMANDER_DECK;
 			case "draft_set": return EnumItems.DRAFT_PACK;
 			default : return null;
 		}

src/main/java/org/magic/gui/components/NetworkChatPanel.java

@@ -10,6 +10,7 @@
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -88,7 +89,7 @@ public NetworkChatPanel() {
 		editorPane = new JTextArea();
 		var panel1 = new JPanel();
 		btnColorChoose = new JButton(MTGConstants.ICON_GAME_COLOR);
-		cboStates = UITools.createCombobox(EnumPlayerStatus.values());
+		cboStates = UITools.createCombobox(Arrays.asList(EnumPlayerStatus.values()).stream().filter(s->s!=EnumPlayerStatus.CONNECTED).filter(s->s!=EnumPlayerStatus.DISCONNECTED).toList());
 		var panelChatBox = new JPanel();
 		txtServer.setText(MTGControler.getInstance().get("network-config/network-last-server", ActiveMQServer.DEFAULT_SERVER));
 		txtServer.setColumns(10);
@@ -102,8 +103,7 @@ public NetworkChatPanel() {
 		listPlayers.setCellRenderer(new PlayerRenderer());
 		listMsg.setCellRenderer(new MessageRenderer());
 
-		btnSearch = new JButton("Search");
-
+		btnSearch = UITools.createBindableJButton("", MTGConstants.ICON_SEARCH_24,KeyEvent.VK_S,"searchquery");
 		try {
 			editorPane.setForeground(new Color(Integer.parseInt(MTGControler.getInstance().get("/game/player-profil/foreground"))));
 		} catch (Exception e) {
@@ -127,8 +127,8 @@ public NetworkChatPanel() {
 		panelChatBox.add(editorPane, BorderLayout.CENTER);
 		panelChatBox.add(panel1, BorderLayout.NORTH);
 
-		panel1.add(btnColorChoose);
 		panel1.add(cboStates);
+		panel1.add(btnColorChoose);
 		panel1.add(btnSearch);
 
 
@@ -294,6 +294,7 @@ protected void done() {
 				}
 				catch(Exception e)
 				{
+					e.printStackTrace();
 					logger.error(e);
 				}
 
@@ -320,7 +321,7 @@ protected void process(List<AbstractMessage> chunks) {
 
 				for(var s : chunks)
 				{
-					
+
 					switch(s.getTypeMessage())
 					{
 						case CHANGESTATUS: 
@@ -367,9 +368,10 @@ protected void process(List<AbstractMessage> chunks) {
 
 						default:break;
 					}
+
 				}
+
 				listPlayers.updateUI();
-
 
 				listMsg.ensureIndexIsVisible( listMsg.getModel().getSize() - 1 );
 

src/main/java/org/magic/gui/renderer/MessageRenderer.java

@@ -15,8 +15,23 @@ public class MessageRenderer implements ListCellRenderer<AbstractMessage> {
 	@Override
 	public Component getListCellRendererComponent(JList<? extends AbstractMessage> list, AbstractMessage value, int index,boolean isSelected, boolean cellHasFocus) {
 		var panel = new JPanel();
+		var pane = new JsonMessagePanel(value);
 		panel.setLayout(new BorderLayout());
 		panel.add(new JPanel(),BorderLayout.NORTH);
-		panel.add(new JsonMessagePanel(value),BorderLayout.CENTER);
+		panel.add(pane,BorderLayout.CENTER);
+		pane.setOpaque(true);
+
+		if(isSelected)
+		{
+			pane.setBackground(list.getSelectionBackground());
+			pane.setForeground(list.getSelectionForeground());
+		}
+		else
+		{
+			pane.setBackground(list.getBackground());
+			pane.setForeground(list.getForeground());
+		}
+
+
 		return panel;
 	}}