github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-15 03:00:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Updated to version 0.6. Fixed and updated rate plugin.

Browse source
This commit is contained in:
magenoxx 2011-01-30 10:42:35 +03:00
parent 2abc0e888d
commit f6b812bce1
27 changed files with 37 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
Mage.Client/mage-rate-executable.jar
View file

Binary file not shown.

BIN
Mage.Client/plugins/mage-card-plugin.jar
View file

Binary file not shown.

2
Mage.Client/pom.xml
View file

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>mage-root</artifactId> <artifactId>mage-root</artifactId>
<version>0.5.1</version> <version>0.6</version>
</parent> </parent>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>

6
Mage.Client/src/main/java/mage/client/dialog/AboutDialog.java
View file

@ -77,15 +77,15 @@ public class AboutDialog extends MageDialog {
} }
}); });
jLabel1.setText("MAGE client, version 0.5.1"); jLabel1.setText("MAGE client, version 0.6");
lblVersion.setText("version"); lblVersion.setText("version");
jLabel2.setText("Courtesy: BetaSteward@googlemail.com"); jLabel2.setText("Courtesy: BetaSteward@googlemail.com");
jLabel3.setText("Devs: BetaSteward, Nantuko84, Eugen.Rivniy"); jLabel3.setText("Devs: BetaSteward, Nantuko84, Eugen.Rivniy, maurer.it");
jLabel4.setText("Thanks: KLo, Cosmo & Fritz"); //jLabel4.setText("Thanks: KLo, Cosmo & Fritz");
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
getContentPane().setLayout(layout); getContentPane().setLayout(layout);

2
Mage.Common/pom.xml
View file

@ -7,7 +7,7 @@
<parent> <parent>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>mage-root</artifactId> <artifactId>mage-root</artifactId>
<version>0.5.1</version> <version>0.6</version>
</parent> </parent>
<artifactId>Mage-Common</artifactId> <artifactId>Mage-Common</artifactId>

2
Mage.Plugins/Mage.Card.Plugin/pom.xml
View file

@ -7,7 +7,7 @@
<parent> <parent>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>Mage-Plugins</artifactId> <artifactId>Mage-Plugins</artifactId>
<version>0.5.1</version> <version>0.6</version>
</parent> </parent>
<artifactId>Mage-Card-Plugin</artifactId> <artifactId>Mage-Card-Plugin</artifactId>

2
Mage.Plugins/Mage.Counter.Plugin/pom.xml
View file

@ -7,7 +7,7 @@
<parent> <parent>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>Mage-Plugins</artifactId> <artifactId>Mage-Plugins</artifactId>
<version>0.5.1</version> <version>0.6</version>
</parent> </parent>
<artifactId>Mage-Counter-Plugin</artifactId> <artifactId>Mage-Counter-Plugin</artifactId>

BIN
Mage.Plugins/Mage.Rating.Plugin/executable/mage-rate-executable.jar
View file

Binary file not shown.

4
Mage.Plugins/Mage.Rating.Plugin/pom.xml
View file

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>Mage-Plugins</artifactId> <artifactId>Mage-Plugins</artifactId>
<version>0.5.1</version> <version>0.6</version>
</parent> </parent>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
@ -25,7 +25,7 @@
<dependency> <dependency>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>Mage-Sets</artifactId> <artifactId>Mage-Sets</artifactId>
<version>0.5.1</version> <version>0.6</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.googlecode.jspf</groupId> <groupId>com.googlecode.jspf</groupId>

7
Mage.Plugins/Mage.Rating.Plugin/src/main/java/org/mage/plugins/rating/RateFrame.java
View file

