Skip to content

Commit f8ab771

Browse files
SimplyRinSimplyRin
authored
Merge pull request #1 from PegSaba/dev
1.5
2 parents 98c7f23 + 215c77f commit f8ab771

36 files changed

+394
-720
lines changed

‎.github/workflows/maven.yml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: Java CI
2+
3+
on: [push]
4+
5+
jobs:
6+
build:
7+
runs-on: ubuntu-latest
8+
9+
steps:
10+
- uses: actions/checkout@v2
11+
- name: Set up JDK 17
12+
uses: actions/setup-java@v2
13+
with:
14+
distribution: 'microsoft'
15+
java-version: '17'
16+
- name: Build with Maven
17+
run: mvn clean package

‎.gitignore‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1-
+.gitignore
2-
+.idea/
3-
+/target/
1+
.classpath
2+
.project
3+
4+
.idea/
5+
.settings/
6+
7+
bin/
8+
target/

‎bin/me/F_o_F_1092/TimeVote/TimeVote$2.class‎

-3.88 KB
Binary file not shown.

‎pom.xml‎

Lines changed: 111 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -1,117 +1,125 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
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>me.F_o_F_1092.TimeVote</groupId>
5-
<artifactId>TimeVote</artifactId>
6-
<version>1.4.2</version>
7-
<url>https://www.spigotmc.org/resources/timevote.7312/</url>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
<groupId>me.F_o_F_1092.TimeVote</groupId>
7+
<artifactId>TimeVote</artifactId>
8+
<version>1.5</version>
9+
<url>https://www.spigotmc.org/resources/timevote.7312/</url>
810

9-
<licenses>
10-
<license>
11-
<name>The MIT License (MIT)</name>
12-
<url>https://raw.githubusercontent.com/fof1092/TimeVote/master/LICENSE</url>
13-
<distribution>repo</distribution>
14-
</license>
15-
</licenses>
11+
<licenses>
12+
<license>
13+
<name>The MIT License (MIT)</name>
14+
<url>https://raw.githubusercontent.com/fof1092/TimeVote/master/LICENSE</url>
15+
<distribution>repo</distribution>
16+
</license>
17+
</licenses>
1618

17-
<issueManagement>
18-
<system>GitHub</system>
19-
<url>https://github.com/fof1092/TimeVote/issues</url>
20-
</issueManagement>
19+
<issueManagement>
20+
<system>GitHub</system>
21+
<url>https://github.com/fof1092/TimeVote/issues</url>
22+
</issueManagement>
2123

22-
<scm>
23-
<connection>scm:git:https://github.com/fof1092/TimeVote.git</connection>
24-
<url>https://github.com/fof1092/TimeVote/</url>
25-
</scm>
24+
<scm>
25+
<connection>scm:git:https://github.com/fof1092/TimeVote.git</connection>
26+
<url>https://github.com/fof1092/TimeVote/</url>
27+
</scm>
2628

27-
<properties>
28-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
29-
</properties>
29+
<properties>
30+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
31+
</properties>
3032

31-
<build>
32-
<finalName>${project.artifactId}-${project.version}</finalName>
33-
<resources>
34-
<resource>
35-
<directory>src/main/resources</directory>
36-
<filtering>true</filtering>
37-
</resource>
38-
</resources>
39-
<plugins>
40-
<plugin>
41-
<groupId>org.apache.maven.plugins</groupId>
42-
<artifactId>maven-compiler-plugin</artifactId>
43-
<version>3.6.0</version>
44-
<configuration>
45-
<source>1.8</source>
46-
<target>1.8</target>
47-
<encoding>UTF-8</encoding>
48-
</configuration>
49-
</plugin>
50-
</plugins>
51-
</build>
33+
<build>
34+
<finalName>${project.artifactId}-${project.version}</finalName>
35+
<resources>
36+
<resource>
37+
<directory>src/main/resources</directory>
38+
<filtering>true</filtering>
39+
</resource>
40+
</resources>
41+
<plugins>
42+
<plugin>
43+
<groupId>org.apache.maven.plugins</groupId>
44+
<artifactId>maven-compiler-plugin</artifactId>
45+
<version>3.6.0</version>
46+
<configuration>
47+
<source>1.8</source>
48+
<target>1.8</target>
49+
<encoding>UTF-8</encoding>
50+
</configuration>
51+
</plugin>
52+
</plugins>
53+
</build>
5254

