Skip to content

Commit 9d89a23

Browse files
stefvanschiestefvanschie
committed
Drop versions 1.16.1-1.16.4, 1.17.0, 1.18.0-1.18.1 & 1.19.0-1.19.3
1 parent 0d53138 commit 9d89a23

File tree

114 files changed

+58
-18605
lines changed

Some content is hidden

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

114 files changed

+58
-18605
lines changed

‎.github/workflows/auto-deploy.yml‎

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -26,27 +26,21 @@ jobs:
2626
if: steps.cache-paperclip-jars.outputs.cache-hit != 'true'
2727
run: |
2828
mkdir -p paperclip
29-
wget https://api.papermc.io/v2/projects/paper/versions/1.16.1/builds/138/downloads/paper-1.16.1-138.jar -O paperclip/paper-1.16.1.jar
30-
wget https://api.papermc.io/v2/projects/paper/versions/1.16.3/builds/253/downloads/paper-1.16.3-253.jar -O paperclip/paper-1.16.3.jar
31-
wget https://api.papermc.io/v2/projects/paper/versions/1.16.4/builds/416/downloads/paper-1.16.4-416.jar -O paperclip/paper-1.16.4.jar
29+
wget https://api.papermc.io/v2/projects/paper/versions/1.16.5/builds/794/downloads/paper-1.16.5-794.jar -O paperclip/paper-1.16.5.jar
3230
- name: Set up JDK 11
3331
uses: actions/setup-java@v1
3432
with:
3533
java-version: 11
36-
- name: Generate 1.15 - 1.16 Paper jars
34+
- name: Generate 1.16 Paper jar
3735
if: steps.cache-paperclip-jars.outputs.cache-hit != 'true'
3836
working-directory: paperclip
3937
run: |
40-
java -jar paper-1.16.1.jar
41-
java -jar paper-1.16.3.jar
42-
java -jar paper-1.16.4.jar
43-
- name: Install 1.15 - 1.16 Paper jars
38+
java -jar paper-1.16.5.jar
39+
- name: Install 1.16 Paper jar
4440
if: steps.cache-paperclip-jars.outputs.cache-hit != 'true'
4541
working-directory: paperclip
4642
run: |
47-
mvn install:install-file -Dfile=cache/patched_1.16.1.jar -DgroupId="io.papermc" -DartifactId="paper" -Dversion="1.16.1-R0.1-SNAPSHOT" -Dpackaging="jar" -DgeneratePom="true"
48-
mvn install:install-file -Dfile=cache/patched_1.16.3.jar -DgroupId="io.papermc" -DartifactId="paper" -Dversion="1.16.3-R0.1-SNAPSHOT" -Dpackaging="jar" -DgeneratePom="true"
49-
mvn install:install-file -Dfile=cache/patched_1.16.4.jar -DgroupId="io.papermc" -DartifactId="paper" -Dversion="1.16.4-R0.1-SNAPSHOT" -Dpackaging="jar" -DgeneratePom="true"
43+
mvn install:install-file -Dfile=cache/patched_1.16.5.jar -DgroupId="io.papermc" -DartifactId="paper" -Dversion="1.16.5-R0.1-SNAPSHOT" -Dpackaging="jar" -DgeneratePom="true"
5044
- name: Set up JDK 21
5145
uses: actions/setup-java@v1
5246
with:
@@ -56,15 +50,8 @@ jobs:
5650
- name: Run paper-nms init
5751
if: steps.cache-paperclip-jars.outputs.cache-hit != 'true'
5852
run: |
59-
mvn paper-nms:init -pl nms/1_17_0
6053
mvn paper-nms:init -pl nms/1_17_1
61-
mvn paper-nms:init -pl nms/1_18_0
62-
mvn paper-nms:init -pl nms/1_18_1
6354
mvn paper-nms:init -pl nms/1_18_2
64-
mvn paper-nms:init -pl nms/1_19_0
65-
mvn paper-nms:init -pl nms/1_19_1
66-
mvn paper-nms:init -pl nms/1_19_2
67-
mvn paper-nms:init -pl nms/1_19_3
6855
mvn paper-nms:init -pl nms/1_19_4
6956
mvn paper-nms:init -pl nms/1_20_0
7057
mvn paper-nms:init -pl nms/1_20_1

