Skip to content

Commit d379431

Browse files
author
Nick Van den Putte
committed
updated to maven
1 parent ab730b6 commit d379431

28 files changed

+187
-71
lines changed

‎.gitignore

+9-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,15 @@
22

33
Keplerbot/bin/
44
.metadata/
5+
Keplerbot/target/
6+
Keplerbot/.project
7+
Keplerbot/.settings
8+
Keplerbot/.classpath
9+
510
Keplerbot/log.txt
611
Keplerbot/presets.txt
712
Keplerbot/keplerbot.properties
8-
Keplerbot/logs/*
9-
Keplerbot/configs/*
10-
Keplerbot/commands/*
11-
Keplerbot/news/*
13+
Keplerbot/logs/
14+
Keplerbot/configs/
15+
Keplerbot/commands/
16+
Keplerbot/news/

‎Keplerbot/.classpath

-17
This file was deleted.

‎Keplerbot/.project

-17
This file was deleted.

‎Keplerbot/.settings/org.eclipse.jdt.core.prefs

-11
This file was deleted.

‎Keplerbot/lib/JTattoo-1.6.7-sources.zip

-774 KB
Binary file not shown.

‎Keplerbot/lib/JTattoo-1.6.7.jar

-1.07 MB
Binary file not shown.

‎Keplerbot/lib/pircbotx-1.8-javadoc.zip

-732 KB
Binary file not shown.

‎Keplerbot/lib/pircbotx-1.8-sources.zip

-163 KB
Binary file not shown.

‎Keplerbot/lib/pircbotx-1.8.jar

-181 KB
Binary file not shown.

‎Keplerbot/lib/txtmark-0.8-javadoc.jar

-73.3 KB
Binary file not shown.

‎Keplerbot/lib/txtmark-0.8-sources.jar

-33.2 KB
Binary file not shown.

‎Keplerbot/lib/txtmark-0.8.jar

-46.3 KB
Binary file not shown.

‎Keplerbot/pom.xml

+155
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,155 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<groupId>net.keplergaming</groupId>
5+
<artifactId>keplerbot</artifactId>
6+
<version>0.0.1</version>
7+
<name>KeplerBot</name>
8+
<description>A Twitch Bot!</description>
9+
<url>https://github.com/KeplerGaming/KeplerBot</url>
10+
<properties>
11+
<buildNumber>0</buildNumber>
12+
<mainClass>net.keplergaming.keplerbot.gui.MainFrame</mainClass>
13+
<minimumJreVersion>1.7</minimumJreVersion>
14+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
15+
<maven.compiler.source>1.7</maven.compiler.source>
16+
<maven.compiler.target>1.7</maven.compiler.target>
17+
</properties>
18+
<build>
19+
<defaultGoal>clean install package</defaultGoal>
20+
<sourceDirectory>src</sourceDirectory>
21+
<resources>
22+
<resource>
23+
<directory>res</directory>
24+
</resource>
25+
</resources>
26+
<plugins>
27+
<plugin>
28+
<artifactId>maven-compiler-plugin</artifactId>
29+
<version>3.0</version>
30+
<configuration>
31+
<source>1.7</source>
32+
<target>1.7</target>
33+
</configuration>
34+
</plugin>
35+
<plugin>
36+
<groupId>org.apache.maven.plugins</groupId>
37+
<artifactId>maven-antrun-plugin</artifactId>
38+
<executions>
39+
<execution>
40+
<goals>
41+
<goal>run</goal>
42+
</goals>
43+
<phase>generate-sources</phase>
44+
<configuration>
45+
<tasks>
46+
<property name="src.dir" value="${project.build.sourceDirectory}" />
47+
<property name="package.dir" value="net/keplergaming/keplerbot/version" />
48+
<property name="package.name" value="net.keplergaming.keplerbot.version" />
49+
<property name="version" value="${project.version}" />
50+
<echo file="${src.dir}/${package.dir}/Version.java" message="package ${package.name};${line.separator}${line.separator}" />
51+
<echo file="${src.dir}/${package.dir}/Version.java" append="true" message="public final class Version {${line.separator}${line.separator}" />
52+
<echo file="${src.dir}/${package.dir}/Version.java" append="true" message=" public static String VERSION=&quot;${version}&quot;; //Generated by Maven${line.separator}" />
53+
<echo file="${src.dir}/${package.dir}/Version.java" append="true" message="}${line.separator}" />
54+
<echo message="BUILD ${version}" />
55+
</tasks>
56+
</configuration>
57+
</execution>
58+
</executions>
59+
</plugin>
60+
<plugin>
61+
<groupId>org.bluestemsoftware.open.maven.plugin</groupId>
62+
<artifactId>launch4j-plugin</artifactId>
63+
<version>1.5.0.0</version>
64+
<executions>
65+
<execution>
66+
<configuration>
67+
<headerType>gui</headerType>
68+
<stayAlive>false</stayAlive>
69+
<jar>${project.build.directory}/${project.artifactId}-${project.version}.jar</jar>
70+
<outfile>${project.build.directory}/${project.artifactId}.exe</outfile>
71+
<classPath>
72+
<mainClass>${mainClass}</mainClass>
73+
<addDependencies>false</addDependencies>
74+
<preCp>anything</preCp>
75+
</classPath>
76+
<jre>
77+
<minVersion>1.7.0</minVersion>
78+
</jre>
79+
<icon>${basedir}/res/icon.ico</icon>
80+
<versionInfo>
81+
<fileVersion>2.0.0.${buildNumber}</fileVersion>
82+
<txtFileVersion>2.0.0.${buildNumber}</txtFileVersion>
83+
<productVersion>2.0.0.${buildNumber}</productVersion>
84+
<txtProductVersion>2.0.0.${buildNumber}</txtProductVersion>
85+
<fileDescription>${project.name}</fileDescription>
86+
<productName>${project.name}</productName>
87+
<copyright>${project.name}, ${project.url}</copyright>
88+
<internalName>${project.artifactId}</internalName>
89+
<originalFilename>${project.artifactId}.exe</originalFilename>
90+
</versionInfo>
91+
</configuration>
92+
<phase>package</phase>
93+
<goals>
94+
<goal>launch4j</goal>
95+
</goals>
96+
</execution>
97+
</executions>
98+
</plugin>
99+
<plugin>
100+
<groupId>org.apache.maven.plugins</groupId>
101+
<artifactId>maven-jar-plugin</artifactId>
102+
<version>2.4</version>
103+
<configuration>
104+
<archive>
105+
<manifest>
106+
<mainClass>${mainClass}</mainClass>
107+
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
108+
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
109+
</manifest>
110+
<manifestEntries>
111+
<Implementation-Title>${project.version}</Implementation-Title>
112+
<Implementation-Version>${buildNumber}</Implementation-Version>
113+
</manifestEntries>
114+
</archive>
115+
</configuration>
116+
</plugin>
117+
<plugin>
118+
<groupId>org.apache.maven.plugins</groupId>
119+
<artifactId>maven-dependency-plugin</artifactId>
120+
<version>2.7</version>
121+
<executions>
122+
<execution>
123+
<id>unpack-dependencies</id>
124+
<phase>package</phase>
125+
<goals>
126+
<goal>unpack-dependencies</goal>
127+
</goals>
128+
<configuration>
129+
<outputDirectory>${project.build.directory}/classes</outputDirectory>
130+
<overWriteReleases>false</overWriteReleases>
131+
<overWriteSnapshots>true</overWriteSnapshots>
132+
</configuration>
133+
</execution>
134+
</executions>
135+
</plugin>
136+
</plugins>
137+
</build>
138+
<dependencies>
139+
<dependency>
140+
<groupId>org.pircbotx</groupId>
141+
<artifactId>pircbotx</artifactId>
142+
<version>1.8</version>
143+
</dependency>
144+
<dependency>
145+
<groupId>com.github.rjeschke</groupId>
146+
<artifactId>txtmark</artifactId>
147+
<version>0.8</version>
148+
</dependency>
149+
<dependency>
150+
<groupId>com.jtattoo</groupId>
151+
<artifactId>JTattoo</artifactId>
152+
<version>1.6.7</version>
153+
</dependency>
154+
</dependencies>
155+
</project>

‎Keplerbot/res/icon.ico

178 KB
Binary file not shown.

‎Keplerbot/src/net/keplergaming/keplerbot/resources/github.png renamed to ‎Keplerbot/res/net/keplergaming/keplerbot/resources/github.png

File renamed without changes.

‎Keplerbot/src/net/keplergaming/keplerbot/resources/left.png renamed to ‎Keplerbot/res/net/keplergaming/keplerbot/resources/left.png

File renamed without changes.

‎Keplerbot/src/net/keplergaming/keplerbot/resources/logo.png renamed to ‎Keplerbot/res/net/keplergaming/keplerbot/resources/logo.png

File renamed without changes.

‎Keplerbot/src/net/keplergaming/keplerbot/resources/right.png renamed to ‎Keplerbot/res/net/keplergaming/keplerbot/resources/right.png

File renamed without changes.

‎Keplerbot/src/net/keplergaming/keplerbot/KeplerBotWrapper.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,14 @@
1515
import net.keplergaming.keplerbot.version.Version;
1616

1717
import org.pircbotx.Channel;
18+
import org.pircbotx.hooks.Listener;
1819
import org.pircbotx.hooks.ListenerAdapter;
1920
import org.pircbotx.hooks.events.DisconnectEvent;
2021
import org.pircbotx.hooks.events.MessageEvent;
2122
import org.pircbotx.hooks.events.PrivateMessageEvent;
2223
import org.pircbotx.hooks.events.UnknownEvent;
2324

24-
public class KeplerBotWrapper extends ListenerAdapter<KeplerBot> implements Runnable {
25+
public class KeplerBotWrapper extends ListenerAdapter<KeplerBot> implements Runnable, Listener<KeplerBot> {
2526

2627
public KeplerBotWrapper(StreamLogPannel pannel, String streamer, boolean joinMessage) {
2728
this.streamer = streamer;
@@ -49,7 +50,7 @@ public void run() {
4950
bot.setVerbose(true);
5051
bot.setName(MainFrame.getInstance().getConfig().getString(ConfigConstants.USERNAME.getKey(), (String) ConfigConstants.USERNAME.getDefaultValue()));
5152
bot.setLogin(MainFrame.getInstance().getConfig().getString(ConfigConstants.USERNAME.getKey(), (String) ConfigConstants.USERNAME.getDefaultValue()));
52-
bot.setVersion("KeplerBot " + Version.getVersion());
53+
bot.setVersion("KeplerBot " + Version.VERSION);
5354
bot.setAutoReconnect(true);
5455
bot.setAutoReconnectChannels(true);
5556

‎Keplerbot/src/net/keplergaming/keplerbot/commands/CommandManager.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,11 @@
1919
import net.keplergaming.keplerbot.logger.StreamLogger;
2020
import net.keplergaming.keplerbot.utils.StringUtils;
2121

22+
import org.pircbotx.hooks.Listener;
2223
import org.pircbotx.hooks.ListenerAdapter;
2324
import org.pircbotx.hooks.events.MessageEvent;
2425

25-
public class CommandManager extends ListenerAdapter<KeplerBot>{
26+
public class CommandManager extends ListenerAdapter<KeplerBot> implements Listener<KeplerBot>{
2627

2728
private Map<String, ICommand> commandMap;
2829
private Map<String, ICommand> aliasMap;

‎Keplerbot/src/net/keplergaming/keplerbot/filters/FilterManager.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,12 @@
99
import net.keplergaming.keplerbot.logger.StreamLogger;
1010

1111
import org.pircbotx.User;
12+
import org.pircbotx.hooks.Listener;
1213
import org.pircbotx.hooks.ListenerAdapter;
1314
import org.pircbotx.hooks.events.MessageEvent;
1415
import org.pircbotx.hooks.events.PrivateMessageEvent;
1516

16-
public class FilterManager extends ListenerAdapter<KeplerBot>{
17+
public class FilterManager extends ListenerAdapter<KeplerBot> implements Listener<KeplerBot>{
1718

1819
private Map<String, Filter> filterMap;
1920
private StreamLogger logger;

‎Keplerbot/src/net/keplergaming/keplerbot/gui/AddStreamDialog.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
import java.awt.BorderLayout;
44
import java.awt.FlowLayout;
55
import java.awt.Frame;
6+
import java.awt.event.ActionEvent;
7+
import java.awt.event.ActionListener;
68

79
import javax.swing.GroupLayout;
810
import javax.swing.GroupLayout.Alignment;
@@ -15,8 +17,6 @@
1517
import javax.swing.LayoutStyle.ComponentPlacement;
1618
import javax.swing.WindowConstants;
1719
import javax.swing.border.EmptyBorder;
18-
import java.awt.event.ActionListener;
19-
import java.awt.event.ActionEvent;
2020

2121
@SuppressWarnings("serial")
2222
public class AddStreamDialog extends JDialog {

‎Keplerbot/src/net/keplergaming/keplerbot/gui/CloseStreamDialog.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
import java.awt.BorderLayout;
44
import java.awt.FlowLayout;
55
import java.awt.Frame;
6+
import java.awt.event.ActionEvent;
7+
import java.awt.event.ActionListener;
68

79
import javax.swing.GroupLayout;
810
import javax.swing.GroupLayout.Alignment;
@@ -12,8 +14,6 @@
1214
import javax.swing.JPanel;
1315
import javax.swing.WindowConstants;
1416
import javax.swing.border.EmptyBorder;
15-
import java.awt.event.ActionListener;
16-
import java.awt.event.ActionEvent;
1717

1818
@SuppressWarnings("serial")
1919
public class CloseStreamDialog extends JDialog {

‎Keplerbot/src/net/keplergaming/keplerbot/gui/JNumberTextField.java

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
package net.keplergaming.keplerbot.gui;
22

3-
import javax.swing.*;
4-
import javax.swing.text.*;
3+
import javax.swing.JTextField;
4+
import javax.swing.text.AttributeSet;
5+
import javax.swing.text.BadLocationException;
6+
import javax.swing.text.Document;
7+
import javax.swing.text.PlainDocument;
58

69
@SuppressWarnings("serial")
710
public class JNumberTextField extends JTextField {

‎Keplerbot/src/net/keplergaming/keplerbot/gui/MainFrame.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public static void main(String[] args) {
7979
@Override
8080
public void run() {
8181
try {
82-
MainLogger.info("Starting KeplerBot "+ Version.getVersion());
82+
MainLogger.info("Starting KeplerBot "+ Version.VERSION);
8383

8484
MainLogger.fine("Starting up KeplerBot MainFrame");
8585
MainLogger.fine("Java version: " + System.getProperty("java.version"));
@@ -154,7 +154,7 @@ public void run() {
154154
final JTabbedPane tabbedPane = new JTabbedPane(SwingConstants.LEFT);
155155
tabbedPane.setFocusable(false);
156156

157-
JLabel lblVersion = new JLabel(Version.getVersion());
157+
JLabel lblVersion = new JLabel(Version.VERSION);
158158
lblVersion.setToolTipText("Up to date\r\n");
159159
lblVersion.setHorizontalAlignment(SwingConstants.RIGHT);
160160
GroupLayout groupLayout = new GroupLayout(frmKeplerbot.getContentPane());

‎Keplerbot/src/net/keplergaming/keplerbot/permissions/PermissionsManager.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@
33
import net.keplergaming.keplerbot.KeplerBot;
44
import net.keplergaming.keplerbot.KeplerBotWrapper;
55

6+
import org.pircbotx.hooks.Listener;
67
import org.pircbotx.hooks.ListenerAdapter;
78
import org.pircbotx.hooks.events.PrivateMessageEvent;
89

9-
public class PermissionsManager extends ListenerAdapter<KeplerBot> implements Runnable{
10+
public class PermissionsManager extends ListenerAdapter<KeplerBot> implements Runnable, Listener<KeplerBot>{
1011

1112
public PermissionsManager(KeplerBotWrapper wrapper) {
1213
this.wrapper = wrapper;

‎Keplerbot/src/net/keplergaming/keplerbot/version/Version.java

+2-8
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
package net.keplergaming.keplerbot.version;
22

3-
public class Version {
3+
public final class Version {
44

5-
private static String major = "1";
6-
private static String minor = "1";
7-
private static String rev = "1";
8-
9-
public static String getVersion() {
10-
return String.format("v%s.%s.%s", major, minor, rev);
11-
}
5+
public static String VERSION="0.0.1"; //Generated by Maven
126
}

‎Keplerbot/src/net/keplergaming/keplerbot/version/VersionChecker.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ private void deleteUpdater() {
3939
}
4040

4141
public boolean requiresUpdate() {
42-
return !Version.getVersion().equalsIgnoreCase(latest) && latest != null;
42+
return !Version.VERSION.equalsIgnoreCase(latest) && latest != null;
4343
}
4444

4545
private void checkVersion() {

0 commit comments

Comments
 (0)