@ -15,6 +15,7 @@ import javax.swing.SwingUtilities;
import javax.swing.UIManager; import javax.swing.UIManager;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.mage.plugins.rating.cards.CardsStorage;
import org.mage.plugins.rating.results.ResultHandler; import org.mage.plugins.rating.results.ResultHandler;
import org.mage.plugins.rating.ui.BigCard; import org.mage.plugins.rating.ui.BigCard;
@ -22,6 +23,7 @@ public class RateFrame extends JFrame {
private static Logger log = Logger.getLogger(RateFrame.class); private static Logger log = Logger.getLogger(RateFrame.class);
private BigCard bigCard; private BigCard bigCard;
private JLabel label;
public RateFrame() { public RateFrame() {
setTitle("Mage Rate Cards, version 0.1"); setTitle("Mage Rate Cards, version 0.1");
@ -56,7 +58,8 @@ public class RateFrame extends JFrame {
bigCard.setBorder(BorderFactory.createLineBorder(Color.gray)); bigCard.setBorder(BorderFactory.createLineBorder(Color.gray));
add(bigCard); add(bigCard);
JLabel label = new JLabel("The results are stored for every 10 compare."); //JLabel label = new JLabel("The results are stored for every 10 compare.");
label = new JLabel("Loading cards...Please wait.");
label.setBounds(290, 270, 300, 30); label.setBounds(290, 270, 300, 30);
add(label); add(label);
@ -78,6 +81,8 @@ public class RateFrame extends JFrame {
} }
public void startRating() { public void startRating() {
CardsStorage.getAllCards();
label.setText("The results are stored for every 10 compare.");
RateThread.getInstance().start(this, this.bigCard); RateThread.getInstance().start(this, this.bigCard);
} }

7
Mage.Plugins/Mage.Rating.Plugin/src/main/java/org/mage/plugins/rating/RateThread.java
View file

@ -1,6 +1,6 @@
package org.mage.plugins.rating; package org.mage.plugins.rating;
import java.awt.Component; import java.awt.*;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Random; import java.util.Random;
@ -25,6 +25,7 @@ public class RateThread extends Thread {
private static RateThread fInstance = new RateThread(); private static RateThread fInstance = new RateThread();
private CardPluginImpl impl = new CardPluginImpl(); private CardPluginImpl impl = new CardPluginImpl();
public static CardDimensions dimensions = new CardDimensions(0.4); public static CardDimensions dimensions = new CardDimensions(0.4);
public static Dimension cardDimension = new Dimension(dimensions.frameWidth, dimensions.frameHeight);
public static CardDimensions bigCardDimension = new CardDimensions(0.8); public static CardDimensions bigCardDimension = new CardDimensions(0.8);
private JFrame frame; private JFrame frame;
private MageCard mageCard1; private MageCard mageCard1;
@ -51,11 +52,11 @@ public class RateThread extends Thread {
Card card1 = getRandomUniqueNonLandCard(null); Card card1 = getRandomUniqueNonLandCard(null);
Card card2 = getRandomUniqueNonLandCard(card1); Card card2 = getRandomUniqueNonLandCard(card1);
mageCard1 = impl.getMageCard(new CardView(card1), dimensions, UUID.randomUUID(), new RateCallback(card1, card2, this, bigCard), false); mageCard1 = impl.getMageCard(new CardView(card1), cardDimension, UUID.randomUUID(), new RateCallback(card1, card2, this, bigCard), false);
mageCard1.setCardBounds(bigCardDimension.frameWidth + 80, 10, dimensions.frameWidth, dimensions.frameHeight); mageCard1.setCardBounds(bigCardDimension.frameWidth + 80, 10, dimensions.frameWidth, dimensions.frameHeight);
frame.add(mageCard1); frame.add(mageCard1);
mageCard2 = impl.getMageCard(new CardView(card2), dimensions, UUID.randomUUID(), new RateCallback(card2, card1, this, bigCard), false); mageCard2 = impl.getMageCard(new CardView(card2), cardDimension, UUID.randomUUID(), new RateCallback(card2, card1, this, bigCard), false);
mageCard2.setCardBounds(bigCardDimension.frameWidth + 80 + dimensions.frameWidth + 30, 10, dimensions.frameWidth, dimensions.frameHeight); mageCard2.setCardBounds(bigCardDimension.frameWidth + 80 + dimensions.frameWidth + 30, 10, dimensions.frameWidth, dimensions.frameHeight);
frame.add(mageCard2); frame.add(mageCard2);

2
Mage.Plugins/Mage.Theme.Plugin/pom.xml
View file

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>Mage-Plugins</artifactId> <artifactId>Mage-Plugins</artifactId>
<version>0.5.1</version> <version>0.6</version>
</parent> </parent>
<artifactId>Mage-Theme-Plugin</artifactId> <artifactId>Mage-Theme-Plugin</artifactId>

2
Mage.Plugins/pom.xml
View file

@ -7,7 +7,7 @@
<parent> <parent>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>mage-root</artifactId> <artifactId>mage-root</artifactId>
<version>0.5.1</version> <version>0.6</version>
</parent> </parent>
<artifactId>Mage-Plugins</artifactId> <artifactId>Mage-Plugins</artifactId>

2
Mage.Server.Plugins/Mage.Deck.Constructed/pom.xml
View file

@ -7,7 +7,7 @@
<parent> <parent>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>mage-root</artifactId> <artifactId>mage-root</artifactId>
<version>0.5.1</version> <version>0.6</version>
</parent> </parent>
<artifactId>Mage-Deck-Constructed</artifactId> <artifactId>Mage-Deck-Constructed</artifactId>

2
Mage.Server.Plugins/Mage.Deck.Limited/pom.xml
View file

@ -7,7 +7,7 @@
<parent> <parent>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>mage-root</artifactId> <artifactId>mage-root</artifactId>
<version>0.5.1</version> <version>0.6</version>
</parent> </parent>
<artifactId>Mage-Deck-Limited</artifactId> <artifactId>Mage-Deck-Limited</artifactId>

2
Mage.Server.Plugins/Mage.Draft.8PlayerBooster/pom.xml
View file

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>mage-root</artifactId> <artifactId>mage-root</artifactId>
<version>0.5.1</version> <version>0.6</version>
</parent> </parent>
<artifactId>Mage-Draft-8PlayerBooster</artifactId> <artifactId>Mage-Draft-8PlayerBooster</artifactId>

2
Mage.Server.Plugins/Mage.Game.FreeForAll/pom.xml
View file

@ -7,7 +7,7 @@
<parent> <parent>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>mage-root</artifactId> <artifactId>mage-root</artifactId>
<version>0.5.1</version> <version>0.6</version>
</parent> </parent>
<artifactId>Mage-Game-FreeForAll</artifactId> <artifactId>Mage-Game-FreeForAll</artifactId>

2
Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/pom.xml
View file

@ -7,7 +7,7 @@
<parent> <parent>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>mage-root</artifactId> <artifactId>mage-root</artifactId>
<version>0.5.1</version> <version>0.6</version>
</parent> </parent>
<artifactId>Mage-Game-TwoPlayerDuel</artifactId> <artifactId>Mage-Game-TwoPlayerDuel</artifactId>

2
Mage.Server.Plugins/Mage.Player.AI/pom.xml
View file

@ -7,7 +7,7 @@
<parent> <parent>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>mage-root</artifactId> <artifactId>mage-root</artifactId>
<version>0.5.1</version> <version>0.6</version>
</parent> </parent>
<artifactId>Mage-Player-AI</artifactId> <artifactId>Mage-Player-AI</artifactId>

2
Mage.Server.Plugins/Mage.Player.AIMinimax/pom.xml
View file

@ -7,7 +7,7 @@
<parent> <parent>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>mage-root</artifactId> <artifactId>mage-root</artifactId>
<version>0.5.1</version> <version>0.6</version>
</parent> </parent>
<artifactId>Mage-Player-AIMinimax</artifactId> <artifactId>Mage-Player-AIMinimax</artifactId>

2
Mage.Server.Plugins/Mage.Player.Human/pom.xml
View file

@ -7,7 +7,7 @@
<parent> <parent>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>mage-root</artifactId> <artifactId>mage-root</artifactId>
<version>0.5.1</version> <version>0.6</version>
</parent> </parent>
<artifactId>Mage-Player-Human</artifactId> <artifactId>Mage-Player-Human</artifactId>

4
Mage.Server.Plugins/pom.xml
View file

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>mage-root</artifactId> <artifactId>mage-root</artifactId>
<version>0.5.1</version> <version>0.6</version>
</parent> </parent>
<artifactId>Mage-Server-Plugins</artifactId> <artifactId>Mage-Server-Plugins</artifactId>
@ -22,7 +22,7 @@
<module>Mage.Player.AI</module> <module>Mage.Player.AI</module>
<module>Mage.Player.AIMinimax</module> <module>Mage.Player.AIMinimax</module>
<module>Mage.Player.Human</module> <module>Mage.Player.Human</module>
<module>Mage.Draft.8PlayerBooster</module> <module>Mage.Draft.8PlayerBooster</module>
</modules> </modules>
</project> </project>

2
Mage.Server/pom.xml
View file

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>mage-root</artifactId> <artifactId>mage-root</artifactId>
<version>0.5.1</version> <version>0.6</version>
</parent> </parent>
<artifactId>Mage-Server</artifactId> <artifactId>Mage-Server</artifactId>

2
Mage.Sets/pom.xml
View file

@ -7,7 +7,7 @@
<parent> <parent>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>mage-root</artifactId> <artifactId>mage-root</artifactId>
<version>0.5.1</version> <version>0.6</version>
</parent> </parent>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>

2
Mage.Tests/pom.xml
View file

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>mage-root</artifactId> <artifactId>mage-root</artifactId>
<version>0.5.1</version> <version>0.6</version>
</parent> </parent>
<artifactId>Mage-Tests</artifactId> <artifactId>Mage-Tests</artifactId>

2
Mage/pom.xml
View file

@ -7,7 +7,7 @@
<parent> <parent>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>mage-root</artifactId> <artifactId>mage-root</artifactId>
<version>0.5.1</version> <version>0.6</version>
</parent> </parent>
<artifactId>Mage</artifactId> <artifactId>Mage</artifactId>

4
pom.xml
View file

@ -6,7 +6,7 @@
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>mage-root</artifactId> <artifactId>mage-root</artifactId>
<version>0.5.1</version> <version>0.6</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Mage Root</name> <name>Mage Root</name>
<description>Mage Root POM</description> <description>Mage Root POM</description>
@ -40,6 +40,6 @@
</repositories> </repositories>
<properties> <properties>
<mage-version>0.5.1</mage-version> <mage-version>0.6</mage-version>
</properties> </properties>
</project> </project>