‎.github/workflows/maven.yml‎

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -28,31 +28,25 @@ jobs:
2828
~/.m2/repository/ca/bkaw/paper-nms
2929
~/.m2/repository/org/spigotmc
3030
key: ${{ runner.os }}-${{ secrets.CACHE_VERSION }}-paperclip
31-
- name: Download Paperclip jars
31+
- name: Download Paperclip jar
3232
if: steps.cache-paperclip-jars.outputs.cache-hit != 'true'
3333
run: |
3434
mkdir -p paperclip
35-
wget https://api.papermc.io/v2/projects/paper/versions/1.16.1/builds/138/downloads/paper-1.16.1-138.jar -O paperclip/paper-1.16.1.jar
36-
wget https://api.papermc.io/v2/projects/paper/versions/1.16.3/builds/253/downloads/paper-1.16.3-253.jar -O paperclip/paper-1.16.3.jar
37-
wget https://api.papermc.io/v2/projects/paper/versions/1.16.4/builds/416/downloads/paper-1.16.4-416.jar -O paperclip/paper-1.16.4.jar
35+
wget https://api.papermc.io/v2/projects/paper/versions/1.16.5/builds/794/downloads/paper-1.16.5-794.jar -O paperclip/paper-1.16.5.jar
3836
- name: Set up JDK 11
3937
uses: actions/setup-java@v1
4038
with:
4139
java-version: 11
42-
- name: Generate 1.14=5 - 1.16 Paper jars
40+
- name: Generate 1.16 Paper jar
4341
if: steps.cache-paperclip-jars.outputs.cache-hit != 'true'
4442
working-directory: paperclip
4543
run: |
46-
java -jar paper-1.16.1.jar
47-
java -jar paper-1.16.3.jar
48-
java -jar paper-1.16.4.jar
49-
- name: Install 1.15 - 1.16 Paper jars
44+
java -jar paper-1.16.5.jar
45+
- name: Install 1.16 Paper jar
5046
if: steps.cache-paperclip-jars.outputs.cache-hit != 'true'
5147
working-directory: paperclip
5248
run: |
53-
mvn install:install-file -Dfile=cache/patched_1.16.1.jar -DgroupId="io.papermc" -DartifactId="paper" -Dversion="1.16.1-R0.1-SNAPSHOT" -Dpackaging="jar" -DgeneratePom="true"
54-
mvn install:install-file -Dfile=cache/patched_1.16.3.jar -DgroupId="io.papermc" -DartifactId="paper" -Dversion="1.16.3-R0.1-SNAPSHOT" -Dpackaging="jar" -DgeneratePom="true"
55-
mvn install:install-file -Dfile=cache/patched_1.16.4.jar -DgroupId="io.papermc" -DartifactId="paper" -Dversion="1.16.4-R0.1-SNAPSHOT" -Dpackaging="jar" -DgeneratePom="true"
49+
mvn install:install-file -Dfile=cache/patched_1.16.5.jar -DgroupId="io.papermc" -DartifactId="paper" -Dversion="1.16.5-R0.1-SNAPSHOT" -Dpackaging="jar" -DgeneratePom="true"
5650
- name: Set up JDK 21
5751
uses: actions/setup-java@v1
5852
with:
@@ -62,15 +56,8 @@ jobs:
6256
- name: Run paper-nms init
6357
if: steps.cache-paperclip-jars.outputs.cache-hit != 'true'
6458
run: |
65-
mvn paper-nms:init -pl nms/1_17_0
6659
mvn paper-nms:init -pl nms/1_17_1
67-
mvn paper-nms:init -pl nms/1_18_0
68-
mvn paper-nms:init -pl nms/1_18_1
6960
mvn paper-nms:init -pl nms/1_18_2
70-
mvn paper-nms:init -pl nms/1_19_0
71-
mvn paper-nms:init -pl nms/1_19_1
72-
mvn paper-nms:init -pl nms/1_19_2
73-
mvn paper-nms:init -pl nms/1_19_3
7461
mvn paper-nms:init -pl nms/1_19_4
7562
mvn paper-nms:init -pl nms/1_20_0
7663
mvn paper-nms:init -pl nms/1_20_1

