Skip to content

Commit fa91a15

Browse files
Add 1.20 support
* Also updated Javacord
1 parent ac70104 commit fa91a15

4 files changed

Lines changed: 41 additions & 6 deletions

File tree

pom.xml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,9 @@
129129
<configuration>
130130
<inputFile>./target/${project.name}-${build.version}-SHADED.jar</inputFile>
131131
<finalName>${project.name}-${build.version}-SHADED-REMAPPED-OBF</finalName>
132-
<srgIn>org.spigotmc:minecraft-server:1.18.2-R0.1-SNAPSHOT:txt:maps-mojang</srgIn>
132+
<srgIn>org.spigotmc:minecraft-server:1.20.1-R0.1-SNAPSHOT:txt:maps-mojang</srgIn>
133133
<reverse>true</reverse>
134-
<remappedDependencies>org.spigotmc:spigot:1.18.2-R0.1-SNAPSHOT:jar:remapped-mojang</remappedDependencies>
134+
<remappedDependencies>org.spigotmc:spigot:1.20.1-R0.1-SNAPSHOT:jar:remapped-mojang</remappedDependencies>
135135
<remappedArtifactAttached>true</remappedArtifactAttached>
136136
<remappedClassifierName>remapped-obf</remappedClassifierName>
137137
</configuration>
@@ -145,8 +145,8 @@
145145
<configuration>
146146
<inputFile>./target/${project.name}-${build.version}-SHADED-REMAPPED-OBF.jar</inputFile>
147147
<finalName>${project.name}-${build.version}</finalName>
148-
<srgIn>org.spigotmc:minecraft-server:1.18.2-R0.1-SNAPSHOT:csrg:maps-spigot</srgIn>
149-
<remappedDependencies>org.spigotmc:spigot:1.18.2-R0.1-SNAPSHOT:jar:remapped-obf</remappedDependencies>
148+
<srgIn>org.spigotmc:minecraft-server:1.20.1-R0.1-SNAPSHOT:csrg:maps-spigot</srgIn>
149+
<remappedDependencies>org.spigotmc:spigot:1.20.1-R0.1-SNAPSHOT:jar:remapped-obf</remappedDependencies>
150150
</configuration>
151151
</execution>
152152
</executions>
@@ -209,7 +209,7 @@
209209
<dependency>
210210
<groupId>org.javacord</groupId>
211211
<artifactId>javacord</artifactId>
212-
<version>3.4.0</version>
212+
<version>3.8.0</version>
213213
<scope>compile</scope>
214214
<type>pom</type>
215215
</dependency>
@@ -235,6 +235,7 @@
235235
<groupId>mysql</groupId>
236236
<artifactId>mysql-connector-java</artifactId>
237237
<version>8.0.25</version>
238+
<scope>compile</scope>
238239
</dependency>
239240

240241
<!-- COMPILE: MariaDB Database Driver -->

src/main/java/com/firecontroller1847/truediscordlink/TrueDiscordLink.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public boolean onAfterConfiguration() {
3131

3232
// Ensure that we are configured
3333
if (!this.getConfig().getBoolean("configured")) {
34-
this.getLogger().warning("TrueDiscordLink has not been configured! Configure the config.yml file and then reload the plugin.");
34+
this.getLogger().severe("TrueDiscordLink has not been configured! Configure the config.yml file and then reload the plugin.");
3535
return false;
3636
}
3737

src/main/java/com/firecontroller1847/truediscordlink/VersionHelper.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ protected VersionHelper(TrueDiscordLink discordlink) {
4040
advancementHelper = new AdvancementHelper$1_18_R2();
4141
} else if (version.equals("v1_19_R1")) {
4242
advancementHelper = new AdvancementHelper$1_19_R1();
43+
} else if (version.equals("v1_20_R1")) {
44+
advancementHelper = new AdvancementHelper$1_20_R1();
4345
} else {
4446
advancementHelper = new AdvancementHelper$UNSUPPORTED();
4547
}
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
package com.firecontroller1847.truediscordlink.nms.advancement;
2+
3+
import org.bukkit.advancement.Advancement;
4+
import org.bukkit.craftbukkit.v1_20_R1.advancement.CraftAdvancement;
5+
6+
import java.util.Objects;
7+
8+
public class AdvancementHelper$1_20_R1 implements IAdvancementHelper {
9+
10+
@Override
11+
public String getName(Advancement bukkitAdvancement) {
12+
try {
13+
CraftAdvancement advancement = (CraftAdvancement) bukkitAdvancement;
14+
return Objects.requireNonNull(advancement.getHandle().getDisplay()).getTitle().getString();
15+
} catch (Exception e) {
16+
e.printStackTrace();
17+
return null;
18+
}
19+
}
20+
21+
@Override
22+
public String getDescription(Advancement bukkitAdvancement) {
23+
try {
24+
CraftAdvancement advancement = (CraftAdvancement) bukkitAdvancement;
25+
return Objects.requireNonNull(advancement.getHandle().getDisplay()).getDescription().getString();
26+
} catch (Exception e) {
27+
e.printStackTrace();
28+
return null;
29+
}
30+
}
31+
32+
}

0 commit comments

Comments
 (0)