Skip to content

Commit

Permalink
rebased package name to featurecat
Browse files Browse the repository at this point in the history
  • Loading branch information
featurecat committed May 29, 2018
1 parent d175833 commit cecb893
Show file tree
Hide file tree
Showing 31 changed files with 90 additions and 106 deletions.
2 changes: 1 addition & 1 deletion doc/plugin.md
Expand Up @@ -20,7 +20,7 @@ package plugin;

import java.io.IOException;

import wagner.stephanie.lizzie.plugin.IPlugin;
import IPlugin;

/**
* Plugin
Expand Down
2 changes: 1 addition & 1 deletion doc/theme.md
Expand Up @@ -3,7 +3,7 @@ The theme's function is to make Lizzie's display richer, so simply change the as

The way to load a theme is to copy the theme's Jar file to the theme directory, and then set the theme's class name in the configuration file.

Any class that implements the wagner.stephanie.lizzie.theme.ITheme interface can be used as a theme class.
Any class that implements the ITheme interface can be used as a theme class.

Use ```javac -classpath ...``` to ensure that the theme's source files can be imported into the ITheme class.

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Expand Up @@ -44,7 +44,7 @@
<transformers>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>wagner.stephanie.lizzie.Lizzie</mainClass>
<mainClass>featurecat.lizzie.Lizzie</mainClass>
</transformer>
</transformers>
<shadedArtifactAttached>true</shadedArtifactAttached>
Expand Down
@@ -1,4 +1,4 @@
package wagner.stephanie.benchmark;
package featurecat.benchmark;

import java.util.LinkedHashMap;

Expand Down
@@ -1,4 +1,4 @@
package wagner.stephanie.lizzie;
package featurecat.lizzie;

import org.json.*;

Expand Down Expand Up @@ -217,7 +217,7 @@ private JSONObject createDefaultConfig() {
JSONObject ui = new JSONObject();

ui.put("board-color", new JSONArray("[178, 140, 0]"));
ui.put("theme", "wagner.stephanie.lizzie.theme.DefaultTheme");
ui.put("theme", "DefaultTheme");
ui.put("shadows-enabled", true);
ui.put("fancy-stones", true);
ui.put("fancy-board", true);
Expand Down
@@ -1,18 +1,13 @@
package wagner.stephanie.lizzie;
package featurecat.lizzie;

import org.json.JSONException;
import wagner.stephanie.benchmark.Stopwatch;
import wagner.stephanie.lizzie.analysis.Leelaz;
import wagner.stephanie.lizzie.analysis.Leelaz.WinrateStats;
import wagner.stephanie.lizzie.plugin.PluginManager;
import wagner.stephanie.lizzie.rules.Board;
import wagner.stephanie.lizzie.rules.Stone;
import wagner.stephanie.lizzie.gui.LizzieFrame;
import featurecat.lizzie.analysis.Leelaz;
import featurecat.lizzie.plugin.PluginManager;
import featurecat.lizzie.rules.Board;
import featurecat.lizzie.gui.LizzieFrame;

import javax.swing.*;
import java.io.File;
import java.io.IOException;
import java.net.URL;

/**
* Main class.
Expand Down
@@ -1,4 +1,4 @@
package wagner.stephanie.lizzie;
package featurecat.lizzie;

import java.io.*;
import java.net.URL;
Expand Down
@@ -1,10 +1,9 @@
package wagner.stephanie.lizzie.analysis;
package featurecat.lizzie.analysis;

import wagner.stephanie.lizzie.Lizzie;
import wagner.stephanie.lizzie.rules.Board;
import wagner.stephanie.lizzie.rules.BoardData;
import wagner.stephanie.lizzie.rules.Stone;
import wagner.stephanie.lizzie.rules.Zobrist;
import featurecat.lizzie.rules.Board;
import featurecat.lizzie.rules.BoardData;
import featurecat.lizzie.rules.Stone;
import featurecat.lizzie.rules.Zobrist;

import java.util.List;

Expand Down
@@ -1,4 +1,4 @@
package wagner.stephanie.lizzie.analysis;
package featurecat.lizzie.analysis;


import java.util.Date;
Expand Down
@@ -1,11 +1,11 @@
package wagner.stephanie.lizzie.analysis;
package featurecat.lizzie.analysis;

import featurecat.lizzie.Lizzie;
import featurecat.lizzie.Util;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
import wagner.stephanie.lizzie.Lizzie;
import wagner.stephanie.lizzie.Util;
import wagner.stephanie.lizzie.rules.Stone;
import featurecat.lizzie.rules.Stone;

import javax.swing.*;
import java.io.BufferedInputStream;
Expand All @@ -17,8 +17,6 @@
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.Timer;
import java.util.TimerTask;
import java.util.Collections;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
Expand Down
@@ -1,4 +1,4 @@
package wagner.stephanie.lizzie.analysis;
package featurecat.lizzie.analysis;

import java.util.List;

Expand Down
@@ -1,4 +1,4 @@
package wagner.stephanie.lizzie.analysis;
package featurecat.lizzie.analysis;

import java.util.ArrayList;
import java.util.Arrays;
Expand Down
@@ -1,27 +1,26 @@
package wagner.stephanie.lizzie.gui;
package featurecat.lizzie.gui;

import org.json.JSONArray;
import org.json.JSONObject;
import wagner.stephanie.lizzie.Lizzie;
import wagner.stephanie.lizzie.analysis.Branch;
import wagner.stephanie.lizzie.analysis.MoveData;
import wagner.stephanie.lizzie.plugin.PluginManager;
import wagner.stephanie.lizzie.rules.Board;
import wagner.stephanie.lizzie.rules.BoardHistoryNode;
import wagner.stephanie.lizzie.rules.Stone;
import wagner.stephanie.lizzie.rules.Zobrist;
import featurecat.lizzie.Lizzie;
import featurecat.lizzie.analysis.Branch;
import featurecat.lizzie.analysis.MoveData;
import featurecat.lizzie.plugin.PluginManager;
import featurecat.lizzie.rules.Board;
import featurecat.lizzie.rules.BoardHistoryNode;
import featurecat.lizzie.rules.Stone;
import featurecat.lizzie.rules.Zobrist;

import java.awt.*;
import java.awt.font.TextAttribute;
import java.awt.geom.Point2D;
import java.awt.image.BufferedImage;
import java.io.IOException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import wagner.stephanie.lizzie.theme.DefaultTheme;
import wagner.stephanie.lizzie.theme.ITheme;
import featurecat.lizzie.theme.DefaultTheme;
import featurecat.lizzie.theme.ITheme;

public class BoardRenderer {
private static final double MARGIN = 0.03; // percentage of the boardLength to offset before drawing black lines
Expand Down
Expand Up @@ -2,13 +2,12 @@
* Created by JFormDesigner on Wed Apr 04 22:17:33 CEST 2018
*/

