[U] Updated to 1.16.4 & [C] Add support for WorldBorder plugin

Author: ClayCoffee

…_Slimefun4_master_RC_7_g13cbe82_2501.xml …_Slimefun4_master_RC_7_g57590b2_2640.xml.idea/libraries/Maven__com_github_TheBusyBiscuit_Slimefun4_master_RC_7_g13cbe82_2501.xml renamed to .idea/libraries/Maven__com_github_TheBusyBiscuit_Slimefun4_master_RC_7_g57590b2_2640.xml .idea/libraries/Maven__com_github_TheBusyBiscuit_Slimefun4_master_RC_7_g13cbe82_2501.xml renamed to .idea/libraries/Maven__com_github_TheBusyBiscuit_Slimefun4_master_RC_7_g57590b2_2640.xml

@@ -29,7 +29,7 @@
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.26" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.github.TheBusyBiscuit:CS-CoreLib:master-v1.6.1-g832d33f-121" level="project" />
     <orderEntry type="library" name="Maven: com.github.Multiverse:Multiverse-Core:3afca50930" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.github.TheBusyBiscuit:Slimefun4:master-RC-7-g13cbe82-2501" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.github.TheBusyBiscuit:Slimefun4:master-RC-7-g57590b2-2640" level="project" />
     <orderEntry type="module-library">
       <library name="Maven: org.eclipse.jdt:Anotation:2.2.400">
         <CLASSES>
@@ -39,5 +39,14 @@
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Maven: com.wimbli:WorldBorder:1.9.10-beta">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/lib/WorldBorder.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
   </component>
 </module>

ClayTech.iml

