Update to support latest MC

Author: Majekdor

.github/workflows/build.yml

@@ -15,11 +15,11 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
-    - name: setup JDK 11
+    - name: setup JDK 24
       uses: actions/setup-java@v2
       with:
-        java-version: '11'
-        distribution: 'adopt'
+        java-version: '24'
+        distribution: 'corretto'
         cache: maven
 
     - name: cache maven packages

.github/workflows/publish.yml

@@ -14,11 +14,11 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: setup JDK 11
+      - name: setup JDK 24
         uses: actions/setup-java@v2
         with:
-          java-version: '11'
-          distribution: 'adopt'
+          java-version: '24'
+          distribution: 'corretto'
           server-id: majek-repo
           settings-path: ${{ github.workspace }}
 

README.md

@@ -1,18 +1,29 @@
-<img align="right" src="https://github.com/MajekDev/SimpleHomes/blob/main/img/logo.png?raw=true" height="200" width="220">
-<h1 align="center">SimpleHomes by Majekdor</h1>
+<img align="right" src="https://github.com/MajekDev/SimpleHomes/blob/main/img/logo.png?raw=true" height="200" width="220" alt="SimpleHomes logo">
+<h1>SimpleHomes by Majekdor</h1>
 
-SimpleHomes is a stable base homes plugin. It offers all the essential features necessary in a homes plugin and some additional useful permissions. If you're looking for a more featured homes plugin with many more commands/permissions, then you'll want to take a look at UltimateHomes.
+SimpleHomes is a stable base homes plugin. It offers all the essential features necessary in a home plugin and some additional useful permissions.
 
-## Commands
+<img src="https://github.com/MajekDev/SimpleHomes/blob/main/img/features.png?raw=true" alt="Commands">
 
-There are only 5 commands in SimpleHomes.
-- **/sethome [name]** - Set a new home at your current location.
-- **/home [player|name] [name]** - Teleport to a certain home.
-- **/homes [player]** - View a paginated list of homes.
-- **/delhome [player|name] [name]** - Delete a certain home.
-- **/simplehomes [help|reload]** - Get help or reload the plugin.
+- User data stored in separate JSON files.
+- Paginated homes list with clickable text to traverse pages/go to homes.
+- All messages sent by the plugin are changeable/translatable.
+- Full PlaceholderAPI support.
+- Metrics through bStats.
+- Boss bar for teleport delay.
+- Permission-based max homes.
+- Completely open-source.
 
-## Permissions
+<img src="https://github.com/MajekDev/SimpleHomes/blob/main/img/commands.png?raw=true" alt="Commands">
+
+There are only five commands in SimpleHomes.
+- `/sethome [name]` - Set a new home at your current location.
+- `/home [player|name] [name]` - Teleport to a certain home.
+- `/homes [player]` - View a paginated list of homes.
+- `/delhome [player|name] [name]` - Delete a certain home.
+- `/simplehomes [help|reload]` - Get help or reload the plugin.
+
+<img src="https://github.com/MajekDev/SimpleHomes/blob/main/img/permissions.png?raw=true" alt="Permissions">
 
 There are a number of permissions available to modify what certain players can do.
 
@@ -27,39 +38,40 @@ These are given to all players automatically, but can be negated with a permissi
 These are only given to opped players automatically:
 - `simplehomes.delhome.other` - Allows players to delete another player's home.
 - `simplehomes.home.other` - Allows players to travel to another player's home.
-- `simplehomes.homes.other` - Allows players to view other player's homes.
+- `simplehomes.homes.other` - Allows players to view another player's homes.
 - `simplehomes.reload` - Allows players to reload the plugin.
 - `simplehomes.sethome.unlimited` - Allows players to set unlimited homes.
 - `simplehomes.delay.bypass` - Allows players to bypass the teleport delay.
 
 To set a player's max homes limit with permissions use `simplehomes.sethome.max.<integer>`, replacing `<integer>` with the number of max homes.
 
-> Note: If you set a lower home limit than what has been set before, the lower limit will not overwrite the higher limit. Meaning if a player has, for example, a home limit of 5 and you set it to 3 via permissions, it will remain 5. To lower it you must manually edit the player's JSON file. 
+> Note: If you set a lower home limit than what has been set before, the lower limit will not overwrite the higher limit. Meaning if a player has, for example, a home limit of 5, and you set it to 3 via permissions, it will remain 5. To lower it, you must manually edit the player's JSON file. 
 
-## Configuration
+<img src="https://github.com/MajekDev/SimpleHomes/blob/main/img/configuration.png?raw=true" alt="Configuration">
 
