Merge pull request #16 from KaiijuMC/master

Add configurable coefficients and reload command

src/main/java/xyz/hynse/foliaflow/FoliaFlow.java

@@ -1,15 +1,32 @@
 package xyz.hynse.foliaflow;
 
 import org.bukkit.plugin.java.JavaPlugin;
+
+import xyz.hynse.foliaflow.command.ReloadCommand;
 import xyz.hynse.foliaflow.watcher.PortalWatcher;
 
 public class FoliaFlow extends JavaPlugin {
 
     public static FoliaFlow instance;
+    public static double horizontalCoefficient;
+    public static double verticalCoefficient;
 
     @Override
     public void onEnable() {
         instance = this;
+        register();
+        reload();
+    }
+
+    public void reload() {
+        saveDefaultConfig();
+        reloadConfig();
+        horizontalCoefficient = getConfig().getDouble("horizontal_coefficient");
+        verticalCoefficient = getConfig().getDouble("vertical_coefficient");
+    }
+
+    private void register() {
+        getCommand("flowreload").setExecutor(new ReloadCommand());
         getServer().getPluginManager().registerEvents(new PortalWatcher(), this);
     }
 }

src/main/java/xyz/hynse/foliaflow/command/ReloadCommand.java

@@ -0,0 +1,23 @@
+package xyz.hynse.foliaflow.command;
+
+import org.bukkit.ChatColor;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+
+import xyz.hynse.foliaflow.FoliaFlow;
+
+public class ReloadCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (!sender.hasPermission("foliaflow.reload")) return true;
+        try {
+            FoliaFlow.instance.reload();
+            sender.sendMessage(ChatColor.YELLOW + "FoliaFlow reloaded.");
+        } catch (Exception e) {
+            sender.sendMessage(ChatColor.RED + "Something went wrong reloading FoliaFlow, see the console for more.");
+            e.printStackTrace();
+        }
+        return true;
+    }
+}

src/main/java/xyz/hynse/foliaflow/watcher/PortalWatcher.java

@@ -17,6 +17,7 @@ import xyz.hynse.foliaflow.util.SchedulerUtil;
 import static xyz.hynse.foliaflow.util.VelocityUtil.getBlockMovingTo;
 
 public class PortalWatcher implements Listener {
+
     @EventHandler
     public void onFallingBlockToBlock(EntityChangeBlockEvent e){
         if(e.getEntityType() != EntityType.FALLING_BLOCK) return;
@@ -31,16 +32,15 @@ public class PortalWatcher implements Listener {
 
             FallingBlock dummy = loc.getWorld().spawnFallingBlock(spawnLoc, ((FallingBlock) entity).getBlockData());
             Vector dummyVel = vel.clone();
-            dummyVel.setY(-dummyVel.getY());
+            dummyVel.multiply(FoliaFlow.horizontalCoefficient);
-            dummyVel.multiply(1.3); // This seems vanilla.
+            dummyVel.setY(vel.getY() * FoliaFlow.verticalCoefficient);
-            dummyVel.add(new Vector(0, -0.2, 0));
             dummy.setVelocity(dummyVel);
 
             // Add vector seems vanilla.
             SchedulerUtil.runLaterEntity(dummy, FoliaFlow.instance, () -> {
                     // Portal teleportation on Folia is a bit below vanilla, so we teleport it above
                     if (SchedulerUtil.isFolia()) dummy.teleportAsync(dummy.getLocation().add(0, 0.5, 0));
-                    dummy.setVelocity(dummyVel.add(new Vector(0, 0.2, 0)));
+                    dummy.setVelocity(dummyVel);
                 },
                 2
             );

src/main/resources/config.yml

@@ -0,0 +1,7 @@
+# Don't touch this file unless you know what you're doing
+# Default values seems vanilla.
+# If you find values that seems more vanilla please create a PR
+# https://github.com/Hynse/FoliaFlow
+
+vertical_coefficient: -1.7
+horizontal_coefficient: 1.46

src/main/resources/paper-plugin.yml

@@ -1,5 +0,0 @@
-name: FoliaFlow
-version: '${version}'
-main: xyz.hynse.foliaflow.FoliaFlow
-api-version: 1.19
-folia-supported: true

src/main/resources/plugin.yml

@@ -3,3 +3,8 @@ version: '${version}'
 main: xyz.hynse.foliaflow.FoliaFlow
 api-version: 1.19
 folia-supported: true
+commands:
+  flowreload:
+    description: Reload FoliaFlow
+    usage: /<command>
+    permission: foliaflow.reload