Skip to content

Commit 606fc0b

Browse files
nicolnicol
authored andcommitted
manapool updates
1 parent 21e4ed7 commit 606fc0b

File tree

4 files changed

+13
-10
lines changed

4 files changed

+13
-10
lines changed

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,14 @@
5555
<lucene.version>10.3.1</lucene.version>
5656
<artemis.version>2.43.0</artemis.version>
5757
<flatlaf.version>3.6.2</flatlaf.version>
58-
<qwartz.version>2.5.0</qwartz.version>
58+
<qwartz.version>2.5.1</qwartz.version>
5959
<rome.version>2.1.0</rome.version>
6060
<log4j.version>2.25.1</log4j.version>
6161
<poi.version>5.4.1</poi.version>
6262
<slf4j.version>2.1.0-alpha1</slf4j.version>
6363
<rhino.version>1.8.0</rhino.version>
6464
<commonmark.version>0.27.0</commonmark.version>
65-
<langchain4j.version>1.7.1</langchain4j.version>
65+
<langchain4j.version>1.8.0</langchain4j.version>
6666
</properties>
6767

6868

@@ -308,7 +308,7 @@
308308
<dependency>
309309
<groupId>com.github.nicho92</groupId>
310310
<artifactId>manapool-api-java</artifactId>
311-
<version>0.0.8</version>
311+
<version>0.0.9</version>
312312
</dependency>
313313
<dependency>
314314
<groupId>com.github.nicho92</groupId>

src/main/java/org/magic/api/exports/impl/ManaPoolExport.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
import org.api.manapool.model.enums.EnumFinish;
1313
import org.api.manapool.model.enums.EnumLangages;
1414
import org.api.manapool.services.ManaPoolAPIService;
15-
import org.api.manapool.tools.ManaPoolConstants;
1615
import org.magic.api.beans.MTGCardStock;
1716
import org.magic.api.beans.enums.EnumExportCategory;
1817
import org.magic.api.beans.technical.audit.NetworkInfo;
1918
import org.magic.api.interfaces.abstracts.AbstractCardExport;
2019
import org.magic.api.interfaces.abstracts.AbstractTechnicalServiceManager;
2120
import org.magic.services.MTGControler;
21+
import org.magic.services.tools.POMReader;
2222

2323
public class ManaPoolExport extends AbstractCardExport {
2424

@@ -57,7 +57,7 @@ public boolean needFile() {
5757

5858
@Override
5959
public String getVersion() {
60-
return ManaPoolConstants.API_VERSION;
60+
return POMReader.readVersionFromPom(ManaPoolAPIService.class, "/META-INF/maven/com.github.nicho92/manapool-api-java/pom.properties");
6161
}
6262

6363

@@ -134,7 +134,7 @@ private MTGCardStock filter(List<MTGCardStock> stock, Product p)
134134
&&
135135
(p.getFinishId()==EnumFinish.FO?mcs.isFoil():true)
136136
&&
137-
(p.getCondition()==EnumCondition.valueOf(aliases.getConditionFor(this, mcs.getCondition())))
137+
(p.getCondition()==EnumCondition.valueOf(aliases.getConditionFor(this, mcs.getCondition(),p.getCondition().name())))
138138
;
139139

140140
}).findFirst();

src/main/java/org/magic/api/interfaces/abstracts/AbstractIA.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import java.util.List;
66
import java.util.Map;
77

8-
import org.apache.commons.codec.digest.DigestUtils;
98
import org.magic.api.beans.MTGCard;
109
import org.magic.api.beans.MTGDeck;
1110
import org.magic.api.beans.MTGEdition;

src/main/java/org/magic/services/providers/PluginsAliasesProvider.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,11 @@ public String getRegexFor(MTGPlugin plug,String k)
110110
}
111111

112112
public String getConditionFor(MTGPlugin plug, EnumCondition condition)
113+
{
114+
return getConditionFor(plug, condition, condition.name());
115+
}
116+
117+
public String getConditionFor(MTGPlugin plug, EnumCondition condition,String defaults)
113118
{
114119

115120
if(condition==null)
@@ -121,11 +126,10 @@ public String getConditionFor(MTGPlugin plug, EnumCondition condition)
121126
catch(Exception _)
122127
{
123128
logger.error("Error getting condition {} for plug {}",condition.name(),plug);
124-
return condition.name();
129+
return defaults;
125130
}
126131
}
127-
128-
132+
129133

130134

131135
public String getSetNameFor(MTGPlugin plug, MTGEdition ed)

0 commit comments

Comments
 (0)