Merge remote-tracking branch 'origin/master'

SBDPlugins · Oct 11, 2024 · 5022b6b · 5022b6b
2 parents 65fcfbc + da9ff36
commit 5022b6b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 40 deletions.
diff --git a/README.md b/README.md
@@ -1,22 +1,17 @@
-### Status
-[![Build Status](https://travis-ci.org/WirelessRedstoneGroup/WirelessRedstone.svg?branch=master)](https://travis-ci.org/WirelessRedstoneGroup/WirelessRedstone)
-
 ## WirelessRedstone
-Welcome on the official page of the Wireless Redstone plugin. [Spigot page.](https://www.spigotmc.org/resources/wirelessredstone.8251/)
 
-This repository contains a fork which will not be actively maintained. I'm not delivering support on this plugin.
+This resource contains a fork of the Wireless Redstone plugin.
+[Spigot page](https://www.spigotmc.org/resources/wirelessredstone-1-20.118121/)
+[Polymart page](https://polymart.org/resource/wirelessredstone-1-20.6130)
 
 ### Changes
-- Changed native API version to Spigot 1.19.2
-- Moved plugin to Java 11
+
+- Changed native API version to Spigot 1.21
+- Moved plugin to Java 17
 - Dropped support for Spigot 1.12.x and lower, also dropped support for WorldEdit 6
 - Removed updatechecker, metrics and sentry
 - Updated dependencies
 
-## Maven
-Maven >3.5.0 is required to build this plugin due to the revision tag.
-[https://stackoverflow.com/questions/10582054/maven-project-version-inheritance-do-i-have-to-specify-the-parent-version/51969067#51969067](https://stackoverflow.com/questions/10582054/maven-project-version-inheritance-do-i-have-to-specify-the-parent-version/51969067#51969067)
-
 ## Config
 
 | Key                         | Description                                                                                                                                                                                                                                                                                                                                                  |

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>net.licks92</groupId>
     <artifactId>WirelessRedstone</artifactId>
-    <version>4.2</version>
+    <version>4.2.1</version>
     <packaging>jar</packaging>
 
     <name>WirelessRedstone</name>

diff --git a/src/main/java/net/licks92/wirelessredstone/Utils.java b/src/main/java/net/licks92/wirelessredstone/Utils.java
@@ -11,29 +11,9 @@
 import java.util.Collection;
 
 public class Utils {
-
     private static final BlockFace[] axis = {BlockFace.SOUTH, BlockFace.WEST, BlockFace.NORTH, BlockFace.EAST};
     private static final BlockFace[] fullAxis = {BlockFace.SOUTH, BlockFace.WEST, BlockFace.NORTH, BlockFace.EAST, BlockFace.UP, BlockFace.DOWN};
 
-
-    /**
-     * This checks if the current Minecraft server version is compatible with WirelessRedstone.
-     *
-     * @return If the plugin is compatible
-     */
-    public static boolean isCompatible() {
-        final String packageName = Bukkit.getServer().getClass().getPackage().getName();
-        String bukkitVersion = packageName.substring(packageName.lastIndexOf('.') + 1);
-
-        try {
-            String[] pieces = bukkitVersion.substring(1).split("_");
-
-            return Integer.parseInt(pieces[0]) >= 1 && Integer.parseInt(pieces[1]) >= 8;
-        } catch (NumberFormatException | NullPointerException e) {
-            return false;
-        }
-    }
-
     /**
      * This checks if the new material system is in place.
      *

diff --git a/src/main/java/net/licks92/wirelessredstone/WirelessRedstone.java b/src/main/java/net/licks92/wirelessredstone/WirelessRedstone.java
@@ -79,19 +79,12 @@ public void setWorldEditHooker(InternalWorldEditHooker worldEditHooker) {
     @Override
     public void onEnable() {
         instance = this;
-
-        if (!Utils.isCompatible()) {
-            WRLogger.severe("**********");
-            WRLogger.severe("This plugin isn't compatible with this Minecraft version! Please check the bukkit/spigot page.");
-            WRLogger.severe("**********");
-            getPluginLoader().disablePlugin(this);
-        }
+        WRLogger = new WRLogger("[WirelessRedstone]", getServer().getConsoleSender(), config.getDebugMode(), config.getColorLogging());
 
         new MaterialLib(this).initialize();
 
         config = ConfigManager.getConfig();
         config.update(CHANNEL_FOLDER);
-        WRLogger = new WRLogger("[WirelessRedstone]", getServer().getConsoleSender(), config.getDebugMode(), config.getColorLogging());
         stringManager = new StringManager(config.getLanguage());
 
         storageManager = new StorageManager(config.getStorageType(), CHANNEL_FOLDER);