From 8e873ccd00e8de06006e83f266f7e118a4b2da37 Mon Sep 17 00:00:00 2001 From: DanLT Date: Wed, 1 Sep 2021 13:09:45 -0800 Subject: [PATCH] Cleanup --- .../iris/core/commands/CommandStudio.java | 3 +-- .../volmit/iris/core/service/BoardSVC.java | 26 +++++-------------- .../volmit/iris/engine/framework/Engine.java | 9 +++---- .../iris/engine/mantle/EngineMantle.java | 3 +-- .../volmit/iris/engine/object/IrisSeed.java | 6 ++--- 5 files changed, 13 insertions(+), 34 deletions(-) diff --git a/src/main/java/com/volmit/iris/core/commands/CommandStudio.java b/src/main/java/com/volmit/iris/core/commands/CommandStudio.java index 72891f843..aa4ae0645 100644 --- a/src/main/java/com/volmit/iris/core/commands/CommandStudio.java +++ b/src/main/java/com/volmit/iris/core/commands/CommandStudio.java @@ -272,8 +272,7 @@ public class CommandStudio implements DecreeExecutor { } try { - if(biome.getLoadFile() == null) - { + if (biome.getLoadFile() == null) { sender().sendMessage(C.GOLD + "Cannot find the file for the biome you are in! Perhaps it was not loaded directly from a file?"); return; } diff --git a/src/main/java/com/volmit/iris/core/service/BoardSVC.java b/src/main/java/com/volmit/iris/core/service/BoardSVC.java index 755e91d84..3308c3da6 100644 --- a/src/main/java/com/volmit/iris/core/service/BoardSVC.java +++ b/src/main/java/com/volmit/iris/core/service/BoardSVC.java @@ -31,22 +31,13 @@ import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.format.C; import com.volmit.iris.util.format.Form; -import com.volmit.iris.util.math.RollingSequence; import com.volmit.iris.util.plugin.IrisService; -import com.volmit.iris.util.scheduling.ChronoLatch; import com.volmit.iris.util.scheduling.J; import lombok.Data; -import net.minecraft.server.dedicated.ThreadWatchdog; -import org.bukkit.Bukkit; -import org.bukkit.World; -import org.bukkit.boss.BarColor; -import org.bukkit.boss.BarStyle; -import org.bukkit.boss.BossBar; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.player.PlayerChangedWorldEvent; import org.bukkit.event.player.PlayerJoinEvent; -import org.bukkit.event.player.PlayerToggleSneakEvent; import java.util.List; @@ -94,36 +85,31 @@ public class BoardSVC implements IrisService, BoardProvider { return C.GREEN + "Iris"; } - public void tick() - { - boards.forEach((k,v) -> v.update()); + public void tick() { + boards.forEach((k, v) -> v.update()); } @Override public List getLines(Player player) { PlayerBoard pb = boards.computeIfAbsent(player, PlayerBoard::new); - synchronized (pb.lines) - { + synchronized (pb.lines) { return pb.lines; } } @Data - public static class PlayerBoard - { + public static class PlayerBoard { private final Player player; private final KList lines; - public PlayerBoard(Player player) - { + public PlayerBoard(Player player) { this.player = player; this.lines = new KList<>(); update(); } public void update() { - synchronized (lines) - { + synchronized (lines) { lines.clear(); if (!IrisToolbelt.isIrisStudioWorld(player.getWorld())) { diff --git a/src/main/java/com/volmit/iris/engine/framework/Engine.java b/src/main/java/com/volmit/iris/engine/framework/Engine.java index 2fc33b23a..4185dff3e 100644 --- a/src/main/java/com/volmit/iris/engine/framework/Engine.java +++ b/src/main/java/com/volmit/iris/engine/framework/Engine.java @@ -188,12 +188,10 @@ public interface Engine extends DataProvider, Fallible, LootProvider, BlockUpdat default IrisBiome getCaveOrMantleBiome(int x, int y, int z) { MatterCavern m = getMantle().getMantle().get(x, y, z, MatterCavern.class); - if(m != null && m.getCustomBiome() != null && !m.getCustomBiome().isEmpty()) - { + if (m != null && m.getCustomBiome() != null && !m.getCustomBiome().isEmpty()) { IrisBiome biome = getData().getBiomeLoader().load(m.getCustomBiome()); - if(biome != null) - { + if (biome != null) { return biome; } } @@ -727,8 +725,7 @@ public interface Engine extends DataProvider, Fallible, LootProvider, BlockUpdat int getCacheID(); - default IrisBiome getBiomeOrMantle(Location l) - { + default IrisBiome getBiomeOrMantle(Location l) { return getBiomeOrMantle(l.getBlockX(), l.getBlockY(), l.getBlockZ()); } } diff --git a/src/main/java/com/volmit/iris/engine/mantle/EngineMantle.java b/src/main/java/com/volmit/iris/engine/mantle/EngineMantle.java index ff93cb2ef..936520b9c 100644 --- a/src/main/java/com/volmit/iris/engine/mantle/EngineMantle.java +++ b/src/main/java/com/volmit/iris/engine/mantle/EngineMantle.java @@ -313,8 +313,7 @@ public interface EngineMantle extends IObjectPlacer { return false;// TODO: } - default int getLoadedRegionCount() - { + default int getLoadedRegionCount() { return getMantle().getLoadedRegionCount(); } } diff --git a/src/main/java/com/volmit/iris/engine/object/IrisSeed.java b/src/main/java/com/volmit/iris/engine/object/IrisSeed.java index b67506b1f..947f0c154 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisSeed.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisSeed.java @@ -37,13 +37,11 @@ public class IrisSeed { @Desc("To calculate a seed Iris passes in it's natural seed for the current feature, then mixes it with your seed. Setting this to true ignores the parent seed and always uses your exact seed ignoring the input of Iris feature seeds. You can use this to match seeds on other generators.") private boolean ignoreNaturalSeedInput = false; - public long getSeed(long seed) - { + public long getSeed(long seed) { return (seed * 47) + getSeed() + 29334667L; } - public RNG rng(long inseed) - { + public RNG rng(long inseed) { return new RNG(getSeed(inseed)); } }