Skip to content

Commit ebcfaf3

Browse files
committed
Convert to Maven project.
1 parent a09dfa7 commit ebcfaf3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+253
-156
lines changed

LICENSE

-154
This file was deleted.

LICENSE.txt

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
All right reserved.

pom.xml

+240
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,240 @@
1+
<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">
2+
<modelVersion>4.0.0</modelVersion>
3+
<groupId>syam.FlagGame</groupId>
4+
<artifactId>FlagGame</artifactId>
5+
<version>0.1-SNAPSHOT</version>
6+
<name>FlagGame</name>
7+
<description>CraftBukkit FlagGame Plugin</description>
8+
9+
<!-- Properties -->
10+
<properties>
11+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
12+
<project.build.number>UNKNOWN</project.build.number>
13+
</properties>
14+
15+
<!-- Developer -->
16+
<developers>
17+
<developer>
18+
<id>syamn</id>
19+
<name>syam</name>
20+
<email>[email protected]</email>
21+
<url>http://twitter.com/starlightp</url>
22+
<organization>Sakura Server</organization>
23+
<organizationUrl>http://sakura-server.net/</organizationUrl>
24+
</developer>
25+
</developers>
26+
27+
<!-- License -->
28+
<licenses>
29+
<license>
30+
<name>All right reserved</name>
31+
<url>LICENSE.txt</url>
32+
<distribution>repo</distribution>
33+
</license>
34+
</licenses>
35+
36+
<!-- SCM -->
37+
<scm>
38+
<connection>scm:git:git://github.com/syamn/FlagGame.git</connection>
39+
<url>https://github.com/syamn/FlagGame.git</url>
40+
<tag>master</tag>
41+
<developerConnection>scm:git:[email protected]:syamn/FlagGame.git</developerConnection>
42+
</scm>
43+
44+
<!-- CI -->
45+
<ciManagement>
46+
<system>jenkins</system>
47+
<url>http://ci.sakura-server.net:8080/</url>
48+
</ciManagement>
49+
50+
<!-- Build -->
51+
<build>
52+
<finalName>${project.name}</finalName>
53+
<sourceDirectory>${basedir}/src/main/java/</sourceDirectory>
54+
55+
<!-- Plugins -->
56+
<plugins>
57+
<!-- Replacer -->
58+
<plugin>
59+
<groupId>com.google.code.maven-replacer-plugin</groupId>
60+
<artifactId>replacer</artifactId>
61+
<version>1.5.0</version>
62+
<executions>
63+
<execution>
64+
<phase>prepare-package</phase>
65+
<goals>
66+
<goal>replace</goal>
67+
</goals>
68+
</execution>
69+
</executions>
70+
<configuration>
71+
<file>target/classes/plugin.yml</file>
72+
<replacements>
73+
<replacement>
74+
<token>version-number-unknown</token>
75+
<value>${project.version}-b${project.build.number}</value>
76+
</replacement>
77+
</replacements>
78+
</configuration>
79+
</plugin>
80+
<!-- Jar Plugin -->
81+
<plugin>
82+
<groupId>org.apache.maven.plugins</groupId>
83+
<artifactId>maven-jar-plugin</artifactId>
84+
<version>2.4</version>
85+
<configuration>
86+
<archive>
87+
<manifestEntries>
88+
</manifestEntries>
89+
</archive>
90+
</configuration>
91+
</plugin>
92+
<!-- Maven Source -->
93+
<plugin>
94+
<groupId>org.apache.maven.plugins</groupId>
95+
<artifactId>maven-source-plugin</artifactId>
96+
<version>2.2</version>
97+
<executions>
98+
<execution>
99+
<id>attach-sources</id>
100+
<phase>package</phase>
101+
<goals>
102+
<goal>jar-no-fork</goal>
103+
</goals>
104+
</execution>
105+
</executions>
106+
</plugin>
107+
<!-- Maven Site -->
108+
<plugin>
109+
<groupId>org.apache.maven.plugins</groupId>
110+
<artifactId>maven-site-plugin</artifactId>
111+
<version>3.1</version>
112+
<configuration>
113+
<locales>ja</locales>
114+
<inputEncoding>UTF-8</inputEncoding>
115+
<outputEncoding>UTF-8</outputEncoding>
116+
</configuration>
117+
</plugin>
118+
<!-- JavaDoc -->
119+
<plugin>
120+
<groupId>org.apache.maven.plugins</groupId>
121+
<artifactId>maven-javadoc-plugin</artifactId>
122+
<version>2.8.1</version>
123+
<executions>
124+
<execution>
125+
<id>javadoc-jar</id>
126+
<phase>verify</phase>
127+
<goals>
128+
<goal>jar</goal>
129+
</goals>
130+
</execution>
131+
</executions>
132+
</plugin>
133+
</plugins>
134+
135+
<!-- Resources -->
136+
<resources>
137+
<resource>
138+
<targetPath>.</targetPath>
139+
<filtering>true</filtering>
140+
<directory>${basedir}/src/main/resources/</directory>
141+
<includes>
142+
<include>plugin.yml</include>
143+
<include>config.yml</include>
144+
</includes>
145+
</resource>
146+
</resources>
147+
</build>
148+
149+
<!-- Reporting -->
150+
<reporting>
151+
<plugins>
152+
<plugin>
153+
<groupId>org.apache.maven.plugins</groupId>
154+
<artifactId>maven-javadoc-plugin</artifactId>
155+
<version>2.8.1</version>
156+
<configuration>
157+
<charset>UTF-8</charset>
158+
</configuration>
159+
</plugin>
160+
</plugins>
161+
</reporting>
162+
163+
<!-- Repositories -->
164+
<repositories>
165+
<!-- Bukkit -->
166+
<repository>
167+
<id>Bukkit Official</id>
168+
<url>http://repo.bukkit.org/content/groups/public/</url>
169+
</repository>
170+
<!-- Vault -->
171+
<repository>
172+
<id>Vault Repo</id>
173+
<url>http://ci.herocraftonline.com/plugin/repository/everything</url>
174+
</repository>
175+
<!-- WorldEdit -->
176+
<repository>
177+
<id>spout-repo</id>
178+
<url>http://nexus.spout.org/content/groups/public/</url>
179+
</repository>
180+
</repositories>
181+
182+
<!-- Dependencies -->
183+
<dependencies>
184+
<!-- Bukkit Dependency -->
185+
<dependency>
186+
<groupId>org.bukkit</groupId>
187+
<artifactId>bukkit</artifactId>
188+
<version>1.3.2-R0.2-SNAPSHOT</version>
189+
<scope>compile</scope>
190+
</dependency>
191+
<!-- Vault Dependency -->
192+
<dependency>
193+
<groupId>net.milkbowl.vault</groupId>
194+
<artifactId>Vault</artifactId>
195+
<version>1.2.18-SNAPSHOT</version>
196+
<scope>compile</scope>
197+
</dependency>
198+
<!-- WorldEdit Dependency -->
199+
<dependency>
200+
<groupId>com.sk89q</groupId>
201+
<artifactId>worldedit</artifactId>
202+
<version>5.5-SNAPSHOT</version>
203+
<scope>compile</scope>
204+
</dependency>
205+
206+
<!-- Use Library (basedir/lib/) Directory -->
207+
<!-- Dynmap Dependency -->
208+
<dependency>
209+
<groupId>org.dynmap</groupId>
210+
<artifactId>dynmap-api</artifactId>
211+
<version>0.70.2</version>
212+
<scope>system</scope>
213+
<systemPath>${project.basedir}/lib/dynmap-0.70.2.jar</systemPath>
214+
</dependency>
215+
<!-- DeathNotifier Dependency -->
216+
<dependency>
217+
<groupId>com.titankingdoms.nodinchan</groupId>
218+
<artifactId>deathnotifier</artifactId>
219+
<version>2.2</version>
220+
<scope>system</scope>
221+
<systemPath>${project.basedir}/lib/DeathNotifier-2.2.jar</systemPath>
222+
</dependency>
223+
</dependencies>
224+
225+
<!-- Profiles -->
226+
<profiles>
227+
<profile>
228+
<id>jenkins</id>
229+
<activation>
230+
<property>
231+
<name>env.BUILD_NUMBER</name>
232+
</property>
233+
</activation>
234+
<properties>
235+
<project.build.number>${env.BUILD_NUMBER}</project.build.number>
236+
</properties>
237+
</profile>
238+
</profiles>
239+
240+
</project>

