Initial support for Minecraft 1.20. Fixes #161

Editing the backside of standing signs is not functioning properly yet
rutgerkok · Jun 11, 2023 · bfba62e · bfba62e
1 parent 0ca8b44
commit bfba62e
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -30,7 +30,7 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.18-R0.1-SNAPSHOT</version>
+            <version>1.20-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
             <exclusions>
                 <exclusion>

diff --git a/src/main/java/nl/rutgerkok/blocklocker/impl/SchedulerSupport.java b/src/main/java/nl/rutgerkok/blocklocker/impl/SchedulerSupport.java
@@ -63,7 +63,6 @@ final class SchedulerSupport {
                     .getMethod("runAtFixedRate", Plugin.class, Consumer.class, long.class, long.class, TimeUnit.class);
             folia = true;
         } catch (NoSuchMethodException e) {
-            e.printStackTrace(System.err);
             folia = false;
         }
     }

diff --git a/src/main/java/nl/rutgerkok/blocklocker/impl/event/InteractListener.java b/src/main/java/nl/rutgerkok/blocklocker/impl/event/InteractListener.java
@@ -183,9 +183,9 @@ private void handleAllowed(PlayerInteractEvent event, Protection protection, boo
 
         // Select signs
         if (clickedSign) {
-            if ((isOwner || player.hasPermission(Permissions.CAN_ADMIN)) && !usedOffHand && !player.isSneaking()) {
-                Sign sign = (Sign) clickedBlock.getState();
-                player.openSign(sign);
+            if ((!isOwner && !player.hasPermission(Permissions.CAN_ADMIN)) || usedOffHand || player.isSneaking()) {
+                // Don't open sign editor in these cases
+                event.setCancelled(true);
             }
             return;
         }

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -3,7 +3,7 @@ version: "${project.version}"
 main: nl.rutgerkok.blocklocker.impl.BlockLockerPluginImpl
 author: Rutger Kok
 load: startup
-api-version: 1.18
+api-version: "1.20"
 softdepend: [Guilds, Factions, mcMMO, Towny]
 folia-supported: true
 permissions: