From 105b32583dcb0d7efbd589acb0c1a55ae59abfcb Mon Sep 17 00:00:00 2001 From: "Panda.com" Date: Sun, 1 Mar 2020 14:27:11 +0100 Subject: [PATCH] Changed requested changes --- .../items/androids/ScriptHolder.java | 4 +- .../listeners/GearListener.java | 41 +++++++++++-------- 2 files changed, 26 insertions(+), 19 deletions(-) diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/ScriptHolder.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/ScriptHolder.java index 22801e310..ff8659822 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/ScriptHolder.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/ScriptHolder.java @@ -72,7 +72,7 @@ abstract class ScriptHolder extends SimpleSlimefunItem { public void openScript(Player p, Block b, String script) { ChestMenu menu = new ChestMenu(ChatColor.DARK_AQUA + SlimefunPlugin.getLocal().getMessage(p, "android.scripts.editor")); - String[] commands = PatternUtils.SLASH_SEPARATOR.split(script); + String[] commands = PatternUtils.DASH.split(script); menu.addItem(0, new CustomItem(ScriptPart.START.getItem(), SlimefunPlugin.getLocal().getMessage(p, "android.scripts.instructions.START"), "", "&7\u21E8 &eLeft Click &7to return to the Android's interface")); menu.addMenuClickHandler(0, (pl, slot, item, action) -> { @@ -392,7 +392,7 @@ abstract class ScriptHolder extends SimpleSlimefunItem { protected void openScriptComponentEditor(Player p, Block b, String script, int index) { ChestMenu menu = new ChestMenu(ChatColor.DARK_AQUA + SlimefunPlugin.getLocal().getMessage(p, "android.scripts.editor")); - String[] commands = PatternUtils.SLASH_SEPARATOR.split(script); + String[] commands = PatternUtils.DASH.split(script); ChestMenuUtils.drawBackground(menu, 0, 1, 2, 3, 4, 5, 6, 7, 8); diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/GearListener.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/GearListener.java index ea8a255a6..3ba0b70c2 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/GearListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/GearListener.java @@ -25,33 +25,40 @@ public class GearListener implements Listener { @EventHandler public void onToggleSneak(PlayerToggleSneakEvent e) { if (!e.isSneaking()) return; - Player p = e.getPlayer(); + Player p = e.getPlayer(); if (p.getInventory().getChestplate() != null) { SlimefunItem chestplate = SlimefunItem.getByItem(p.getInventory().getChestplate()); - if (chestplate == null || !Slimefun.hasUnlocked(p, chestplate, true)) return; - - if (chestplate instanceof Jetpack) { - double thrust = ((Jetpack) chestplate).getThrust(); - - if (thrust > 0.2) - new JetpackTask(p, thrust).scheduleRepeating(0, 3); - } else if (chestplate.getID().equals("PARACHUTE")) - new ParachuteTask(p).scheduleRepeating(0, 3); + handleChestplate(p, chestplate); } if (p.getInventory().getBoots() != null) { SlimefunItem boots = SlimefunItem.getByItem(p.getInventory().getBoots()); - - if (boots instanceof JetBoots && Slimefun.hasUnlocked(p, boots, true)) { - double speed = ((JetBoots) boots).getSpeed(); - - if (speed > 0.2) - new JetBootsTask(p, speed).scheduleRepeating(0, 2); - } + handleBoots(p, boots); } if (SlimefunManager.containsSimilarItem(p.getInventory(), SlimefunItems.INFUSED_MAGNET, true)) new MagnetTask(p).scheduleRepeating(0, 8); } + + private void handleChestplate(Player p, SlimefunItem chestplate) { + if (chestplate == null || !Slimefun.hasUnlocked(p, chestplate, true)) return; + + if (chestplate instanceof Jetpack) { + double thrust = ((Jetpack) chestplate).getThrust(); + + if (thrust > 0.2) + new JetpackTask(p, thrust).scheduleRepeating(0, 3); + } else if (chestplate.getID().equals("PARACHUTE")) + new ParachuteTask(p).scheduleRepeating(0, 3); + } + + private void handleBoots(Player p, SlimefunItem boots) { + if (boots instanceof JetBoots && Slimefun.hasUnlocked(p, boots, true)) { + double speed = ((JetBoots) boots).getSpeed(); + + if (speed > 0.2) + new JetBootsTask(p, speed).scheduleRepeating(0, 2); + } + } }