package wagner.stephanie.lizzie.gui;
package featurecat.lizzie.gui;

import wagner.stephanie.lizzie.analysis.GameInfo;
import featurecat.lizzie.analysis.GameInfo;

import java.awt.*;
import java.text.DecimalFormat;
import java.text.ParseException;
import javax.swing.*;
import javax.swing.border.*;

Expand Down
@@ -1,11 +1,11 @@
package wagner.stephanie.lizzie.gui;
package featurecat.lizzie.gui;

import wagner.stephanie.lizzie.Lizzie;
import featurecat.lizzie.Lizzie;

import java.awt.event.*;

import static java.awt.event.KeyEvent.*;
import wagner.stephanie.lizzie.plugin.PluginManager;
import featurecat.lizzie.plugin.PluginManager;

public class Input implements MouseListener, KeyListener, MouseWheelListener, MouseMotionListener {
@Override
Expand Down
@@ -1,6 +1,4 @@
package wagner.stephanie.lizzie.gui;

import static wagner.stephanie.lizzie.Util.clamp;
package featurecat.lizzie.gui;

import java.awt.BasicStroke;
import java.awt.Color;
Expand All @@ -10,19 +8,18 @@
import java.awt.Frame;
import java.awt.Graphics;
import java.awt.Graphics2D;
import java.awt.GraphicsEnvironment;
import java.awt.RenderingHints;

import com.jhlabs.image.GaussianFilter;
import featurecat.lizzie.Lizzie;
import featurecat.lizzie.Util;
import featurecat.lizzie.analysis.GameInfo;
import featurecat.lizzie.analysis.Leelaz;
import featurecat.lizzie.rules.Board;
import featurecat.lizzie.rules.BoardData;
import featurecat.lizzie.rules.GIBParser;
import featurecat.lizzie.rules.SGFParser;
import org.json.JSONObject;
import wagner.stephanie.lizzie.Lizzie;
import wagner.stephanie.lizzie.analysis.GameInfo;
import wagner.stephanie.lizzie.analysis.Leelaz;
import wagner.stephanie.lizzie.rules.Board;
import wagner.stephanie.lizzie.rules.BoardData;
import wagner.stephanie.lizzie.rules.BoardHistoryNode;
import wagner.stephanie.lizzie.rules.GIBParser;
import wagner.stephanie.lizzie.rules.SGFParser;

import javax.swing.*;
import javax.swing.filechooser.FileNameExtensionFilter;
Expand Down Expand Up @@ -499,11 +496,11 @@ void drawControls() {
int maxCommandWidth = Arrays.asList(commands).stream().reduce(0, (Integer i, String command) -> Math.max(i, metrics.stringWidth(command)), (Integer a, Integer b) -> Math.max(a, b));
int lineHeight = (int) (font.getSize() * 1.15);

int boxWidth = clamp((int) (maxCommandWidth * 1.4), 0, getWidth());
int boxHeight = clamp(commands.length * lineHeight, 0, getHeight());
int boxWidth = Util.clamp((int) (maxCommandWidth * 1.4), 0, getWidth());
int boxHeight = Util.clamp(commands.length * lineHeight, 0, getHeight());

int commandsX = clamp(getWidth() / 2 - boxWidth / 2, 0, getWidth());
int commandsY = clamp(getHeight() / 2 - boxHeight / 2, 0, getHeight());
int commandsX = Util.clamp(getWidth() / 2 - boxWidth / 2, 0, getWidth());
int commandsY = Util.clamp(getHeight() / 2 - boxHeight / 2, 0, getHeight());

BufferedImage result = new BufferedImage(boxWidth, boxHeight, BufferedImage.TYPE_INT_ARGB);
filter10.filter(cachedBackground.getSubimage(commandsX, commandsY, boxWidth, boxHeight), result);
Expand Down
Expand Up @@ -2,9 +2,9 @@
* Created by JFormDesigner on Wed Apr 04 22:17:33 CEST 2018
*/

package wagner.stephanie.lizzie.gui;
package featurecat.lizzie.gui;

import wagner.stephanie.lizzie.analysis.GameInfo;
import featurecat.lizzie.analysis.GameInfo;

import javax.swing.*;
import javax.swing.border.EmptyBorder;
Expand Down
@@ -1,8 +1,8 @@
package wagner.stephanie.lizzie.gui;
package featurecat.lizzie.gui;

import wagner.stephanie.lizzie.Lizzie;
import wagner.stephanie.lizzie.rules.BoardHistoryList;
import wagner.stephanie.lizzie.rules.BoardHistoryNode;
import featurecat.lizzie.Lizzie;
import featurecat.lizzie.rules.BoardHistoryList;
import featurecat.lizzie.rules.BoardHistoryNode;

import java.awt.*;
import java.util.ArrayList;
Expand Down
@@ -1,9 +1,9 @@
package wagner.stephanie.lizzie.gui;
package featurecat.lizzie.gui;

import wagner.stephanie.lizzie.Lizzie;
import wagner.stephanie.lizzie.analysis.Leelaz;
import wagner.stephanie.lizzie.rules.BoardHistoryList;
import wagner.stephanie.lizzie.rules.BoardHistoryNode;
import featurecat.lizzie.Lizzie;
import featurecat.lizzie.analysis.Leelaz;
import featurecat.lizzie.rules.BoardHistoryList;
import featurecat.lizzie.rules.BoardHistoryNode;

import java.awt.*;
import java.awt.geom.Point2D;
Expand Down
@@ -1,4 +1,4 @@
package wagner.stephanie.lizzie.plugin;
package featurecat.lizzie.plugin;


import java.awt.Graphics2D;
Expand Down
@@ -1,4 +1,4 @@
package wagner.stephanie.lizzie.plugin;
package featurecat.lizzie.plugin;

import java.awt.Graphics2D;
import java.awt.event.KeyEvent;
Expand All @@ -7,7 +7,8 @@
import java.io.File;
import java.util.HashSet;
import java.io.IOException;
import wagner.stephanie.lizzie.Lizzie;

import featurecat.lizzie.Lizzie;

public class PluginManager {
public static HashSet<IPlugin> plugins;
Expand Down
@@ -1,9 +1,9 @@
package wagner.stephanie.lizzie.rules;
package featurecat.lizzie.rules;

import wagner.stephanie.lizzie.analysis.Leelaz;
import wagner.stephanie.lizzie.Lizzie;
import wagner.stephanie.lizzie.analysis.LeelazListener;
import wagner.stephanie.lizzie.analysis.MoveData;
import featurecat.lizzie.Lizzie;
import featurecat.lizzie.analysis.Leelaz;
import featurecat.lizzie.analysis.LeelazListener;
import featurecat.lizzie.analysis.MoveData;

import javax.swing.*;
import java.util.ArrayDeque;
Expand Down
@@ -1,6 +1,4 @@
package wagner.stephanie.lizzie.rules;

import wagner.stephanie.lizzie.Lizzie;
package featurecat.lizzie.rules;

public class BoardData {
public int moveNumber;
Expand Down
@@ -1,7 +1,8 @@
package wagner.stephanie.lizzie.rules;
package featurecat.lizzie.rules;

import java.util.List;
import wagner.stephanie.lizzie.analysis.GameInfo;

import featurecat.lizzie.analysis.GameInfo;

/**
* Linked list data structure to store board history
Expand Down
@@ -1,7 +1,6 @@
package wagner.stephanie.lizzie.rules;
package featurecat.lizzie.rules;
import java.util.ArrayList;
import java.util.List;
import javax.swing.JOptionPane;

/**
* Node structure for the board history / sgf tree
Expand Down
@@ -1,7 +1,7 @@
package wagner.stephanie.lizzie.rules;
package featurecat.lizzie.rules;

import wagner.stephanie.lizzie.Lizzie;
import wagner.stephanie.lizzie.plugin.PluginManager;
import featurecat.lizzie.Lizzie;
import featurecat.lizzie.plugin.PluginManager;

import java.io.File;
import java.io.FileInputStream;
Expand Down
@@ -1,13 +1,13 @@
package wagner.stephanie.lizzie.rules;
package featurecat.lizzie.rules;

import java.util.ArrayList;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import wagner.stephanie.lizzie.Lizzie;
import wagner.stephanie.lizzie.analysis.GameInfo;

import featurecat.lizzie.Lizzie;
import featurecat.lizzie.analysis.GameInfo;
import featurecat.lizzie.plugin.PluginManager;

import java.io.*;
import wagner.stephanie.lizzie.plugin.PluginManager;
import java.text.SimpleDateFormat;

public class SGFParser {
Expand Down
@@ -1,4 +1,4 @@
package wagner.stephanie.lizzie.rules;
package featurecat.lizzie.rules;

public enum Stone {
BLACK, WHITE, EMPTY, BLACK_RECURSED, WHITE_RECURSED, BLACK_GHOST, WHITE_GHOST, DAME, BLACK_POINT, WHITE_POINT, BLACK_CAPTURED, WHITE_CAPTURED;
Expand Down

0 comments on commit cecb893

Please sign in to comment.