made protocollib softdependent, automatically changes mode when proto…

…collib not found.
InstantlyMoist · Mar 11, 2020 · ca038f6 · ca038f6
1 parent e4dfbbc
commit ca038f6
Show file tree

Hide file tree

Showing 12 changed files with 40 additions and 67 deletions.
diff --git a/.idea/discord.xml b/.idea/discord.xml
diff --git a/.idea/libraries/Maven__com_googlecode_json_simple_json_simple_1_1_1.xml b/.idea/libraries/Maven__com_googlecode_json_simple_json_simple_1_1_1.xml
diff --git a/.idea/libraries/Maven__junit_junit_4_10.xml b/.idea/libraries/Maven__junit_junit_4_10.xml
diff --git a/...et_md_5_bungeecord_chat_1_13_SNAPSHOT.xml → ...et_md_5_bungeecord_chat_1_15_SNAPSHOT.xml b/...et_md_5_bungeecord_chat_1_13_SNAPSHOT.xml → ...et_md_5_bungeecord_chat_1_15_SNAPSHOT.xml
diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml
diff --git a/...gotmc_spigot_api_1_13_2_R0_1_SNAPSHOT.xml → ...gotmc_spigot_api_1_15_2_R0_1_SNAPSHOT.xml b/...gotmc_spigot_api_1_13_2_R0_1_SNAPSHOT.xml → ...gotmc_spigot_api_1_15_2_R0_1_SNAPSHOT.xml
diff --git a/...raries/Maven__org_yaml_snakeyaml_1_23.xml → ...raries/Maven__org_yaml_snakeyaml_1_25.xml b/...raries/Maven__org_yaml_snakeyaml_1_23.xml → ...raries/Maven__org_yaml_snakeyaml_1_25.xml
diff --git a/pom.xml b/pom.xml
@@ -69,7 +69,7 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.13.2-R0.1-SNAPSHOT</version>
+            <version>1.15.2-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <!--bStats API-->

diff --git a/src/main/java/me/kyllian/xRay/XRayPlugin.java b/src/main/java/me/kyllian/xRay/XRayPlugin.java
@@ -7,6 +7,7 @@
 import me.kyllian.xRay.handlers.XRayHandler;
 import me.kyllian.xRay.listeners.PlayerMoveListener;
 import me.kyllian.xRay.listeners.PlayerQuitListener;
+import me.kyllian.xRay.tasks.TaskType;
 import org.bstats.bukkit.Metrics;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
@@ -26,9 +27,12 @@ public class XRayPlugin extends JavaPlugin {
 
     @Override
     public void onEnable() {
-        if (Bukkit.getPluginManager().getPlugin("ProtocolLib") == null) {
-            Bukkit.getLogger().warning("xRay has been disabled, please download Protocollib!");
-            Bukkit.getPluginManager().disablePlugin(this);
+        initializeConfig();
+        if (Bukkit.getPluginManager().getPlugin("ProtocolLib") == null &&
+                TaskType.valueOf(getConfig().getString("Settings.Mode")) == TaskType.CHUNK) {
+            Bukkit.getLogger().warning("ProtocolLib not found, changing mode to BLOCK");
+            getConfig().set("Settings.Mode", "BLOCK");
+            saveConfig();
             return;
         }
 
@@ -38,7 +42,7 @@ public void onEnable() {
 
         initializeHandlers();
         initializeListeners();
-        initializeConfig();
+
     }
 
     @Override
@@ -65,7 +69,8 @@ public void initializeConfig() {
 
         Map<String, WrappedBlockData> tempData = new HashMap<>();
         for (String block : getConfig().getStringList("Settings.xRayBlocks")) {
-            if (Bukkit.getVersion().contains("1.8") || Bukkit.getVersion().contains("1.7")) tempData.put(block, WrappedBlockData.createData(Material.valueOf(block), 1));
+            if (Bukkit.getVersion().contains("1.8") || Bukkit.getVersion().contains("1.7"))
+                tempData.put(block, WrappedBlockData.createData(Material.valueOf(block), 1));
             else tempData.put(block, WrappedBlockData.createData(Material.valueOf(block)));
         }
         data = Collections.unmodifiableMap(tempData);

diff --git a/src/main/java/me/kyllian/xRay/threads/ChunkThread.java b/src/main/java/me/kyllian/xRay/threads/ChunkThread.java
@@ -26,8 +26,9 @@ public ChunkThread(XRayPlugin plugin, Chunk chunk, Player player) {
         this.plugin = plugin;
         this.chunk = chunk;
         this.player = player;
-        barrierBlock = WrappedBlockData.createData(Material.BARRIER);
-        airBlock = WrappedBlockData.createData(Material.AIR);
+        boolean old = Bukkit.getVersion().contains("1.8") || Bukkit.getVersion().contains("1.7");
+        barrierBlock = old ? WrappedBlockData.createData(Material.BARRIER, 1) : WrappedBlockData.createData(Material.BARRIER);
+        airBlock =  old ? WrappedBlockData.createData(Material.AIR, 1) : WrappedBlockData.createData(Material.AIR);
     }
 
     public void startTask() {

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -1,8 +1,8 @@
 name: xRay
-version: 3.11
+version: 3.12
 main: me.kyllian.xRay.XRayPlugin
 description: A legit xRay
-depend: [ProtocolLib]
+softdepend: [ProtocolLib]
 api-version: 1.15
 
 commands:

diff --git a/xRay.iml b/xRay.iml
@@ -17,15 +17,12 @@
     </content>
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="inheritedJdk" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.13.2-R0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.15.2-R0.1-SNAPSHOT" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: junit:junit:4.10" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:21.0" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.gson:gson:2.8.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-chat:1.13-SNAPSHOT" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.23" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-chat:1.15-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.25" level="project" />
     <orderEntry type="library" name="Maven: org.bstats:bstats-bukkit:1.4" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.comphenix.protocol:ProtocolLib:4.4.0" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.comphenix.protocol:ProtocolLib-API:4.4.0" level="project" />