FlagGame/src/syam/FlagGame/Command/BaseCommand.java src/main/java/syam/FlagGame/Command/BaseCommand.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public abstract class BaseCommand {
2323
public int argLength = 0;
2424
public String usage;
2525
public boolean bePlayer = true;
26-
public Player player = null;
26+
public Player player;
2727
public String command;
2828
public FlagGame plugin;
2929

FlagGame/src/syam/FlagGame/Listeners/FGBlockListener.java src/main/java/syam/FlagGame/Listeners/FGBlockListener.java

+10
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
import syam.FlagGame.FlagGame;
2323
import syam.FlagGame.Enum.GameTeam;
24+
import syam.FlagGame.FGPlayer.PlayerManager;
2425
import syam.FlagGame.Game.Flag;
2526
import syam.FlagGame.Game.Game;
2627
import syam.FlagGame.Util.Actions;
@@ -109,6 +110,10 @@ public void onBlockBreak(final BlockBreakEvent event){
109110
}
110111
game.log(" Player "+player.getName()+" Break "+flag.getFlagType().name()+" Flag!");
111112

113+
// 破壊カウント追加
114+
PlayerManager.getProfile(player.getName()).addBreak();
115+
game.getProfile().addBreak();
116+
112117
return;
113118
}
114119

@@ -191,6 +196,11 @@ public void onBlockPlace(final BlockPlaceEvent event){
191196
game.message(GameTeam.BLUE, msgPrefix+ "&f'&6" + player.getName() +"&f'&cに"+flag.getTypeName()+"フラッグを獲得されました!");
192197
}
193198
game.log(" Player "+player.getName()+" Get "+flag.getFlagType().name()+" Flag!");
199+
200+
// 設置カウント追加
201+
PlayerManager.getProfile(player.getName()).addPlace();
202+
game.getProfile().addPlace();
203+
194204
return;
195205
}
196206

File renamed without changes.

FlagGame/src/plugin.yml src/main/resources/plugin.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## Plugin Information ##
22
name: FlagGame
3-
version: 0.1-SNAPSHOT
3+
version: version-number-unknown
44
main: syam.FlagGame.FlagGame
55
description: FlagMatch Gaming Plugin for SakuraServer
66
website: http://sakura-server.net/

0 commit comments

Comments
 (0)