Skip to content

Commit 0baf618

Browse files
committed
Update to 1.20.6
1 parent 61d6347 commit 0baf618

10 files changed

Lines changed: 163 additions & 433 deletions

File tree

build.gradle.kts

Lines changed: 0 additions & 44 deletions
This file was deleted.

gradle.properties

Whitespace-only changes.

pom.xml

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
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+
7+
<groupId>simplexity</groupId>
8+
<artifactId>VillagerInfo</artifactId>
9+
<version>4.0.0</version>
10+
<packaging>jar</packaging>
11+
12+
<name>VillagerInfo</name>
13+
14+
<properties>
15+
<java.version>21</java.version>
16+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
17+
</properties>
18+
19+
<build>
20+
<plugins>
21+
<plugin>
22+
<groupId>org.apache.maven.plugins</groupId>
23+
<artifactId>maven-compiler-plugin</artifactId>
24+
<version>3.8.1</version>
25+
<configuration>
26+
<source>21</source>
27+
<target>21</target>
28+
</configuration>
29+
</plugin>
30+
<plugin>
31+
<groupId>org.apache.maven.plugins</groupId>
32+
<artifactId>maven-shade-plugin</artifactId>
33+
<version>3.2.4</version>
34+
<executions>
35+
<execution>
36+
<phase>package</phase>
37+
<goals>
38+
<goal>shade</goal>
39+
</goals>
40+
</execution>
41+
</executions>
42+
</plugin>
43+
</plugins>
44+
<resources>
45+
<resource>
46+
<directory>src/main/resources</directory>
47+
<filtering>true</filtering>
48+
</resource>
49+
</resources>
50+
</build>
51+
52+
<repositories>
53+
<repository>
54+
<id>purpur</id>
55+
<name>Purpur Maven Repo</name>
56+
<url>https://repo.purpurmc.org/snapshots</url>
57+
</repository>
58+
<repository>
59+
<id>sonatype</id>
60+
<url>https://oss.sonatype.org/content/groups/public/</url>
61+
</repository>
62+
<repository>
63+
<id>placeholderapi</id>
64+
<url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
65+
</repository>
66+
</repositories>
67+
68+
<dependencies>
69+
<dependency>
70+
<groupId>org.purpurmc.purpur</groupId>
71+
<artifactId>purpur-api</artifactId>
72+
<version>1.20.6-R0.1-SNAPSHOT</version>
73+
<scope>provided</scope>
74+
</dependency>
75+
<dependency>
76+
<groupId>me.clip</groupId>
77+
<artifactId>placeholderapi</artifactId>
78+
<version>2.11.5</version>
79+
<scope>provided</scope>
80+
</dependency>
81+
</dependencies>
82+
</project>

settings.gradle.kts

Lines changed: 0 additions & 2 deletions
This file was deleted.

src/main/java/simplexity/villagerinfo/VillagerInfo.java

Lines changed: 2 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import net.kyori.adventure.text.minimessage.MiniMessage;
44
import org.bukkit.entity.BlockDisplay;
5-
import org.bukkit.entity.FallingBlock;
65
import org.bukkit.entity.Villager;
76
import org.bukkit.plugin.java.JavaPlugin;
87
import org.objectweb.asm.commons.Method;
@@ -21,25 +20,19 @@
2120
import simplexity.villagerinfo.interaction.logic.HighlightLogic;
2221

2322
import java.util.HashMap;
24-
import java.util.List;
2523
import java.util.Objects;
2624
import java.util.logging.Logger;
2725

2826
public final class VillagerInfo extends JavaPlugin {
2927
private final HashMap<Villager, BlockDisplay> currentlyHighlighted = new HashMap<>();
30-
private final HashMap<Villager, FallingBlock> legacyCurrentlyHighlighted = new HashMap<>();
3128
private static VillagerInfo instance;
3229

3330
public static VillagerInfo getInstance() {
3431
return instance;
3532
}
3633

3734
private final MiniMessage miniMessage = MiniMessage.miniMessage();
38-
private final List<String> legacyVersions = List.of("1.19", "1.19.1", "1.19.2", "1.19.3");
39-
private final List<String> nmsSupportedVersions = List.of("1.20.4");
4035
private boolean usingPurpur = true;
41-
private boolean legacyVersion = false;
42-
private boolean nmsUnsupported = false;
4336

4437
@Override
4538
public void onEnable() {
@@ -56,17 +49,6 @@ public void onEnable() {
5649
} catch (NoSuchMethodException e) {
5750
usingPurpur = false;
5851
}
59-
String serverVersion = this.getServer().getMinecraftVersion();
60-
if (legacyVersions.contains(serverVersion)) {
61-
legacyVersion = true;
62-
this.getVillagerInfoLogger().severe("You are on an old version, some options will not work as intended. Please update to the current minecraft version for full config options. Unsupported options in your version: ");
63-
this.getVillagerInfoLogger().warning("RGB Highlighting on workstations (1.19.4 implementation)");
64-
this.getVillagerInfoLogger().warning("Block displays for workstations (1.19.4 implementation)");
65-
}
66-
if (!nmsSupportedVersions.contains(serverVersion)) {
67-
nmsUnsupported = true;
68-
this.getVillagerInfoLogger().warning("Please note that the VillagerInfo version you are running is coded to run on Minecraft version " + nmsSupportedVersions + ". Methods that rely on NMS will be set to use legacy methods.");
69-
}
7052
reloadVillInfoConfigs();
7153
registerCommands();
7254
}
@@ -106,17 +88,6 @@ public MiniMessage getMiniMessage() {
10688
return miniMessage;
10789
}
10890

109-
public boolean isLegacyVersion() {
110-
return legacyVersion;
111-
}
112-
public boolean isNmsUnsupported() {
113-
return nmsUnsupported;
114-
}
115-
116-
public HashMap<Villager, FallingBlock> getLegacyCurrentlyHighlighted() {
117-
return legacyCurrentlyHighlighted;
118-
}
119-
12091
public HashMap<Villager, BlockDisplay> getCurrentlyHighlighted() {
12192
return currentlyHighlighted;
12293
}
@@ -129,6 +100,6 @@ public boolean isUsingPurpur() {
129100
public void onDisable() {
130101
HighlightLogic.getInstance().clearAllCurrentHighlights();
131102
}
132-
133-
103+
104+
134105
}

src/main/java/simplexity/villagerinfo/events/LegacyWorkstationRemoveHighlightEvent.java

Lines changed: 0 additions & 111 deletions
This file was deleted.

0 commit comments

Comments
 (0)