Skip to content

Commit

Permalink
Merge pull request #169 from ucchyocean/feature/v3-k2
Browse files Browse the repository at this point in the history 
LunaChat v3
  • Loading branch information
@ucchyocean
ucchyocean authored Jun 14, 2020
2 parents 7fdb159 + 4a3aeef commit 758cfc0
Show file tree
Hide file tree
Showing 149 changed files with 13,696 additions and 6,014 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Build Status : [![Build Status](https://travis-ci.org/ucchyocean/LunaChat.svg?br
チャンネルチャットプラグイン<br />
<br />
ダウンロードはこちらから<br />
http://forum.minecraftuser.jp/viewtopic.php?f=38&t=13739<br />
https://github.com/ucchyocean/LunaChat/releases<br />
<br />
コマンドリファレンスや、設定リファレンスは、こちらから<br />
https://github.com/ucchyocean/LunaChat/wiki/Commands<br />
Expand Down
20 changes: 0 additions & 20 deletions distribution.xml
View file

This file was deleted.

88 changes: 37 additions & 51 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.github.ucchyocean</groupId>
<artifactId>LunaChat</artifactId>
<version>2.8.15</version>
<version>3.0.0</version>
<description>A powerfull chat channel plugin with IME (Kana-Kanji conversion) support</description>
<url>https://github.com/ucchyocean/LunaChat</url>

<licenses>
<license>
Expand All @@ -15,6 +16,8 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<java.version.short>8</java.version.short>
</properties>

<distributionManagement>
Expand All @@ -40,43 +43,27 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<source>${java.version}</source>
<target>${java.version}</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.1.0</version>
<configuration>
<source>1.8</source>
<source>${java.version}</source>
<encoding>UTF-8</encoding>
<docencoding>UTF-8</docencoding>
<charset>UTF-8</charset>
<show>public</show>
<nohelp>true</nohelp>
<links>
<link>https://docs.oracle.com/javase/jp/8/docs/api/</link>
<link>https://docs.oracle.com/javase/jp/${java.version.short}/docs/api/</link>
<link>https://hub.spigotmc.org/javadocs/bukkit/</link>
</links>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.1.1</version>
<configuration>
<finalName>${project.artifactId}-${project.version}</finalName>
<descriptors>
<descriptor>distribution.xml</descriptor>
</descriptors>
</configuration>
<executions>
<execution>
<phase>deploy</phase>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
Expand All @@ -100,6 +87,10 @@
<pattern>org.apache.commons.lang3</pattern>
<shadedPattern>com.github.ucchyocean.lc.lib.org.apache.commons.lang3</shadedPattern>
</relocation>
<relocation>
<pattern>org.jetbrains</pattern>
<shadedPattern>com.github.ucchyocean.lc.lib.org.jetbrains</shadedPattern>
</relocation>
</relocations>
</configuration>
</execution>
Expand All @@ -109,11 +100,6 @@
</build>

<repositories>
<repository>
<id>spigot-repo</id>
<name>Spigot Maven Repository</name>
<url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
</repository>
<repository>
<id>jitpack.io</id>
<name>Vault Repository</name>
Expand All @@ -127,12 +113,17 @@
<repository>
<id>onarandombox-repo</id>
<name>Multiverse repository</name>
<url>http://repo.onarandombox.com/content/groups/public/</url>
<url>http://repo.onarandombox.com/content/repositories/multiverse/</url>
</repository>
<repository>
<id>md5-repo</id>
<name>MD5 repository</name>
<url>https://repo.md-5.net/content/repositories/releases/</url>
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
</repository>
<repository>
<id>BungeeCord-repo</id>
<name>sonatype repository</name>
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
</repository>
</repositories>

Expand All @@ -143,6 +134,12 @@
<version>1.15.2-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.md-5</groupId>
<artifactId>bungeecord-api</artifactId>
<version>1.15-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.github.MilkBowl</groupId>
<artifactId>VaultAPI</artifactId>
Expand All @@ -157,24 +154,10 @@
<optional>true</optional>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>uk.co.oliwali</groupId>
<artifactId>HawkEye</artifactId>
<version>1.7.2</version>
<optional>true</optional>
<scope>system</scope>
<systemPath>${project.basedir}/lib/HawkEye.jar</systemPath>
<exclusions>
<exclusion>
<groupId>com.dthielke.herochat</groupId>
<artifactId>Herochat</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.onarandombox.multiversecore</groupId>
<artifactId>Multiverse-Core</artifactId>
<version>3.0.0</version>
<version>4.1.0</version>
<optional>true</optional>
<scope>provided</scope>
</dependency>
Expand All @@ -185,14 +168,6 @@
<optional>true</optional>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>me.botsko</groupId>
<artifactId>prism</artifactId>
<version>2.0.6</version>
<optional>true</optional>
<scope>system</scope>
<systemPath>${project.basedir}/lib/prism-2.0.6.jar</systemPath>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
Expand All @@ -203,5 +178,16 @@
<artifactId>commons-lang3</artifactId>
<version>3.9</version>
</dependency>
<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
<version>16.0.2</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>
Loading

0 comments on commit 758cfc0

Please sign in to comment.