From 5fa929e6330c1d5d19f4c20a3d89e75623ca22bf Mon Sep 17 00:00:00 2001 From: TheBusyBiscuit Date: Fri, 30 Aug 2019 01:40:18 +0200 Subject: [PATCH] Reduced technical debt --- .../SlimefunItem/abstractItems/ADrill.java | 3 ++- .../Objects/SlimefunItem/abstractItems/AFarm.java | 2 +- .../SlimefunItem/abstractItems/MachineHelper.java | 8 ++++---- .../SlimefunItem/machines/ChargingBench.java | 3 ++- .../SlimefunItem/machines/ElectricDustWasher.java | 3 ++- .../SlimefunItem/machines/ElectricGoldPan.java | 3 ++- .../SlimefunItem/machines/ElectricSmeltery.java | 3 ++- .../machines/HeatedPressureChamber.java | 15 ++++++++++----- .../Objects/SlimefunItem/machines/OilPump.java | 3 ++- .../Objects/SlimefunItem/machines/Refinery.java | 3 ++- .../Slimefun/Objects/tasks/JetBootsTask.java | 2 +- .../Slimefun/Objects/tasks/JetpackTask.java | 2 +- .../Slimefun/Objects/tasks/ParachuteTask.java | 2 +- .../Slimefun/Setup/SlimefunSetup.java | 2 +- src/me/mrCookieSlime/Slimefun/SlimefunGuide.java | 2 +- .../mrCookieSlime/Slimefun/api/BlockStorage.java | 14 ++++++-------- .../Slimefun/hooks/PlaceholderAPIHook.java | 2 +- 17 files changed, 41 insertions(+), 31 deletions(-) diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/ADrill.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/ADrill.java index 2fb5449ec..83cc07a95 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/ADrill.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/ADrill.java @@ -109,7 +109,8 @@ public abstract class ADrill extends AContainer { @Override public void registerDefaultRecipes() {} - + + @Override protected void tick(Block b) { if (isProcessing(b)) { int timeleft = progress.get(b); diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AFarm.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AFarm.java index 282acf5bd..b57c74b2d 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AFarm.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AFarm.java @@ -164,7 +164,7 @@ public abstract class AFarm extends SlimefunItem { public int[] getOutputSlots() { return new int[] {19, 20, 21, 22, 23, 24, 25}; } - + protected void tick(Block b) { if (ChargableBlock.isChargable(b)) { if (ChargableBlock.getCharge(b) < getEnergyConsumption()) return; diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/MachineHelper.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/MachineHelper.java index aef06cf67..ec8112ec7 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/MachineHelper.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/MachineHelper.java @@ -12,14 +12,14 @@ public class MachineHelper { timeleft = String.valueOf(timeleft) + minutes + "m "; } l -= minutes * 60; - final int seconds = (int)l; + final int seconds = (int) l; timeleft = String.valueOf(timeleft) + seconds + "s"; return ChatColor.translateAlternateColorCodes('&', "&7" + timeleft + " left"); } public static String getProgress(int time, int total) { StringBuilder progress = new StringBuilder(); - float percentage = Math.round(((((total - time) * 100.0f) / total) * 100.0f) / 100.0f); + float percentage = Math.round(((((total - time) * 100.0F) / total) * 100.0F) / 100.0F); if (percentage < 16.0F) progress.append("&4"); else if (percentage < 32.0F) progress.append("&c"); @@ -47,7 +47,7 @@ public class MachineHelper { public static String getCoolant(int time, int total) { int passed = ((total - time) % 25); StringBuilder progress = new StringBuilder(); - float percentage = Math.round(((((25 - passed) * 100.0f) / 25) * 100.0f) / 100.0f); + float percentage = Math.round(((((25 - passed) * 100.0F) / 25) * 100.0F) / 100.0F); if (percentage < 33.0F) progress.append("&9"); else if (percentage < 66.0F) progress.append("&1"); @@ -71,7 +71,7 @@ public class MachineHelper { public static float getPercentage(int time, int total) { int passed = ((total - time) % 25); - return Math.round(((((25 - passed) * 100.0f) / 25) * 100.0f) / 100.0f); + return Math.round(((((25 - passed) * 100.0F) / 25) * 100.0F) / 100.0F); } public static short getDurability(ItemStack item, int timeleft, int max) { diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/ChargingBench.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/ChargingBench.java index 7e7872fc8..3fc221bdb 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/ChargingBench.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/ChargingBench.java @@ -62,7 +62,8 @@ public class ChargingBench extends AContainer { @Override public void registerDefaultRecipes() {} - + + @Override protected void tick(Block b) { if (ChargableBlock.getCharge(b) < getEnergyConsumption()) return; diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/ElectricDustWasher.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/ElectricDustWasher.java index 1cd1463aa..7c169204b 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/ElectricDustWasher.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/ElectricDustWasher.java @@ -43,7 +43,8 @@ public abstract class ElectricDustWasher extends AContainer { public void registerDefaultRecipes() {} public abstract int getSpeed(); - + + @Override protected void tick(Block b) { if (isProcessing(b)) { int timeleft = progress.get(b); diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/ElectricGoldPan.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/ElectricGoldPan.java index fede481dc..efcf6d781 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/ElectricGoldPan.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/ElectricGoldPan.java @@ -42,7 +42,8 @@ public abstract class ElectricGoldPan extends AContainer { public void registerDefaultRecipes() {} public abstract int getSpeed(); - + + @Override protected void tick(Block b) { if (isProcessing(b)) { int timeleft = progress.get(b); diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/ElectricSmeltery.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/ElectricSmeltery.java index 6cc7c98bf..5424bbdf0 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/ElectricSmeltery.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/ElectricSmeltery.java @@ -125,7 +125,8 @@ public abstract class ElectricSmeltery extends AContainer { this.registerDefaultRecipes(); } - + + @Override protected void constructMenu(BlockMenuPreset preset) { for (int i : border) { preset.addItem(i, new CustomItem(new ItemStack(Material.GRAY_STAINED_GLASS_PANE), " "), diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/HeatedPressureChamber.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/HeatedPressureChamber.java index 17de16fb5..dc8641a00 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/HeatedPressureChamber.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/HeatedPressureChamber.java @@ -101,19 +101,23 @@ public abstract class HeatedPressureChamber extends AContainer { registerRecipe(60, new ItemStack[] {SlimefunItems.NETHER_ICE, SlimefunItems.PLUTONIUM}, new ItemStack[]{new CustomItem(SlimefunItems.ENRICHED_NETHER_ICE, 4)}); registerRecipe(45, new ItemStack[] {SlimefunItems.ENRICHED_NETHER_ICE}, new ItemStack[]{new CustomItem(SlimefunItems.NETHER_ICE_COOLANT_CELL, 8)}); } - + + @Override public String getInventoryTitle() { return "&cHeated Pressure Chamber"; } - + + @Override public ItemStack getProgressBar() { return new ItemStack(Material.FLINT_AND_STEEL); } - + + @Override public int[] getInputSlots() { return new int[] {19, 20}; } - + + @Override public int[] getOutputSlots() { return new int[] {24, 25}; } @@ -139,7 +143,8 @@ public abstract class HeatedPressureChamber extends AContainer { super.register(slimefun); } - + + @Override protected void tick(Block b) { if (isProcessing(b)) { int timeleft = progress.get(b); diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/OilPump.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/OilPump.java index a2a2e1841..9ddf1086b 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/OilPump.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/OilPump.java @@ -82,7 +82,8 @@ public abstract class OilPump extends AContainer { @Override public void registerDefaultRecipes() {} - + + @Override protected void tick(Block b) { if (isProcessing(b)) { int timeleft = progress.get(b); diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/Refinery.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/Refinery.java index f3e08fb1f..fb84f4f6c 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/Refinery.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/Refinery.java @@ -44,7 +44,8 @@ public abstract class Refinery extends AContainer { public String getMachineIdentifier() { return "REFINERY"; } - + + @Override protected void tick(Block b) { if (isProcessing(b)) { int timeleft = progress.get(b); diff --git a/src/me/mrCookieSlime/Slimefun/Objects/tasks/JetBootsTask.java b/src/me/mrCookieSlime/Slimefun/Objects/tasks/JetBootsTask.java index 1f18d7fb8..a24f8cd6b 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/tasks/JetBootsTask.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/tasks/JetBootsTask.java @@ -32,7 +32,7 @@ public class JetBootsTask extends SlimefunTask { p.getWorld().playSound(p.getLocation(), Sound.ENTITY_TNT_PRIMED, (float) 0.25, 1); p.getWorld().playEffect(p.getLocation(), Effect.SMOKE, 1, 1); - p.setFallDistance(0.0f); + p.setFallDistance(0F); double gravity = 0.04; double offset = new Random().nextInt(2) == 1 ? accuracy: -accuracy; Vector vector = new Vector(p.getEyeLocation().getDirection().getX() * speed + offset, gravity, p.getEyeLocation().getDirection().getZ() * speed - offset); diff --git a/src/me/mrCookieSlime/Slimefun/Objects/tasks/JetpackTask.java b/src/me/mrCookieSlime/Slimefun/Objects/tasks/JetpackTask.java index 789885279..be9e2366a 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/tasks/JetpackTask.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/tasks/JetpackTask.java @@ -32,7 +32,7 @@ public class JetpackTask extends SlimefunTask { p.getWorld().playSound(p.getLocation(), Sound.ENTITY_GENERIC_EXPLODE, (float) 0.25, 1); p.getWorld().playEffect(p.getLocation(), Effect.SMOKE, 1, 1); - p.setFallDistance(0.0f); + p.setFallDistance(0F); Vector vector = new Vector(0, 1, 0); vector.multiply(thrust); vector.add(p.getEyeLocation().getDirection().multiply(0.2F)); diff --git a/src/me/mrCookieSlime/Slimefun/Objects/tasks/ParachuteTask.java b/src/me/mrCookieSlime/Slimefun/Objects/tasks/ParachuteTask.java index 9b5b32faa..9d25371cf 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/tasks/ParachuteTask.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/tasks/ParachuteTask.java @@ -16,7 +16,7 @@ public class ParachuteTask extends SlimefunTask { Vector vector = new Vector(0, 1, 0); vector.multiply(-0.1); p.setVelocity(vector); - p.setFallDistance(0.0f); + p.setFallDistance(0F); if (!p.isSneaking()) Bukkit.getScheduler().cancelTask(id); } diff --git a/src/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java b/src/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java index 391ce7f8f..21668b901 100644 --- a/src/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java +++ b/src/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java @@ -966,7 +966,7 @@ public final class SlimefunSetup { p.setVelocity(p.getEyeLocation().getDirection().multiply(4)); p.getWorld().playSound(p.getLocation(), Sound.ENTITY_TNT_PRIMED, 1, 1); p.getWorld().playEffect(p.getLocation(), Effect.SMOKE, 1); - p.setFallDistance(0.0f); + p.setFallDistance(0F); } else { Messages.local.sendTranslation(p, "messages.hungry", true); diff --git a/src/me/mrCookieSlime/Slimefun/SlimefunGuide.java b/src/me/mrCookieSlime/Slimefun/SlimefunGuide.java index 770b58408..a1aa586c1 100644 --- a/src/me/mrCookieSlime/Slimefun/SlimefunGuide.java +++ b/src/me/mrCookieSlime/Slimefun/SlimefunGuide.java @@ -423,7 +423,7 @@ public final class SlimefunGuide { ); List categories = Slimefun.current_categories; - List handlers = Slimefun.guide_handlers.values().stream().flatMap(list -> list.stream()).collect(Collectors.toList()); + List handlers = Slimefun.guide_handlers.values().stream().flatMap(List::stream).collect(Collectors.toList()); int index = 9; int pages = 1; diff --git a/src/me/mrCookieSlime/Slimefun/api/BlockStorage.java b/src/me/mrCookieSlime/Slimefun/api/BlockStorage.java index 5a61f55e1..438e187d7 100644 --- a/src/me/mrCookieSlime/Slimefun/api/BlockStorage.java +++ b/src/me/mrCookieSlime/Slimefun/api/BlockStorage.java @@ -104,7 +104,7 @@ public class BlockStorage { } else if (file.getName().endsWith(".sfb")) { if (timestamp + SlimefunStartup.instance.getSettings().BLOCK_LOADING_INFO_DELAY < System.currentTimeMillis()) { - System.out.println("[Slimefun] Loading Blocks... " + Math.round((((done * 100.0f) / total) * 100.0f) / 100.0f) + "% done (\"" + w.getName() + "\")"); + System.out.println("[Slimefun] Loading Blocks... " + Math.round((((done * 100.0F) / total) * 100.0F) / 100.0F) + "% done (\"" + w.getName() + "\")"); timestamp = System.currentTimeMillis(); } @@ -318,9 +318,9 @@ public class BlockStorage { } public static Config getLocationInfo(Location l) { - BlockStorage storage = getStorage(l.getWorld()); - Config cfg = storage.storage.get(l); - return cfg == null ? new BlockInfoConfig() : cfg; + BlockStorage storage = getStorage(l.getWorld()); + Config cfg = storage.storage.get(l); + return cfg == null ? new BlockInfoConfig() : cfg; } private static Map parseJSON(String json) { @@ -374,7 +374,7 @@ public class BlockStorage { } public static String getLocationInfo(Location l, String key) { - return getBlockInfo(l).getString(key); + return getLocationInfo(l).getString(key); } public static void addBlockInfo(Location l, String key, String value) { @@ -616,9 +616,7 @@ public class BlockStorage { if (menu != null) { for (HumanEntity human : new ArrayList<>(menu.toInventory().getViewers())) { // Prevents "java.lang.IllegalStateException: Asynchronous entity add!" when closing inventory while holding an item - Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, () -> { - human.closeInventory(); - }); + Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, () -> human.closeInventory()); } inventories.get(l).delete(l); diff --git a/src/me/mrCookieSlime/Slimefun/hooks/PlaceholderAPIHook.java b/src/me/mrCookieSlime/Slimefun/hooks/PlaceholderAPIHook.java index 27ca09aba..8013f0475 100644 --- a/src/me/mrCookieSlime/Slimefun/hooks/PlaceholderAPIHook.java +++ b/src/me/mrCookieSlime/Slimefun/hooks/PlaceholderAPIHook.java @@ -42,7 +42,7 @@ public class PlaceholderAPIHook extends PlaceholderExpansion { public String onRequest(OfflinePlayer p, String params) { if (params.equals("researches_total_xp_levels_spent")) { Stream stream = PlayerProfile.fromUUID(p.getUniqueId()).getResearches().stream(); - return String.valueOf(stream.mapToInt(r -> r.getCost()).sum()); + return String.valueOf(stream.mapToInt(Research::getCost).sum()); } if (params.equals("researches_total_researches_unlocked")) {