Skip to content

Commit 86940c3

Browse files
committed
Now works on Spigot... With a caveat...
• RestocksToday is now a Paper-Only feature. Everything else is not so now Spigot can use those. • Main Class reorganized a bit. • Added VillagerInfo.isPaper boolean for Paper-Only Features. • Plugin will notify the console if VillagerInfo is not running on Paper or a Paper Fork. • config.yml updated with a note about "Number of Restocks" setting. • Don't be mad, I removed NotNull Annotations from onCommand. ;-;
1 parent 8186a2a commit 86940c3

File tree

6 files changed

+28
-12
lines changed

6 files changed

+28
-12
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,3 +111,4 @@ buildNumber.properties
111111

112112
# Common working directory
113113
run/
114+
src/main/java/META-INF/MANIFEST.MF

pom.xml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,20 +54,16 @@
5454

5555
<repositories>
5656
<repository>
57-
<id>papermc-repo</id>
57+
<id>papermc</id>
5858
<url>https://papermc.io/repo/repository/maven-public/</url>
5959
</repository>
60-
<repository>
61-
<id>sonatype</id>
62-
<url>https://oss.sonatype.org/content/groups/public/</url>
63-
</repository>
6460
</repositories>
6561

6662
<dependencies>
6763
<dependency>
6864
<groupId>io.papermc.paper</groupId>
6965
<artifactId>paper-api</artifactId>
70-
<version>1.17.1-R0.1-SNAPSHOT</version>
66+
<version>1.18.1-R0.1-SNAPSHOT</version>
7167
<scope>provided</scope>
7268
</dependency>
7369
</dependencies>

src/main/java/adhdmc/villagerinfo/VillagerHandler.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package adhdmc.villagerinfo;
22

33
import org.bukkit.Location;
4+
import org.bukkit.NamespacedKey;
45
import org.bukkit.Sound;
56
import org.bukkit.entity.*;
67
import org.bukkit.entity.memory.MemoryKey;
@@ -36,7 +37,7 @@ public void onVillagerClick(PlayerInteractEntityEvent event) {
3637
//Profession
3738
String villagerProfession = villagerClicked.getProfession().toString();
3839
//Restocks
39-
int villagerRestocks = villagerClicked.getRestocksToday();
40+
int villagerRestocks = VillagerInfo.isPaper ? villagerClicked.getRestocksToday() : Integer.MIN_VALUE;
4041
//Job Site
4142
Location villagerJobSite = villagerClicked.getMemory(MemoryKey.JOB_SITE);
4243
//Worked
@@ -55,6 +56,7 @@ public void onVillagerClick(PlayerInteractEntityEvent event) {
5556
boolean configHome = VillagerInfo.plugin.getConfig().getBoolean("Bed Location");
5657
boolean configLastSlept = VillagerInfo.plugin.getConfig().getBoolean("Last Slept");
5758
boolean configInventory = VillagerInfo.plugin.getConfig().getBoolean("Villager Inventory Contents");
59+
boolean debugData = true;
5860
//Prefix
5961
String villInfoPrefix = MessageHandler.prefix;
6062

@@ -148,7 +150,7 @@ public void onVillagerClick(PlayerInteractEntityEvent event) {
148150
}
149151

150152
//Restocks
151-
if(configRestocks) {
153+
if(configRestocks && villagerRestocks != Integer.MIN_VALUE) {
152154
player.sendMessage(GREEN + "RESTOCKS TODAY:\n " + AQUA + "• " + villagerRestocks);
153155
}
154156

src/main/java/adhdmc/villagerinfo/VillagerInfo.java

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,36 @@
11
package adhdmc.villagerinfo;
22

33
import adhdmc.villagerinfo.commands.CommandHandler;
4+
import org.bukkit.Bukkit;
5+
import org.bukkit.ChatColor;
46
import org.bukkit.plugin.java.JavaPlugin;
57

68
import java.util.Objects;
79

810
public final class VillagerInfo extends JavaPlugin {
911
public static VillagerInfo plugin;
12+
public static boolean isPaper;
1013
@Override
1114
public void onEnable(){
1215
plugin = this;
1316
getServer().getPluginManager().registerEvents(new VillagerHandler(), this);
1417
Objects.requireNonNull(this.getCommand("vill")).setExecutor(new CommandHandler());
18+
configDefaults();
19+
MessageHandler.loadConfigMsgs();
20+
paperCheck();
21+
}
22+
23+
private void paperCheck() {
24+
try {
25+
Class.forName("com.destroystokyo.paper.VersionHistoryManager$VersionData");
26+
isPaper = true;
27+
} catch (ClassNotFoundException e) {
28+
isPaper = false;
29+
Bukkit.getConsoleSender().sendMessage(ChatColor.YELLOW + "[VillagerInfo] This version does not run on Paper, some features may be disabled.");
30+
}
31+
}
32+
33+
private void configDefaults() {
1534
this.saveDefaultConfig();
1635
getConfig().addDefault("Profession", true);
1736
getConfig().addDefault("Job Site", true);
@@ -26,6 +45,5 @@ public void onEnable(){
2645
getConfig().addDefault("No Permission", "&cYou don't have permission to use this command!");
2746
getConfig().addDefault("No Command", "&cNo subcommand by that name!");
2847
getConfig().addDefault("Config Reload", "&6VillagerInfo Config Reloaded!");
29-
MessageHandler.loadConfigMsgs();
3048
}
3149
}

src/main/java/adhdmc/villagerinfo/commands/CommandHandler.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import org.bukkit.command.CommandSender;
1010
import org.bukkit.command.TabExecutor;
1111
import org.bukkit.entity.Player;
12-
import org.jetbrains.annotations.NotNull;
1312

1413
import java.util.ArrayList;
1514
import java.util.Arrays;
@@ -30,7 +29,7 @@ public List<String> onTabComplete(CommandSender sender, Command command, String
3029

3130

3231
@Override
33-
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @NotNull String label, String[] args) {
32+
public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
3433
Player user;
3534
//checking if player, error if not
3635
if (sender instanceof Player) {

src/main/resources/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Job Site: true
88

99
Last Worked: true
1010

11-
Number of Restocks: true
11+
Number of Restocks: true # This only works on Paper or Paper Forks.
1212

1313
Bed Location: true
1414

0 commit comments

Comments
 (0)