‎IF/pom.xml‎

Lines changed: 1 addition & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -57,25 +57,7 @@
5757
</dependency>
5858
<dependency>
5959
<groupId>com.github.stefvanschie.inventoryframework</groupId>
60-
<artifactId>1_16_1</artifactId>
61-
<version>${project.version}</version>
62-
<scope>compile</scope>
63-
</dependency>
64-
<dependency>
65-
<groupId>com.github.stefvanschie.inventoryframework</groupId>
66-
<artifactId>1_16_2-3</artifactId>
67-
<version>${project.version}</version>
68-
<scope>compile</scope>
69-
</dependency>
70-
<dependency>
71-
<groupId>com.github.stefvanschie.inventoryframework</groupId>
72-
<artifactId>1_16_4-5</artifactId>
73-
<version>${project.version}</version>
74-
<scope>compile</scope>
75-
</dependency>
76-
<dependency>
77-
<groupId>com.github.stefvanschie.inventoryframework</groupId>
78-
<artifactId>1_17_0</artifactId>
60+
<artifactId>1_16_5</artifactId>
7961
<version>${project.version}</version>
8062
<scope>compile</scope>
8163
</dependency>
@@ -85,48 +67,12 @@
8567
<version>${project.version}</version>
8668
<scope>compile</scope>
8769
</dependency>
88-
<dependency>
89-
<groupId>com.github.stefvanschie.inventoryframework</groupId>
90-
<artifactId>1_18_0</artifactId>
91-
<version>${project.version}</version>
92-
<scope>compile</scope>
93-
</dependency>
94-
<dependency>
95-
<groupId>com.github.stefvanschie.inventoryframework</groupId>
96-
<artifactId>1_18_1</artifactId>
97-
<version>${project.version}</version>
98-
<scope>compile</scope>
99-
</dependency>
10070
<dependency>
10171
<groupId>com.github.stefvanschie.inventoryframework</groupId>
10272
<artifactId>1_18_2</artifactId>
10373
<version>${project.version}</version>
10474
<scope>compile</scope>
10575
</dependency>
106-
<dependency>
107-
<groupId>com.github.stefvanschie.inventoryframework</groupId>
108-
<artifactId>1_19_0</artifactId>
109-
<version>${project.version}</version>
110-
<scope>compile</scope>
111-
</dependency>
112-
<dependency>
113-
<groupId>com.github.stefvanschie.inventoryframework</groupId>
114-
<artifactId>1_19_1</artifactId>
115-
<version>${project.version}</version>
116-
<scope>compile</scope>
117-
</dependency>
118-
<dependency>
119-
<groupId>com.github.stefvanschie.inventoryframework</groupId>
120-
<artifactId>1_19_2</artifactId>
121-
<version>${project.version}</version>
122-
<scope>compile</scope>
123-
</dependency>
124-
<dependency>
125-
<groupId>com.github.stefvanschie.inventoryframework</groupId>
126-
<artifactId>1_19_3</artifactId>
127-
<version>${project.version}</version>
128-
<scope>compile</scope>
129-
</dependency>
13076
<dependency>
13177
<groupId>com.github.stefvanschie.inventoryframework</groupId>
13278
<artifactId>1_19_4</artifactId>

