v3.2.1 : Fixed issue #4

ucchyocean · May 7, 2020 · da18545 · da18545
1 parent 08dba7b
commit da18545
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 112 deletions.
diff --git a/src/main/java/com/github/ucchyocean/ColorTeamingBridge.java b/src/main/java/com/github/ucchyocean/ColorTeamingBridge.java
diff --git a/src/main/java/com/github/ucchyocean/WireRod.java b/src/main/java/com/github/ucchyocean/WireRod.java
@@ -5,32 +5,27 @@
  */
 package com.github.ucchyocean;
 
-import com.github.ucchyocean.ct.ColorTeaming;
-
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
-import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.java.JavaPlugin;
 
 /**
  * ワイヤロッドプラグイン
- * 
+ *
  * @author ucchy
  */
 public class WireRod extends JavaPlugin {
 
-    private static final String NAME = "wirerod";
-
     private static WireRod instance;
 
     private WireRodConfig config;
 
     /**
      * プラグインが有効になったときに呼び出されるメソッド
-     * 
+     *
      * @see org.bukkit.plugin.java.JavaPlugin#onEnable()
      */
     public void onEnable() {
@@ -43,31 +38,6 @@ public void onEnable() {
         if (config.isEnableCraft()) {
             WireRodUtil.addRecipe();
         }
-
-        loadColorTeaming();
-    }
-
-    private void loadColorTeaming() {
-        if (!getServer().getPluginManager().isPluginEnabled("ColorTeaming")) {
-            return;
-        }
-
-        Plugin colorteaming = getServer().getPluginManager().getPlugin("ColorTeaming");
-        if (!(colorteaming instanceof ColorTeaming)) {
-            return;
-        }
-
-        String ctversion = colorteaming.getDescription().getVersion();
-        if (!isUpperVersion(ctversion, "2.2.5")) {
-            getLogger().warning("ColorTeaming was too old. The cooperation feature will be disabled.");
-            getLogger().warning("NOTE: Please use ColorTeaming v2.2.5 or later version.");
-            return;
-        }
-
-        getLogger().info(
-                "ColorTeaming was loaded. " + getDescription().getName() + " is in cooperation with ColorTeaming.");
-        new ColorTeamingBridge((ColorTeaming) colorteaming)
-                .registerItem(WireRodUtil.getWireRod(0), NAME, WireRodUtil.DISPLAY_NAME);
     }
 
     static WireRod getInstance() {
@@ -84,7 +54,7 @@ WireRodConfig getWireRodConfig() {
 
     /**
      * コマンドが実行されたときに呼び出されるメソッド
-     * 
+     *
      * @see org.bukkit.plugin.java.JavaPlugin#onCommand(org.bukkit.command.CommandSender,
      *      org.bukkit.command.Command, java.lang.String, java.lang.String[])
      */
@@ -115,7 +85,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
 
             return true;
         }
-        
+
         if (args[0].equalsIgnoreCase("get")) {
 
             if (!(sender instanceof Player)) {
@@ -139,7 +109,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
 
             return true;
         }
-        
+
         if (args.length >= 2 && args[0].equalsIgnoreCase("give")) {
 
             if (!sender.hasPermission("wirerod.give")) {
@@ -165,52 +135,4 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
 
         return false;
     }
-
-
-    /**
-     * 指定されたバージョンが、基準より新しいバージョンかどうかを確認する<br>
-     * 完全一致した場合もtrueになることに注意。
-     * 
-     * @param version 確認するバージョン
-     * @param border  基準のバージョン
-     * @return 基準より確認対象の方が新しいバージョンかどうか
-     */
-    private boolean isUpperVersion(String version, String border) {
-
-        int hyphen = version.indexOf("-");
-        if (hyphen > 0) {
-            version = version.substring(0, hyphen);
-        }
-
-        String[] versionArray = version.split("\\.");
-        int[] versionNumbers = new int[versionArray.length];
-        for (int i = 0; i < versionArray.length; i++) {
-            if (!versionArray[i].matches("[0-9]+"))
-                return false;
-            versionNumbers[i] = Integer.parseInt(versionArray[i]);
-        }
-
-        String[] borderArray = border.split("\\.");
-        int[] borderNumbers = new int[borderArray.length];
-        for (int i = 0; i < borderArray.length; i++) {
-            if (!borderArray[i].matches("[0-9]+"))
-                return false;
-            borderNumbers[i] = Integer.parseInt(borderArray[i]);
-        }
-
-        int index = 0;
-        while ((versionNumbers.length > index) && (borderNumbers.length > index)) {
-            if (versionNumbers[index] > borderNumbers[index]) {
-                return true;
-            } else if (versionNumbers[index] < borderNumbers[index]) {
-                return false;
-            }
-            index++;
-        }
-        if (borderNumbers.length == index) {
-            return true;
-        } else {
-            return false;
-        }
-    }
 }
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -3,7 +3,6 @@ main: com.github.ucchyocean.WireRod
 version: ${project.version}
 authors: [ucchy, Stnsllet, LazyGon]
 description: ${project.description}
-softdepend: [ColorTeaming]
 commands:
   wirerod:
     description: ${project.description}