Fixed 1.13 furnace name update, added help command.

.gitlab-ci.yml

@@ -19,4 +19,3 @@ build:
     name: $name-$version
     paths:
     - "$path/*.jar"
-    - "$path/Read_this_before_your_first_use.txt"

Read_this_before_your_first_use.txt

@@ -1,20 +0,0 @@
-Hey loves,
-
-Thanks for downloading our instance ^_^ In order to
-run it you will need a instance called arconix. It
-basically takes a bunch of methods that we use all
-over the place throughout our instance lineup and
-stores it in one place so we don't have to write 
-new code every time we need to get something simple 
-done. So make sure to stay up to date with the latest
-updates for it.
-
-Link to download:
-https://gitlab.com/Songoda/Arconix/-/jobs/artifacts/master/download?job=build
-
-If you need help you can always join our
-discord in which is listed at the bottom of all of 
-our instance pages.
-
-Enjoy <3 
-Brianna & The Songoda Team.

core/pom.xml

@@ -58,13 +58,6 @@
         </resources>
     </build>
 
-    <repositories>
-        <repository>
-            <id>maven.sainttx.com</id>
-            <url>http://maven.sainttx.com/nexus/content/groups/public/</url>
-        </repository>
-    </repositories>
-
     <dependencies>
         <dependency>
             <groupId>org.spigotmc</groupId>
@@ -72,84 +65,72 @@
             <version>1.13.2</version>
             <scope>provided</scope>
         </dependency>
-
-        <dependency>
-            <groupId>net.milkbowl</groupId>
-            <artifactId>vault</artifactId>
-            <version>1.7.1</version>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
             <groupId>com.gmail.filoghost.holographicdisplays</groupId>
-            <artifactId>holographicdisplays</artifactId>
+            <artifactId>holographicdisplays-api</artifactId>
-            <version>LATEST</version>
+            <version>2.3.2</version>
             <scope>provided</scope>
         </dependency>
-
         <dependency>
             <groupId>com.songoda</groupId>
-            <artifactId>manager</artifactId>
+            <artifactId>craftbukkit-1-13</artifactId>
+            <version>4.1.2</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.songoda</groupId>
+            <artifactId>craftbukkit-1-8</artifactId>
             <version>4.1.2</version>
             <scope>compile</scope>
         </dependency>
-
         <dependency>
             <groupId>com.songoda</groupId>
             <artifactId>askyblock</artifactId>
             <version>4.1.2</version>
             <scope>compile</scope>
         </dependency>
-
-        <dependency>
-            <groupId>com.songoda</groupId>
-            <artifactId>griefprevention</artifactId>
-            <version>4.1.2</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.songoda</groupId>
-            <artifactId>kingdoms</artifactId>
-            <version>4.1.2</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.songoda</groupId>
-            <artifactId>plotsquared</artifactId>
-            <version>4.1.2</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.songoda</groupId>
-            <artifactId>towny</artifactId>
-            <version>4.1.2</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.songoda</groupId>
-            <artifactId>uskyblock</artifactId>
-            <version>4.1.2</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.songoda</groupId>
-            <artifactId>redprotect</artifactId>
-            <version>4.1.2</version>
-            <scope>compile</scope>
-        </dependency>
-
         <dependency>
             <groupId>com.songoda</groupId>
             <artifactId>factions</artifactId>
             <version>4.1.2</version>
             <scope>compile</scope>
         </dependency>
-
+        <dependency>
+            <groupId>com.songoda</groupId>
+            <artifactId>griefprevention</artifactId>
+            <version>4.1.2</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.songoda</groupId>
+            <artifactId>kingdoms</artifactId>
+            <version>4.1.2</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.songoda</groupId>
+            <artifactId>plotsquared</artifactId>
+            <version>4.1.2</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.songoda</groupId>
+            <artifactId>redprotect</artifactId>
+            <version>4.1.2</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.songoda</groupId>
+            <artifactId>towny</artifactId>
+            <version>4.1.2</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.songoda</groupId>
+            <artifactId>uskyblock</artifactId>
+            <version>4.1.2</version>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>com.songoda</groupId>
             <artifactId>worldguard</artifactId>
@@ -157,31 +138,16 @@
             <scope>compile</scope>
         </dependency>
         <dependency>
-
             <groupId>com.songoda</groupId>
             <artifactId>worldguard6</artifactId>
             <version>4.1.2</version>
             <scope>compile</scope>
         </dependency>
-
         <dependency>