-The default `config.yml` is available [here](https://github.com/MajekDev/SimpleHomes/blob/main/src/main/resources/config.yml) where a handful of configuration options can be changed. To make these changes take effect run `/simplehomes reload`. If you have questions about the configuration or want to suggest a new configuration option you can discuss that in [Discord](https://discord.majek.dev).
+The default `config.yml` is available [here](https://github.com/MajekDev/SimpleHomes/blob/main/src/main/resources/config.yml) where a handful of configuration options can be changed. To make these changes take effect run `/simplehomes reload`. If you have questions about the configuration or want to suggest a new configuration option, you can discuss that in [Discord](https://discord.majek.dev).
 
-All messages sent by SimpleHomes are stored in the `lang.yml` file [here](https://github.com/MajekDev/SimpleHomes/blob/main/src/main/resources/lang.yml) and can be changed/translated. Color codes and other formatting are done using [MiniMessage](https://docs.adventure.kyori.net/minimessage.html#the-components). Legacy color codes (`&c`, `&l`, etc.) will not work. Those are being removed from Minecraft entirely in the near future.
+All messages sent by SimpleHomes are stored in the `lang.yml` file [here](https://github.com/MajekDev/SimpleHomes/blob/main/src/main/resources/lang.yml) and can be changed/translated. Color codes and other formatting are done using [MiniMessage](https://docs.adventure.kyori.net/minimessage.html#the-components). Legacy color codes (`&c`, `&l`, etc.) will not work. Those are being removed from Minecraft entirely soon.
 
-## For the nerds... I meean devs :P
+## Support
 
-SimpleHomes stores homes using JSON. When the plugin is installed the `playerdata` folder is created and every player has a file named with their unique id. When homes are set/deleted the file updates in real time. The plugin also depends heavily on [adventure](https://github.com/KyoriPowered/adventure) by Kyori for components in chat. SimpleHomes has an API and documentation for that is coming.
+<img src="https://github.com/MajekDev/SimpleHomes/blob/main/img/support.png?raw=true" alt="Configuration">
 
-## Support
+If you need help with the plugin and can't find the answer here, then the best way to get help is to join my [Discord](https://discord.gg/CGgvDUz). Make sure you read the frequently asked channel before posting in the bug-reports channel (if it's a bug) or in the simple-homes channel (for general help).
 
-If you need help with the plugin and can't find the answer here or on Spigot, then the best way to get help is to join my [Discord](https://discord.gg/CGgvDUz). Make sure you read the frequently-asked channel before posting in the bug-reports channel (if it's a bug) or in the simple-homes channel (for general help).
+If you have discovered a bug, you can either join my [Discord](https://discord.gg/CGgvDUz) and report it there or open an issue here on GitHub.
 
-If you have discovered a bug you can either join my [Discord](https://discord.gg/CGgvDUz) and report it there or open an issue here on GitHub. Please do not message me on Spigot in regard to a bug, there are easier ways to communicate.
+## For the nerds... I mean devs :P
 
+SimpleHomes stores homes using JSON. When the plugin is installed the `playerdata` folder is created and every player has a file named with their unique id. When homes are set/deleted the file updates in real time. The plugin also depends heavily on [adventure](https://github.com/KyoriPowered/adventure) by Kyori for components in chat. SimpleHomes has an API and documentation for that is coming.
 
-## Contributing
+### Contributing
 
 SimpleHomes is open-source and licensed under the [MIT License](https://github.com/MajekDev/SimpleHomes/blob/main/LICENSE), so if you want to use any code contained in the plugin or clone the repository and make some changes, go ahead!
 
-If you've found a bug within the plugin and would like to just make the changes to fix it yourself, you're free to do so and make a pull request here on GitHub. If you make significant contributions to the project, and by significant I mean one little PR to fix a tiny bug doesn't count as significant, you can earn the Contributor role in my [Discord](https://discord.gg/CGgvDUz).
+If you've found a bug within the plugin and would like to just make the changes to fix it yourself, you're free to do so and make a pull request on GitHub. If you make significant contributions to the project, and by significant I mean one little PR to fix a tiny bug doesn't count as significant, you can earn the Contributor role in my [Discord](https://discord.gg/CGgvDUz).
 
 
 ## Donate
 
-I'm a full time college student who makes and supports these plugins in my free time (when I have any). As a long time supporter of open source, most of my plugins are free. If you enjoy my plugins and would like to support me, you can buy me coffee over on  [PayPal](https://paypal.com/paypalme/majekdor). Donations of any amount are appreciated and a donation of $10 or more will get you the Supporter role in my [Discord](https://discord.gg/CGgvDUz)!
+I'm a full-time developer who makes and supports these plugins in my free time (when I have any). As a long-time supporter of open source, most of my plugins are free. If you enjoy my plugins and would like to support me, you can buy me coffee over on  [PayPal](https://paypal.com/paypalme/majekdor). Donations of any amount are appreciated, and a donation of $10 or more will get you the Supporter role in my [Discord](https://discord.gg/CGgvDUz)!

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>dev.majek.simplehomes</groupId>
     <artifactId>SimpleHomes</artifactId>
-    <version>1.0.3</version>
+    <version>1.1.0</version>
     <packaging>jar</packaging>
 
     <name>SimpleHomes</name>
@@ -30,16 +30,16 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
+                <version>3.11.0</version>
                 <configuration>
-                    <source>11</source>
-                    <target>11</target>
+                    <source>24</source>
+                    <target>24</target>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.4</version>
+                <version>3.6.2</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -90,67 +90,53 @@
 
     <repositories>
         <repository>
-            <id>papermc-repo</id>
-            <url>https://papermc.io/repo/repository/maven-public/</url>
+            <id>papermc</id>
+            <url>https://repo.papermc.io/repository/maven-public/</url>
         </repository>
         <repository>
             <id>sonatype</id>
             <url>https://oss.sonatype.org/content/groups/public/</url>
         </repository>
         <repository>
             <id>placeholderapi</id>
-            <url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
+            <url>https://repo.helpch.at/releases/</url>
         </repository>
     </repositories>
 
     <dependencies>
         <!-- PaperMC -->
         <dependency>
-            <groupId>com.destroystokyo.paper</groupId>
+            <groupId>io.papermc.paper</groupId>
             <artifactId>paper-api</artifactId>
-            <version>1.16.5-R0.1-SNAPSHOT</version>
+            <version>[26.1.2.build,)</version>
             <scope>provided</scope>
         </dependency>
         <!-- PlaceholderAPI -->
         <dependency>
             <groupId>me.clip</groupId>
             <artifactId>placeholderapi</artifactId>
-            <version>2.10.10</version>
+            <version>2.12.2</version>
             <scope>provided</scope>
         </dependency>
-        <!-- Adventure API -->
-        <dependency>
-            <groupId>net.kyori</groupId>
-            <artifactId>adventure-api</artifactId>
-            <version>4.9.3</version>
-            <scope>compile</scope>
-        </dependency>
         <!-- Adventure - Bukkit Specific -->
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-platform-bukkit</artifactId>
-            <version>4.0.0</version>
-            <scope>compile</scope>
-        </dependency>
-        <!-- Adventure MiniMessage -->
-        <dependency>
-            <groupId>net.kyori</groupId>
-            <artifactId>adventure-text-minimessage</artifactId>
-            <version>4.1.0-SNAPSHOT</version>
+            <version>4.4.1</version>
             <scope>compile</scope>
         </dependency>
         <!-- GSON -->
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.8.9</version>
+            <version>2.14.0</version>
             <scope>compile</scope>
         </dependency>
         <!-- bStats -->
         <dependency>
             <groupId>org.bstats</groupId>
             <artifactId>bstats-bukkit</artifactId>
-            <version>2.2.1</version>
+            <version>3.2.1</version>
             <scope>compile</scope>
         </dependency>
         <!-- ConfigUpdater -->

src/main/java/dev/majek/simplehomes/SimpleHomes.java

@@ -63,7 +63,6 @@ public void onEnable() {
                 } catch (IOException | JsonParseException e) {
                     SimpleHomes.core().getLogger().severe("Critical error loading player data from "
                             + dataStorage.getFile().getName());
-                    e.printStackTrace();
                     continue;
                 }
                 addToUserMap(new HomesPlayer(dataStorage, fileContents));
@@ -114,18 +113,18 @@ public void reload() {
         try {
             ConfigUpdater.update(core, "config.yml", configFile, Collections.emptyList());
         } catch (IOException e) {
-            e.printStackTrace();
+            this.getLogger().severe("Failed to update config.yml");
         }
         reloadConfig();
 
         // Initialize lang config
-        YAMLConfig langConfig = new YAMLConfig(core, null, "lang.yml");
+        YAMLConfig langConfig = new YAMLConfig(core, "lang.yml");
         File langFile = new File(core.getDataFolder(), "lang.yml");
         langConfig.saveDefaultConfig();
         try {
             ConfigUpdater.update(core, "lang.yml", langFile, Collections.emptyList());
         } catch (IOException e) {
-            e.printStackTrace();
+            this.getLogger().severe("Failed to update lang.yml");
         }
         langConfig.reloadConfig();
         lang = langConfig.getConfig();
@@ -200,7 +199,7 @@ public Map<UUID, HomesPlayer> getUserMap() {
      * @param location Teleport destination.
      */
     public void safeTeleportPlayer(final Player player, final Location location) {
-        player.addPotionEffect(new PotionEffect(PotionEffectType.DAMAGE_RESISTANCE, 140, 7));
+        player.addPotionEffect(new PotionEffect(PotionEffectType.RESISTANCE, 140, 7));
         player.teleport(location);
         player.setFallDistance(0);
         player.setVelocity(new Vector(0, 0.3, 0));

src/main/java/dev/majek/simplehomes/api/HomeDeleteEvent.java

@@ -62,6 +62,7 @@ public Home home() {
      * Whether or not the {@link #player()} is attempting to delete a home that belongs to them.
      * @return Own home?
      */
+    @SuppressWarnings("unused")
     public boolean deletingOwnHome() {
         return deletingOwnHome;
     }
@@ -88,8 +89,4 @@ public void setCancelled(boolean cancel) {
     public @NotNull HandlerList getHandlers() {
         return HANDLER_LIST;
     }
-
-    public static HandlerList getHandlerList() {
-        return HANDLER_LIST;
-    }
 }

src/main/java/dev/majek/simplehomes/api/HomeSetEvent.java

@@ -76,8 +76,4 @@ public void setCancelled(boolean cancel) {
     public @NotNull HandlerList getHandlers() {
         return HANDLER_LIST;
     }
-
-    public static HandlerList getHandlerList() {
-        return HANDLER_LIST;
-    }
 }

src/main/java/dev/majek/simplehomes/api/HomeTeleportEvent.java

@@ -80,6 +80,7 @@ public Location teleportingTo() {
      * Set where the {@link #player()} is teleporting to.
      * @param teleportingTo Teleport location.
      */
+    @SuppressWarnings("unused")
     public void teleportingTo(Location teleportingTo) {
         this.teleportingTo = teleportingTo;
     }
@@ -88,6 +89,7 @@ public void teleportingTo(Location teleportingTo) {
      * The location the {@link #player()} is teleporting from. This cannot be changed.
      * @return Previous location.
      */
+    @SuppressWarnings("unused")
     public Location teleportingFrom() {
         return teleportingFrom;
     }
@@ -104,6 +106,7 @@ public boolean noTeleportDelay() {
      * Set whether or not the {@link #player()} should teleport without a delay.
      * @param hasTeleportDelay Teleport delay?
      */
+    @SuppressWarnings("unused")
     public void hasTeleportDelay(boolean hasTeleportDelay) {
         this.hasTeleportDelay = hasTeleportDelay;
     }
@@ -120,6 +123,7 @@ public int teleportDelay() {
      * Set the teleport delay for the teleporting {@link #player()}.
      * @param teleportDelay Teleport delay.
      */
+    @SuppressWarnings("unused")
     public void teleportDelay(int teleportDelay) {
         this.teleportDelay = teleportDelay;
     }
@@ -128,6 +132,7 @@ public void teleportDelay(int teleportDelay) {
      * Whether or not the {@link #player()} is teleporting to their own {@link #home()}.
      * @return Own home?
      */
+    @SuppressWarnings("unused")
     public boolean toOwnHome() {
         return toOwnHome;
     }
@@ -155,7 +160,4 @@ public void setCancelled(boolean cancel) {
         return HANDLER_LIST;
     }
 
-    public static HandlerList getHandlerList() {
-        return HANDLER_LIST;
-    }
 }

src/main/java/dev/majek/simplehomes/api/SimpleHomesAPI.java

@@ -30,6 +30,7 @@ public void callEvent(Event event) {
      * @param name The home name for lookup.
      * @return {@link HomesPlayer}s with a home matching the name.
      */
+    @SuppressWarnings("unused")
     public List<HomesPlayer> homeLookup(String name) {
         List<HomesPlayer> owners = new ArrayList<>();
         for (HomesPlayer homesPlayer : SimpleHomes.core().getUserMap().values()) {
@@ -45,6 +46,7 @@ public List<HomesPlayer> homeLookup(String name) {
      * @param player The player.
      * @return List of homes.
      */
+    @SuppressWarnings("unused")
     public List<Home> getHomes(Player player) {
         return SimpleHomes.core().getHomesPlayer(player.getUniqueId()).getHomes();
     }
@@ -54,6 +56,7 @@ public List<Home> getHomes(Player player) {
      * @param player The offline player.
      * @return List of homes.
      */
+    @SuppressWarnings("unused")
     public List<Home> getHomes(OfflinePlayer player) {
         return SimpleHomes.core().getHomesPlayer(player.getUniqueId()).getHomes();
     }
@@ -64,6 +67,7 @@ public List<Home> getHomes(OfflinePlayer player) {
      * @param name The name of the new home.
      * @param location The location of the new home.
      */
+    @SuppressWarnings("unused")
     public void createHome(Player player, String name, Location location) {
         SimpleHomes.core().getHomesPlayer(player.getUniqueId()).addHome(new Home(name, location));
     }