@@ -16,10 +16,10 @@ You can join our discord server here: [Click this](https://discord.gg/sbNKCCs)
 * English(US) en-US (default)
 
 # 支持版本 / Supported Minecraft Server Version
-* Spigot / PaperSpigot 1.13.x
 * Spigot / PaperSpigot 1.14.x
 * Spigot / PaperSpigot 1.15.x
-* Spigot / PaperSpigot 1.16.x
+* Spigot / PaperSpigot 1.16.x  
+** For Minecraft 1.13.x, please use 1.2.17 or below.
 
 # API
 Javadocs: https://claycoffee.github.io/ClayTechWebsite/javadocs/

README.md

@@ -77,6 +77,13 @@
             <scope>system</scope>
             <systemPath>${project.basedir}/lib/org.eclipse.jdt.annotation_2.2.400.v20191120-1313.jar</systemPath>
         </dependency>
+        <dependency>
+            <groupId>com.wimbli</groupId>
+            <artifactId>WorldBorder</artifactId>
+            <version>1.9.10-beta</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/lib/WorldBorder.jar</systemPath>
+        </dependency>
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

lib/WorldBorder.jar

@@ -9,6 +9,7 @@
 import cn.claycoffee.ClayTech.implementation.resources.ClayFuel;
 import cn.claycoffee.ClayTech.listeners.*;
 import cn.claycoffee.ClayTech.utils.*;
+import com.wimbli.WorldBorder.WorldBorder;
 import io.github.thebusybiscuit.slimefun4.api.MinecraftVersion;
 import io.github.thebusybiscuit.slimefun4.api.SlimefunAddon;
 import io.github.thebusybiscuit.slimefun4.implementation.SlimefunPlugin;
@@ -17,13 +18,15 @@
 import org.bukkit.ChatColor;
 import org.bukkit.World;
 import org.bukkit.configuration.file.FileConfiguration;
-import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;
 import org.bukkit.generator.ChunkGenerator;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.scheduler.BukkitRunnable;
 
-import java.io.*;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -46,6 +49,7 @@ public class ClayTech extends JavaPlugin implements SlimefunAddon {
     private static FileConfiguration config;
     private static DataYML defaultLangYML;
     private static FileConfiguration defaultLang;
+    private static boolean worldBorderEnabled;
 
     public static ClayTech getInstance() {
         return plugin;
@@ -95,9 +99,17 @@ public static String getUpdateBranch() {
         return updateBranch;
     }
 
-    public static DataYML getDefaultLangYML() {return defaultLangYML;}
+    public static DataYML getDefaultLangYML() {
+        return defaultLangYML;
+    }
+
+    public static FileConfiguration getDefaultLang() {
+        return defaultLang;
+    }
 
-    public static FileConfiguration getDefaultLang() {return defaultLang;}
+    public static boolean isWorldBorderEnabled() {
+        return worldBorderEnabled;
+    }
 
     @SuppressWarnings({"unused", "static-access"})
     @Override
@@ -137,6 +149,8 @@ public void onEnable() {
         defaultLangYML.reloadCustomConfig();
         Lang.init();
         switch (version) {
+            case "v1_16_R3":
+                break;
             case "v1_16_R2":
                 break;
             case "v1_16_R1":
@@ -145,10 +159,6 @@ public void onEnable() {
                 break;
             case "v1_14_R1":
                 break;
-            case "v1_13_R2":
-                break;
-            case "v1_13_R1":
-                break;
             default:
                 compatible = false;
                 break;
@@ -181,6 +191,10 @@ public void onEnable() {
             Utils.info(Lang.readGeneralText("registeringError"));
             e.printStackTrace();
         }
+        if (this.getServer().getPluginManager().isPluginEnabled(WorldBorder.plugin)) {
+            Utils.info(Lang.readGeneralText("WorldBorder"));
+            worldBorderEnabled = true;
+        }
 
         Bukkit.getPluginManager().registerEvents(new MenuListener(), this);
         Bukkit.getPluginManager().registerEvents(new ItemInteractListener(), this);

pom.xml

@@ -1,11 +1,9 @@
 package cn.claycoffee.ClayTech.implementation.Planets;
 
-import cn.claycoffee.ClayTech.ClayTechItems;
 import cn.claycoffee.ClayTech.api.Planet;
 import cn.claycoffee.ClayTech.implementation.Planets.populators.*;
 import cn.claycoffee.ClayTech.utils.Lang;
 import cn.claycoffee.ClayTech.utils.Utils;
-import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem;
 import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.World.Environment;

src/main/java/cn/claycoffee/ClayTech/ClayTech.java

@@ -3,7 +3,6 @@
 import cn.claycoffee.ClayTech.utils.Lang;
 import cn.claycoffee.ClayTech.utils.Utils;
 import io.github.thebusybiscuit.slimefun4.core.attributes.EnergyNetComponent;
-import io.github.thebusybiscuit.slimefun4.core.attributes.EnergyNetProvider;
 import io.github.thebusybiscuit.slimefun4.core.networks.energy.EnergyNetComponentType;
 import io.github.thebusybiscuit.slimefun4.utils.ChestMenuUtils;
 import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils;

src/main/java/cn/claycoffee/ClayTech/implementation/Planets/Moon.java

@@ -119,6 +119,7 @@ public void run() {
                                                                         + target.getPlanetWorldName() + ".baseY");
                                                                 int Z = pd.getInt(p.getName() + "."
                                                                         + target.getPlanetWorldName() + ".baseZ");
+
                                                                 p.teleport(new Location(
                                                                         Bukkit.getWorld(target.getPlanetWorldName()), X,
                                                                         Y, Z), TeleportCause.PLUGIN);

src/main/java/cn/claycoffee/ClayTech/implementation/abstractMachines/ACraftingTable.java

@@ -14,7 +14,7 @@
 public class WeaponListener implements Listener {
     @EventHandler(priority = EventPriority.LOWEST)
     public void EntityDamageByEntityEvent(EntityDamageByEntityEvent e) {
-        if(e.isCancelled()) return;
+        if (e.isCancelled()) return;
         if (e.getDamager().getType() == EntityType.ARROW) {
             try {
                 Player d = (Player) ((Projectile) e.getDamager()).getShooter();