-            <groupId>com.songoda</groupId>
+            <groupId>net.milkbowl</groupId>
-            <artifactId>craftbukkit-1-8</artifactId>
+            <artifactId>vault</artifactId>
-            <version>4.1.2</version>
+            <version>1.7.1</version>
-            <scope>compile</scope>
+            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.songoda</groupId>
-            <artifactId>craftbukkit-1-13</artifactId>
-            <version>4.1.2</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.songoda</groupId>
-            <artifactId>craftbukkit-1-13</artifactId>
-            <version>4.1.2</version>
-            <scope>compile</scope>
         </dependency>
     </dependencies>
 </project>

core/src/main/java/com/songoda/epicfurnaces/Locale.java

@@ -23,7 +23,7 @@ import java.util.stream.Collectors;
 public class Locale {
 
     private static final List<Locale> LOCALES = Lists.newArrayList();
-    private static final Pattern NODE_PATTERN = Pattern.compile("(\\w+(?:\\.{1}\\w+)*)\\s*=\\s*\"(.*)\"");
+    private static final Pattern NODE_PATTERN = Pattern.compile("(\\w+(?:\\.\\w+)*)\\s*=\\s*\"(.*)\"");
     private static final String FILE_EXTENSION = ".lang";
     private static JavaPlugin plugin;
     private static File localeFolder;

core/src/main/java/com/songoda/epicfurnaces/command/CommandManager.java

@@ -31,6 +31,7 @@ public class CommandManager implements CommandExecutor {
         addCommand(new CommandRemote(instance, commandEpicFurnaces));
         addCommand(new CommandGive(instance, commandEpicFurnaces));
         addCommand(new CommandBoost(instance, commandEpicFurnaces));
+        addCommand(new CommandHelp(instance, commandEpicFurnaces));
     }
 
     private AbstractCommand addCommand(AbstractCommand abstractCommand) {

core/src/main/java/com/songoda/epicfurnaces/command/commands/CommandEpicFurnaces.java

@@ -17,7 +17,7 @@ public class CommandEpicFurnaces extends AbstractCommand {
     @Override
     protected ReturnType runCommand(CommandSender sender, String... args) {
         sender.sendMessage("");
-        sender.sendMessage(StringUtils.formatText(instance.getLocale().getPrefix() + "&7Version " + instance.getDescription().getVersion() + " Created with <3 by &5&l&oBrianna"));
+        sender.sendMessage(StringUtils.formatText(instance.getLocale().getPrefix() + "&7Version " + instance.getDescription().getVersion() + " Created with <3 by &5&l&oSongoda"));
 
         for (AbstractCommand command : instance.getCommandManager().getCommands()) {
             if (command.getPermissionNode() == null || sender.hasPermission(command.getPermissionNode())) {

core/src/main/java/com/songoda/epicfurnaces/command/commands/CommandHelp.java

@@ -0,0 +1,46 @@
+package com.songoda.epicfurnaces.command.commands;
+
+import com.songoda.epicfurnaces.EpicFurnaces;
+import com.songoda.epicfurnaces.command.AbstractCommand;
+import com.songoda.epicfurnaces.utils.StringUtils;
+import org.bukkit.command.CommandSender;
+
+public class CommandHelp extends AbstractCommand {
+    private final EpicFurnaces instance;
+
+    public CommandHelp(EpicFurnaces instance, AbstractCommand parent) {
+        super("help", parent, false);
+        this.instance = instance;
+
+    }
+
+    @Override
+    protected AbstractCommand.ReturnType runCommand(CommandSender sender, String... args) {
+        sender.sendMessage("");
+        sender.sendMessage(StringUtils.formatText(instance.getLocale().getPrefix() + "&7Version " + instance.getDescription().getVersion() + " Created with <3 by &5&l&oSongoda"));
+
+        for (AbstractCommand command : instance.getCommandManager().getCommands()) {
+            if (command.getPermissionNode() == null || sender.hasPermission(command.getPermissionNode())) {
+                sender.sendMessage(StringUtils.formatText("&8 - &a" + command.getSyntax() + "&7 - " + command.getDescription()));
+            }
+        }
+        sender.sendMessage("");
+
+        return ReturnType.SUCCESS;
+    }
+
+    @Override
+    public String getDescription() {
+        return "Displays the help page.";
+    }
+
+    @Override
+    public String getPermissionNode() {
+        return null;
+    }
+
+    @Override
+    public String getSyntax() {
+        return "/ef help";
+    }
+}

core/src/main/java/com/songoda/epicfurnaces/objects/FurnaceObject.java

@@ -4,20 +4,29 @@ import com.songoda.epicfurnaces.EpicFurnaces;
 import com.songoda.epicfurnaces.menus.OverviewMenu;
 import com.songoda.epicfurnaces.utils.NMSUtil;
 import com.songoda.epicfurnaces.utils.StringUtils;
-import org.bukkit.*;
+import org.bukkit.Bukkit;
+import org.bukkit.GameMode;
+import org.bukkit.Location;
+import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockState;
 import org.bukkit.block.Furnace;
+import org.bukkit.craftbukkit.v1_13_R2.block.CraftFurnace;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.FurnaceSmeltEvent;
 import org.bukkit.inventory.FurnaceInventory;
 import org.bukkit.inventory.InventoryHolder;
+import org.bukkit.inventory.ItemStack;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.UUID;
 
-import static com.songoda.epicfurnaces.objects.FurnaceObject.BoostType.*;
+import static com.songoda.epicfurnaces.objects.FurnaceObject.BoostType.FUEL_SHARE;
+import static com.songoda.epicfurnaces.objects.FurnaceObject.BoostType.OVERHEAT;
 
 /**
  * Created by songoda on 3/7/2017.
@@ -111,13 +120,12 @@ public class FurnaceObject {
         BoostData boostData = instance.getBoostManager().getBoost(placedBy);
         r = r * (boostData == null ? 1 : boostData.getMultiplier());
 
-
+        if (e.getResult() == null) {
-        if (e.getResult() != null) {
-            e.getResult().setAmount(e.getResult().getAmount() + r);
             return;
         }
 
-//            e.setResult(new ItemStack(e.getResult().getType(), r));
+        e.getResult().setAmount(e.getResult().getAmount() + r);
+        e.setResult(new ItemStack(e.getResult().getType(), r));
     }
 
     public void upgrade(String type, Player player) {
@@ -177,17 +185,25 @@ public class FurnaceObject {
             return;
         }
 
+        String name = StringUtils.formatName(level.getLevel(), uses, false);
+
         try {
-            Object craftFurnace = NMSUtil.getCraftClass("block.CraftFurnace").cast(location.getBlock().getState());
+            CraftFurnace craftFurnace = (CraftFurnace) location.getBlock().getState();
-            Field inventoryField = craftFurnace.getClass().getDeclaredField("furnace");
+            craftFurnace.setCustomName(name);
-            Method getTileEntity = craftFurnace.getClass().getDeclaredMethod("getTileEntity");
+            craftFurnace.update(true);
+        } catch (Exception e) {
+            try {
+                Object craftFurnace = NMSUtil.getCraftClass("block.CraftFurnace").cast(location.getBlock().getState());
+                Field inventoryField = craftFurnace.getClass().getDeclaredField("furnace");
+                Method getTileEntity = craftFurnace.getClass().getDeclaredMethod("getTileEntity");
 
-            inventoryField.setAccessible(true);
+                inventoryField.setAccessible(true);
 
-            Object tileEntity = getTileEntity.invoke(craftFurnace);
+                Object tileEntity = getTileEntity.invoke(craftFurnace);
-            Method a = tileEntity.getClass().getDeclaredMethod("a", String.class);
+                Method a = tileEntity.getClass().getDeclaredMethod("a", String.class);
-            a.invoke(tileEntity, StringUtils.formatName(level.getLevel(), uses, false));
+                a.invoke(tileEntity, name);
-        } catch (Exception ignore) {
+            } catch (Exception ignore) {
+            }
         }
     }
 

hooks/craftbukkit-1-8/pom.xml

@@ -17,5 +17,11 @@
             <version>4.1.2</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot</artifactId>
+            <version>1.8.8</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 </project>

hooks/manager/pom.xml

@@ -16,10 +16,10 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.spigot</groupId>
+            <groupId>org.spigotmc</groupId>
-            <artifactId>spigot-api</artifactId>
+            <artifactId>spigot</artifactId>
-            <version>1.8.8-R0.1</version>
+            <version>1.8.8</version>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 </project>

hooks/manager/src/main/java/com/songoda/epicfurnaces/hook/ClaimableProtectionPluginHook.java

@@ -33,5 +33,4 @@ public interface ClaimableProtectionPluginHook extends ProtectionPluginHook {
      * @return the unique String ID. null if no claim exists
      */
     String getClaimID(String name);
-
 }

hooks/plotsquared/pom.xml

@@ -21,7 +21,7 @@
         <dependency>
             <groupId>com</groupId>
             <artifactId>plotsquared</artifactId>
-            <version>4</version>
+            <version>3.5.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

hooks/worldguard7/pom.xml

@@ -21,7 +21,7 @@
         <dependency>
             <groupId>com.sk89q</groupId>
             <artifactId>worldedit</artifactId>
-            <version>LATEST</version>
+            <version>7.0.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>