53-
<repositories>
54-
<repository>
55-
<name>Spigot Repository</name>
56-
<id>spigot-repo</id>
57-
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
58-
</repository>
59-
<repository>
60-
<name>Vault Repository</name>
61-
<id>vault-repo</id>
62-
<url>http://nexus.hc.to/content/repositories/pub_releases</url>
63-
</repository>
64-
<repository>
65-
<name>BossbarAPI Repository</name>
66-
<id>inventive-repo</id>
67-
<url>https://repo.inventivetalent.org/content/groups/public/</url>
68-
</repository>
69-
<repository>
70-
<name>TitleAPI Repository</name>
71-
<id>androkai-repo</id>
72-
<url>https://repo.androkai.net/minecraft</url>
73-
</repository>
74-
</repositories>
55+
<repositories>
56+
<repository>
57+
<name>Spigot Repository</name>
58+
<id>spigot-repo</id>
59+
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
60+
</repository>
61+
<repository>
62+
<id>jitpack.io</id>
63+
<url>https://jitpack.io</url>
64+
</repository>
65+
<repository>
66+
<id>simplyrin-repo</id>
67+
<url>https://api.simplyrin.net/maven/</url>
68+
</repository>
69+
<repository>
70+
<id>essentials-releases</id>
71+
<url>https://repo.essentialsx.net/releases/</url>
72+
</repository>
73+
</repositories>
7574

76-
<dependencies>
77-
<!-- Bukkit -->
78-
<dependency>
79-
<groupId>org.bukkit</groupId>
80-
<artifactId>bukkit</artifactId>
81-
<version>1.11-R0.1-SNAPSHOT</version>
82-
<type>jar</type>
83-
<scope>provided</scope>
84-
</dependency>
75+
<dependencies>
76+
<!-- Spigot API -->
77+
<dependency>
78+
<groupId>org.spigotmc</groupId>
79+
<artifactId>spigot-api</artifactId>
80+
<version>1.19-R0.1-SNAPSHOT</version>
81+
<scope>provided</scope>
82+
</dependency>
8583

86-
<!-- Spigot API -->
87-
<dependency>
88-
<groupId>org.spigotmc</groupId>
89-
<artifactId>spigot-api</artifactId>
90-
<version>1.10.2-R0.1-SNAPSHOT</version>
91-
<scope>provided</scope>
92-
</dependency>
84+
<!-- Vault -->
85+
<dependency>
86+
<groupId>com.github.MilkBowl</groupId>
87+
<artifactId>VaultAPI</artifactId>
88+
<version>1.7</version>
89+
<scope>provided</scope>
90+
</dependency>
9391

94-
<!-- Vault -->
95-
<dependency>
96-
<groupId>net.milkbowl.vault</groupId>
97-
<artifactId>VaultAPI</artifactId>
98-
<version>1.6</version>
99-
</dependency>
92+
<!-- BossbarAPI -->
93+
<dependency>
94+
<groupId>org.inventivetalent</groupId>
95+
<artifactId>bossbarapi</artifactId>
96+
<version>2.4.3-SNAPSHOT</version>
97+
</dependency>
10098

101-
<!-- BossbarAPI -->
102-
<dependency>
103-
<groupId>org.inventivetalent</groupId>
104-
<artifactId>bossbarapi</artifactId>
105-
<version>2.4.1</version>
106-
</dependency>
99+
<!-- TitleAPI -->
100+
<dependency>
101+
<groupId>com.github.ConnorLinfoot</groupId>
102+
<artifactId>TitleAPI</artifactId>
103+
<version>1.8.1</version>
104+
<scope>provided</scope>
105+
</dependency>
107106

108-
<!-- TitleAPI -->
109-
<dependency>
110-
<groupId>com.connorlinfoot</groupId>
111-
<artifactId>TitleAPI</artifactId>
112-
<version>1.7.4</version>
113-
</dependency>
107+
<!-- EssentialsX API -->
108+
<dependency>
109+
<groupId>net.essentialsx</groupId>
110+
<artifactId>EssentialsX</artifactId>
111+
<version>2.20.0</version>
112+
<scope>provided</scope>
113+
</dependency>
114114

115-
</dependencies>
115+
<!-- lombok -->
116+
<dependency>
117+
<groupId>org.projectlombok</groupId>
118+
<artifactId>lombok</artifactId>
119+
<version>1.18.28</version>
120+
<scope>provided</scope>
121+
</dependency>
116122

117-
</project>
123+
</dependencies>
124+
125+
</project>

0 commit comments

Comments
 (0)