mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-07-18 18:23:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
DanLT 2021-09-01 13:09:45 -08:00
parent 7a188af002
commit 8e873ccd00
5 changed files with 13 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/volmit/iris/core/commands/CommandStudio.java
View File

@ -272,8 +272,7 @@ public class CommandStudio implements DecreeExecutor {
} }
try { 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?"); sender().sendMessage(C.GOLD + "Cannot find the file for the biome you are in! Perhaps it was not loaded directly from a file?");
return; return;
} }

26
src/main/java/com/volmit/iris/core/service/BoardSVC.java
View File

@ -31,22 +31,13 @@ import com.volmit.iris.util.collection.KList;
import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.collection.KMap;
import com.volmit.iris.util.format.C; import com.volmit.iris.util.format.C;
import com.volmit.iris.util.format.Form; 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.plugin.IrisService;
import com.volmit.iris.util.scheduling.ChronoLatch;
import com.volmit.iris.util.scheduling.J; import com.volmit.iris.util.scheduling.J;
import lombok.Data; 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.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.player.PlayerChangedWorldEvent; import org.bukkit.event.player.PlayerChangedWorldEvent;
import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.player.PlayerToggleSneakEvent;
import java.util.List; import java.util.List;
@ -94,36 +85,31 @@ public class BoardSVC implements IrisService, BoardProvider {
return C.GREEN + "Iris"; return C.GREEN + "Iris";
} }
public void tick() public void tick() {
{ boards.forEach((k, v) -> v.update());
boards.forEach((k,v) -> v.update());
} }
@Override @Override
public List<String> getLines(Player player) { public List<String> getLines(Player player) {
PlayerBoard pb = boards.computeIfAbsent(player, PlayerBoard::new); PlayerBoard pb = boards.computeIfAbsent(player, PlayerBoard::new);
synchronized (pb.lines) synchronized (pb.lines) {
{
return pb.lines; return pb.lines;
} }
} }
@Data @Data
public static class PlayerBoard public static class PlayerBoard {
{
private final Player player; private final Player player;
private final KList<String> lines; private final KList<String> lines;
public PlayerBoard(Player player) public PlayerBoard(Player player) {
{
this.player = player; this.player = player;
this.lines = new KList<>(); this.lines = new KList<>();
update(); update();
} }
public void update() { public void update() {
synchronized (lines) synchronized (lines) {
{
lines.clear(); lines.clear();
if (!IrisToolbelt.isIrisStudioWorld(player.getWorld())) { if (!IrisToolbelt.isIrisStudioWorld(player.getWorld())) {

9
src/main/java/com/volmit/iris/engine/framework/Engine.java
View File

@ -188,12 +188,10 @@ public interface Engine extends DataProvider, Fallible, LootProvider, BlockUpdat
default IrisBiome getCaveOrMantleBiome(int x, int y, int z) { default IrisBiome getCaveOrMantleBiome(int x, int y, int z) {
MatterCavern m = getMantle().getMantle().get(x, y, z, MatterCavern.class); 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()); IrisBiome biome = getData().getBiomeLoader().load(m.getCustomBiome());
if(biome != null) if (biome != null) {
{
return biome; return biome;
} }
} }
@ -727,8 +725,7 @@ public interface Engine extends DataProvider, Fallible, LootProvider, BlockUpdat
int getCacheID(); int getCacheID();
default IrisBiome getBiomeOrMantle(Location l) default IrisBiome getBiomeOrMantle(Location l) {
{
return getBiomeOrMantle(l.getBlockX(), l.getBlockY(), l.getBlockZ()); return getBiomeOrMantle(l.getBlockX(), l.getBlockY(), l.getBlockZ());
} }
} }

3
src/main/java/com/volmit/iris/engine/mantle/EngineMantle.java
View File

@ -313,8 +313,7 @@ public interface EngineMantle extends IObjectPlacer {
return false;// TODO: return false;// TODO:
} }
default int getLoadedRegionCount() default int getLoadedRegionCount() {
{
return getMantle().getLoadedRegionCount(); return getMantle().getLoadedRegionCount();
} }
} }

6
src/main/java/com/volmit/iris/engine/object/IrisSeed.java
View File

@ -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.") @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; private boolean ignoreNaturalSeedInput = false;
public long getSeed(long seed) public long getSeed(long seed) {
{
return (seed * 47) + getSeed() + 29334667L; return (seed * 47) + getSeed() + 29334667L;
} }
public RNG rng(long inseed) public RNG rng(long inseed) {
{
return new RNG(getSeed(inseed)); return new RNG(getSeed(inseed));
} }
} }