‎IF/src/main/java/com/github/stefvanschie/inventoryframework/util/version/Version.java‎

Lines changed: 5 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -17,32 +17,11 @@
1717
public enum Version {
1818

1919
/**
20-
* Version 1.16.1
20+
* Version 1.16.5
2121
*
22-
* @since 0.10.0
23-
*/
24-
V1_16_1,
25-
26-
/**
27-
* Version 1.16.2 - 1.16.3
28-
*
29-
* @since 0.10.0
30-
*/
31-
V1_16_2_3,
32-
33-
/**
34-
* Version 1.16.4 - 1.16.5
35-
*
36-
* @since 0.10.0
37-
*/
38-
V1_16_4_5,
39-
40-
/**
41-
* Version 1.17
42-
*
43-
* @since 0.10.0
22+
* @since 0.12.0
4423
*/
45-
V1_17_0,
24+
V1_16_5,
4625

4726
/**
4827
* Version 1.17.1
@@ -51,55 +30,13 @@ public enum Version {
5130
*/
5231
V1_17_1,
5332

54-
/**
55-
* Version 1.18.0
56-
*
57-
* @since 0.10.4
58-
*/
59-
V1_18_0,
60-
61-
/**
62-
* Version 1.18.1
63-
*
64-
* @since 0.10.4
65-
*/
66-
V1_18_1,
67-
6833
/**
6934
* Version 1.18.2
7035
*
7136
* @since 0.10.5
7237
*/
7338
V1_18_2,
7439

75-
/**
76-
* Version 1.19.0
77-
*
78-
* @since 0.10.6
79-
*/
80-
V1_19_0,
81-
82-
/**
83-
* Version 1.19.1
84-
*
85-
* @since 0.10.7
86-
*/
87-
V1_19_1,
88-
89-
/**
90-
* Version 1.19.2
91-
*
92-
* @since 0.10.7
93-
*/
94-
V1_19_2,
95-
96-
/**
97-
* Version 1.19.3
98-
*
99-
* @since 0.10.8
100-
*/
101-
V1_19_3,
102-
10340
/**
10441
* Version 1.19.4
10542
*
@@ -219,10 +156,7 @@ public enum Version {
219156
*/
220157
@NotNull
221158
private static final Collection<@NotNull Version> LEGACY_SMITHING_TABLE_VERSIONS = EnumSet.of(
222-
V1_16_1, V1_16_2_3, V1_16_4_5,
223-
V1_17_0, V1_17_1,
224-
V1_18_0, V1_18_1, V1_18_2,
225-
V1_19_0, V1_19_1, V1_19_2, V1_19_3, V1_19_4
159+
V1_16_5, V1_17_1, V1_18_2, V1_19_4
226160
);
227161

228162
/**
@@ -289,32 +223,12 @@ public static Version getVersion() {
289223
String version = Bukkit.getBukkitVersion().split("-")[0];
290224

291225
switch (version) {
292-
case "1.16.1":
293-
return V1_16_1;
294-
case "1.16.2":
295-
case "1.16.3":
296-
return V1_16_2_3;
297-
case "1.16.4":
298226
case "1.16.5":
299-
return V1_16_4_5;
300-
case "1.17":
301-
return V1_17_0;
227+
return V1_16_5;
302228
case "1.17.1":
303229
return V1_17_1;
304-
case "1.18":
305-
return V1_18_0;
306-
case "1.18.1":
307-
return V1_18_1;
308230
case "1.18.2":
309231
return V1_18_2;
310-
case "1.19":
311-
return V1_19_0;
312-
case "1.19.1":
313-
return V1_19_1;
314-
case "1.19.2":
315-
return V1_19_2;
316-
case "1.19.3":
317-
return V1_19_3;
318232
case "1.19.4":
319233
return V1_19_4;
320234
case "1.20":

0 commit comments

Comments
 (0)