diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml index 7a446280a..8691354d4 100644 --- a/.github/ISSUE_TEMPLATE/bug.yml +++ b/.github/ISSUE_TEMPLATE/bug.yml @@ -60,9 +60,9 @@ body: label: Checklist description: Please ensure you meet each of the requirements below options: - - label: I am using an unmodified version of Iris. (If you modified the plugin and see an issue, make sure it is reproducable on the latest spigot version or contact [support](discord.gg/volmit)) + - label: I am using an unmodified version of Iris. (If you modified the plugin and see an issue, make sure it is reproducable on the latest spigot version or contact [support](https://discord.gg/volmit)) required: true - - label: I am using Spigot, Paper, Tuinity, or Purpur. (If you are not, and still think it is a valid issue, contact [support](discord.gg/volmit)) + - label: I am using Spigot, Paper, Tuinity, or Purpur. (If you are not, and still think it is a valid issue, contact [support](https://discord.gg/volmit)) required: true - type: markdown id: thanks diff --git a/build.gradle b/build.gradle index 297a2b4a4..481d1622c 100644 --- a/build.gradle +++ b/build.gradle @@ -15,16 +15,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -buildscript { - repositories { - mavenCentral() - } - dependencies { - classpath 'com.guardsquare:proguard-gradle:7.1.0' - } -} - plugins { id 'java' id 'io.freefair.lombok' version '5.2.1' @@ -32,11 +22,10 @@ plugins { } group 'com.volmit.iris' -version '1.8' +version '1.8.3' def apiVersion = '1.17' -def name = getRootProject().getName() // See settings.gradle +def name = getRootProject().getName() // Defined in settings.gradle def main = 'com.volmit.iris.Iris' -// You need to also set command usage, aliases and description in src/main/resources/plugin.yml // ADD YOURSELF AS A NEW LINE IF YOU WANT YOUR OWN BUILD TASK GENERATED // ============================================================== @@ -47,32 +36,6 @@ registerCustomOutputTask('Coco', 'C:/Users/sjoer/Documents/Development/MCServer/ registerCustomOutputTask('Strange', 'D://Servers/1.17 Test Server/plugins', name) // ============================================================== -def dependsDir = "${buildDir}/libs/dependencies/" as String - -task copyDepends(type: Copy) { - dependsOn(":shadowJar") - group('proguard') - from configurations.default - into "${dependsDir}" -} - -task release(type: proguard.gradle.ProGuardTask) { - dependsOn(":copyDepends") - group('proguard') - configuration 'proguard.pro' - injars("${buildDir}/libs/" + name + "-" + version + "-all.jar") - outjars("${buildDir}/production/" + name + "/" + version + "/" + name + "-" + version + ".jar") - libraryjars "${System.getProperty('java.home')}/lib/rt.jar" - libraryjars "${System.getProperty('java.home')}/jmods/" - libraryjars "${dependsDir}" - dontobfuscate() - dontwarn() - dontshrink() - dontoptimize() - dontnote() - verbose() -} - def registerCustomOutputTask(name, path, plugin) { tasks.register('build' + name, Copy) { group('development') @@ -86,8 +49,14 @@ def registerCustomOutputTask(name, path, plugin) { } } +/** + * Gradle is weird sometimes, we need to delete the plugin yml from the build folder to actually filter properly. + */ file(jar.archiveFile.get().getAsFile().getParentFile().getParentFile().getParentFile().getAbsolutePath() + '/build/resources/main/plugin.yml').delete() +/** + * Expand properties into plugin yml + */ processResources { filesMatching('**/plugin.yml') { expand( @@ -99,6 +68,10 @@ processResources { } } +/** + * For performance during compilation, we specify which module groups are accessible from which repositories + * This may cause issues resolving new dependencies but normally it shouldn't. + */ repositories { maven { url 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/' @@ -153,23 +126,45 @@ repositories { // maven { allowInsecureProtocol true, url 'http://archive.arcane.art/repository/arcane'} } +/** + * We need parameter meta for the decree command system + */ compileJava { options.compilerArgs << '-parameters' } -shadowJar - { - minimize() - append("plugin.yml") - relocate 'com.dfsek.paralithic', 'com.volmit.iris.util.paralithic' - relocate 'io.papermc.lib', 'com.volmit.iris.util.paper' - dependencies { - include(dependency('io.papermc:paperlib')) - include(dependency('com.dfsek:Paralithic')) - include(dependency('net.kyori:')) - } - } +/** + * Configure Iris for shading + */ +shadowJar { + minimize() + append("plugin.yml") + relocate 'com.dfsek.paralithic', 'com.volmit.iris.util.paralithic' + relocate 'io.papermc.lib', 'com.volmit.iris.util.paper' + dependencies { + include(dependency('io.papermc:paperlib')) + include(dependency('com.dfsek:Paralithic')) + include(dependency('net.kyori:')) + } +} +configurations.all { + resolutionStrategy.cacheChangingModulesFor 60, 'minutes' + resolutionStrategy.cacheDynamicVersionsFor 60, 'minutes' +} + +/** + * Dependencies. + * + * Provided or classpath dependencies are not shaded and are available on the runtime classpath + * + * Shaded dependencies are not available at runtime, nor are they available on mvn central so they + * need to be shaded into the jar (increasing binary size) + * + * Dynamically loaded dependencies are defined in the plugin.yml (updating these must be updated in the + * plugin.yml also, otherwise they wont be available). These do not increase binary size). Only declare + * these dependencies if they are available on mvn central. + */ dependencies { // Provided or Classpath compileOnly 'org.projectlombok:lombok:1.18.20' diff --git a/src/main/java/com/volmit/iris/Iris.java b/src/main/java/com/volmit/iris/Iris.java index aa9b4c0ad..dbd8b5657 100644 --- a/src/main/java/com/volmit/iris/Iris.java +++ b/src/main/java/com/volmit/iris/Iris.java @@ -26,11 +26,7 @@ import com.volmit.iris.core.link.OraxenLink; import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.core.nms.INMS; import com.volmit.iris.core.service.StudioSVC; -import com.volmit.iris.engine.object.IrisBiome; -import com.volmit.iris.engine.object.IrisBiomeCustom; -import com.volmit.iris.engine.object.IrisWorld; -import com.volmit.iris.engine.object.IrisCompat; -import com.volmit.iris.engine.object.IrisDimension; +import com.volmit.iris.engine.object.*; import com.volmit.iris.engine.platform.BukkitChunkGenerator; import com.volmit.iris.engine.platform.DummyChunkGenerator; import com.volmit.iris.util.collection.KList; @@ -281,8 +277,7 @@ public class Iris extends VolmitPlugin implements Listener { if (j.getName().endsWith(".json")) { IrisDimension dim = data.getDimensionLoader().load(j.getName().split("\\Q.\\E")[0]); - if(dim == null) - { + if (dim == null) { continue; } @@ -320,7 +315,7 @@ public class Iris extends VolmitPlugin implements Listener { IrisSettings.invalidate(); IrisSettings.get(); configWatcher.checkModified(); - Iris.info("Hotloaded settings.json"); + Iris.info("Hotloaded settings.json "); } } @@ -381,8 +376,7 @@ public class Iris extends VolmitPlugin implements Listener { if (j.getName().endsWith(".json")) { IrisDimension dim = data.getDimensionLoader().load(j.getName().split("\\Q.\\E")[0]); - if(dim == null) - { + if (dim == null) { Iris.error("Failed to load " + j.getPath()); continue; } diff --git a/src/main/java/com/volmit/iris/core/commands/CommandObject.java b/src/main/java/com/volmit/iris/core/commands/CommandObject.java index d5f842d4a..06384b16f 100644 --- a/src/main/java/com/volmit/iris/core/commands/CommandObject.java +++ b/src/main/java/com/volmit/iris/core/commands/CommandObject.java @@ -5,13 +5,7 @@ import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.core.service.ObjectSVC; import com.volmit.iris.core.service.StudioSVC; import com.volmit.iris.core.service.WandSVC; -import com.volmit.iris.engine.object.IObjectPlacer; -import com.volmit.iris.engine.object.IrisDimension; -import com.volmit.iris.engine.object.IrisObject; -import com.volmit.iris.engine.object.IrisObjectPlacement; -import com.volmit.iris.engine.object.IrisObjectPlacementScaleInterpolator; -import com.volmit.iris.engine.object.IrisObjectRotation; -import com.volmit.iris.engine.object.TileData; +import com.volmit.iris.engine.object.*; import com.volmit.iris.util.data.Cuboid; import com.volmit.iris.util.decree.DecreeExecutor; import com.volmit.iris.util.decree.DecreeOrigin; 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 2ab74fa5c..aa4ae0645 100644 --- a/src/main/java/com/volmit/iris/core/commands/CommandStudio.java +++ b/src/main/java/com/volmit/iris/core/commands/CommandStudio.java @@ -29,22 +29,7 @@ import com.volmit.iris.core.service.ConversionSVC; import com.volmit.iris.core.service.StudioSVC; import com.volmit.iris.core.tools.IrisToolbelt; import com.volmit.iris.engine.framework.Engine; -import com.volmit.iris.engine.object.IrisPosition; -import com.volmit.iris.engine.object.IrisBiome; -import com.volmit.iris.engine.object.IrisBiomePaletteLayer; -import com.volmit.iris.engine.object.IrisScript; -import com.volmit.iris.engine.object.IrisDimension; -import com.volmit.iris.engine.object.IrisEntity; -import com.volmit.iris.engine.object.IrisFeaturePositional; -import com.volmit.iris.engine.object.IrisLootTable; -import com.volmit.iris.engine.object.InventorySlotType; -import com.volmit.iris.engine.object.IrisGenerator; -import com.volmit.iris.engine.object.IrisInterpolator; -import com.volmit.iris.engine.object.IrisNoiseGenerator; -import com.volmit.iris.engine.object.NoiseStyle; -import com.volmit.iris.engine.object.IrisObject; -import com.volmit.iris.engine.object.IrisObjectPlacement; -import com.volmit.iris.engine.object.IrisRegion; +import com.volmit.iris.engine.object.*; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.collection.KSet; @@ -282,9 +267,16 @@ public class CommandStudio implements DecreeExecutor { @Param(contextual = true, description = "The biome to edit") IrisBiome biome ) { - if (noStudio()) return; + if (noStudio()) { + return; + } try { + 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; + } + Desktop.getDesktop().open(biome.getLoadFile()); } catch (Throwable e) { Iris.reportError(e); diff --git a/src/main/java/com/volmit/iris/core/commands/CommandWhat.java b/src/main/java/com/volmit/iris/core/commands/CommandWhat.java index 7caaea96c..e5685d5b0 100644 --- a/src/main/java/com/volmit/iris/core/commands/CommandWhat.java +++ b/src/main/java/com/volmit/iris/core/commands/CommandWhat.java @@ -134,10 +134,8 @@ public class CommandWhat implements DecreeExecutor { int m = 1; AtomicInteger v = new AtomicInteger(0); - for(int xxx = c.getX() - 4; xxx <= c.getX() + 4; xxx++) - { - for(int zzz = c.getZ() - 4; zzz <= c.getZ() + 4; zzz++) - { + for (int xxx = c.getX() - 4; xxx <= c.getX() + 4; xxx++) { + for (int zzz = c.getZ() - 4; zzz <= c.getZ() + 4; zzz++) { IrisToolbelt.access(c.getWorld()).getEngine().getMantle().findMarkers(xxx, zzz, new MatterMarker(marker)) .convert((i) -> i.toLocation(c.getWorld())).forEach((i) -> { J.s(() -> BlockSignal.of(i.getBlock(), 100)); diff --git a/src/main/java/com/volmit/iris/core/edit/BlockSignal.java b/src/main/java/com/volmit/iris/core/edit/BlockSignal.java index 1483dea6a..9d2ad94f5 100644 --- a/src/main/java/com/volmit/iris/core/edit/BlockSignal.java +++ b/src/main/java/com/volmit/iris/core/edit/BlockSignal.java @@ -33,6 +33,7 @@ import java.util.concurrent.atomic.AtomicInteger; @SuppressWarnings("InstantiationOfUtilityClass") public class BlockSignal { public static final AtomicInteger active = new AtomicInteger(0); + public static void of(Block block, int ticks) { new BlockSignal(block, ticks); } diff --git a/src/main/java/com/volmit/iris/core/edit/DustRevealer.java b/src/main/java/com/volmit/iris/core/edit/DustRevealer.java index 43d9e154d..1cff294c8 100644 --- a/src/main/java/com/volmit/iris/core/edit/DustRevealer.java +++ b/src/main/java/com/volmit/iris/core/edit/DustRevealer.java @@ -32,8 +32,6 @@ import org.bukkit.Sound; import org.bukkit.World; import org.bukkit.block.Block; -import java.util.concurrent.atomic.AtomicInteger; - @SuppressWarnings("ALL") @Data public class DustRevealer { @@ -70,13 +68,11 @@ public class DustRevealer { J.s(() -> { new BlockSignal(world.getBlockAt(block.getX(), block.getY(), block.getZ()), 7); - if(M.r(0.25)) - { + if (M.r(0.25)) { world.playSound(block.toBlock(world).getLocation(), Sound.BLOCK_AMETHYST_BLOCK_CHIME, 1f, RNG.r.f(0.2f, 2f)); } J.a(() -> { - while(BlockSignal.active.get() > 128) - { + while (BlockSignal.active.get() > 128) { J.sleep(5); } @@ -112,7 +108,7 @@ public class DustRevealer { e.printStackTrace(); } }); - }, RNG.r.i(2,8)); + }, RNG.r.i(2, 8)); } private boolean is(BlockPosition a) { diff --git a/src/main/java/com/volmit/iris/core/edit/JigsawEditor.java b/src/main/java/com/volmit/iris/core/edit/JigsawEditor.java index b88f01d0e..bb82f77aa 100644 --- a/src/main/java/com/volmit/iris/core/edit/JigsawEditor.java +++ b/src/main/java/com/volmit/iris/core/edit/JigsawEditor.java @@ -21,11 +21,7 @@ package com.volmit.iris.core.edit; import com.google.gson.Gson; import com.volmit.iris.Iris; import com.volmit.iris.core.service.WandSVC; -import com.volmit.iris.engine.object.IrisPosition; -import com.volmit.iris.engine.object.IrisJigsawPiece; -import com.volmit.iris.engine.object.IrisJigsawPieceConnector; -import com.volmit.iris.engine.object.IrisDirection; -import com.volmit.iris.engine.object.IrisObject; +import com.volmit.iris.engine.object.*; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.data.Cuboid; import com.volmit.iris.util.io.IO; diff --git a/src/main/java/com/volmit/iris/core/gui/VisionGUI.java b/src/main/java/com/volmit/iris/core/gui/VisionGUI.java index 7c8bfeea3..f0862d4dd 100644 --- a/src/main/java/com/volmit/iris/core/gui/VisionGUI.java +++ b/src/main/java/com/volmit/iris/core/gui/VisionGUI.java @@ -25,8 +25,8 @@ import com.volmit.iris.core.tools.IrisToolbelt; import com.volmit.iris.engine.IrisComplex; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.object.IrisBiome; -import com.volmit.iris.engine.object.IrisWorld; import com.volmit.iris.engine.object.IrisRegion; +import com.volmit.iris.engine.object.IrisWorld; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.collection.KSet; diff --git a/src/main/java/com/volmit/iris/core/loader/IrisData.java b/src/main/java/com/volmit/iris/core/loader/IrisData.java index 006e18f9e..a6e51aa2e 100644 --- a/src/main/java/com/volmit/iris/core/loader/IrisData.java +++ b/src/main/java/com/volmit/iris/core/loader/IrisData.java @@ -26,24 +26,8 @@ import com.google.gson.stream.JsonWriter; import com.volmit.iris.Iris; import com.volmit.iris.engine.data.cache.AtomicCache; import com.volmit.iris.engine.framework.Engine; +import com.volmit.iris.engine.object.*; import com.volmit.iris.engine.object.annotations.Snippet; -import com.volmit.iris.engine.object.IrisBiome; -import com.volmit.iris.engine.object.IrisBlockData; -import com.volmit.iris.engine.object.IrisCave; -import com.volmit.iris.engine.object.IrisRavine; -import com.volmit.iris.engine.object.IrisScript; -import com.volmit.iris.engine.object.IrisDimension; -import com.volmit.iris.engine.object.IrisEntity; -import com.volmit.iris.engine.object.IrisJigsawPiece; -import com.volmit.iris.engine.object.IrisJigsawPool; -import com.volmit.iris.engine.object.IrisJigsawStructure; -import com.volmit.iris.engine.object.IrisLootTable; -import com.volmit.iris.engine.object.IrisMod; -import com.volmit.iris.engine.object.IrisExpression; -import com.volmit.iris.engine.object.IrisGenerator; -import com.volmit.iris.engine.object.IrisObject; -import com.volmit.iris.engine.object.IrisRegion; -import com.volmit.iris.engine.object.IrisSpawner; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.context.IrisContext; @@ -56,7 +40,6 @@ import lombok.Data; import java.io.File; import java.io.FileReader; import java.io.IOException; -import java.lang.reflect.InvocationTargetException; import java.util.Objects; import java.util.function.Function; @@ -372,13 +355,9 @@ public class IrisData implements ExclusionStrategy, TypeAdapterFactory { @Override public boolean shouldSkipClass(Class c) { - if(c.equals(AtomicCache.class)) - { + if (c.equals(AtomicCache.class)) { return true; - } - - else if(c.equals(ChronoLatch.class)) - { + } else if (c.equals(ChronoLatch.class)) { return true; } @@ -387,8 +366,7 @@ public class IrisData implements ExclusionStrategy, TypeAdapterFactory { @Override public TypeAdapter create(Gson gson, TypeToken typeToken) { - if(!typeToken.getRawType().isAnnotationPresent(Snippet.class)) - { + if (!typeToken.getRawType().isAnnotationPresent(Snippet.class)) { return null; } @@ -407,26 +385,17 @@ public class IrisData implements ExclusionStrategy, TypeAdapterFactory { if (reader.peek().equals(JsonToken.STRING)) { String r = reader.nextString(); - if(r.startsWith("snippet/" + snippetType + "/")) - { + if (r.startsWith("snippet/" + snippetType + "/")) { File f = new File(getDataFolder(), r + ".json"); - if(f.exists()) - { - try - { + if (f.exists()) { + try { JsonReader snippetReader = new JsonReader(new FileReader(f)); return adapter.read(snippetReader); - } - - catch(Throwable e) - { + } catch (Throwable e) { Iris.error("Couldn't read snippet " + r + " in " + reader.getPath() + " (" + e.getMessage() + ")"); } - } - - else - { + } else { Iris.error("Couldn't find snippet " + r + " in " + reader.getPath()); } } @@ -434,13 +403,9 @@ public class IrisData implements ExclusionStrategy, TypeAdapterFactory { return null; } - try - { + try { return adapter.read(reader); - } - - catch(Throwable e) - { + } catch (Throwable e) { Iris.error("Failed to read " + typeToken.getRawType().getCanonicalName() + "... faking objects a little to load the file at least."); try { return (T) typeToken.getRawType().getConstructor().newInstance(); @@ -459,10 +424,8 @@ public class IrisData implements ExclusionStrategy, TypeAdapterFactory { File snippetFolder = new File(getDataFolder(), "snippet/" + f); - if(snippetFolder.exists() && snippetFolder.isDirectory()) - { - for(File i : snippetFolder.listFiles()) - { + if (snippetFolder.exists() && snippetFolder.isDirectory()) { + for (File i : snippetFolder.listFiles()) { l.add("snippet/" + f + "/" + i.getName().split("\\Q.\\E")[0]); } } diff --git a/src/main/java/com/volmit/iris/core/loader/IrisRegistrant.java b/src/main/java/com/volmit/iris/core/loader/IrisRegistrant.java index c1bc11337..3797c14c1 100644 --- a/src/main/java/com/volmit/iris/core/loader/IrisRegistrant.java +++ b/src/main/java/com/volmit/iris/core/loader/IrisRegistrant.java @@ -20,10 +20,10 @@ package com.volmit.iris.core.loader; import com.google.gson.GsonBuilder; import com.volmit.iris.Iris; +import com.volmit.iris.engine.object.IrisScript; import com.volmit.iris.engine.object.annotations.ArrayType; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.RegistryListResource; -import com.volmit.iris.engine.object.IrisScript; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.json.JSONObject; import com.volmit.iris.util.plugin.VolmitSender; @@ -49,8 +49,7 @@ public abstract class IrisRegistrant { public abstract String getTypeName(); - public void registerTypeAdapters(GsonBuilder builder) - { + public void registerTypeAdapters(GsonBuilder builder) { } diff --git a/src/main/java/com/volmit/iris/core/loader/ResourceLoader.java b/src/main/java/com/volmit/iris/core/loader/ResourceLoader.java index d76619eb6..31c0e29af 100644 --- a/src/main/java/com/volmit/iris/core/loader/ResourceLoader.java +++ b/src/main/java/com/volmit/iris/core/loader/ResourceLoader.java @@ -19,13 +19,8 @@ package com.volmit.iris.core.loader; import com.google.common.util.concurrent.AtomicDouble; -import com.google.gson.ExclusionStrategy; -import com.google.gson.FieldAttributes; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; import com.volmit.iris.Iris; import com.volmit.iris.core.project.SchemaBuilder; -import com.volmit.iris.engine.data.cache.AtomicCache; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.collection.KSet; @@ -41,7 +36,6 @@ import com.volmit.iris.util.scheduling.PrecisionStopwatch; import lombok.Data; import java.io.File; -import java.lang.reflect.Field; import java.util.Locale; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Predicate; @@ -297,6 +291,14 @@ public class ResourceLoader { lock.unlock(); + if(folderCache == null) + { + synchronized (this) + { + return getFolderCache(); + } + } + return folderCache; } diff --git a/src/main/java/com/volmit/iris/core/pack/IrisPack.java b/src/main/java/com/volmit/iris/core/pack/IrisPack.java index e59ae014a..57da51085 100644 --- a/src/main/java/com/volmit/iris/core/pack/IrisPack.java +++ b/src/main/java/com/volmit/iris/core/pack/IrisPack.java @@ -22,8 +22,8 @@ import com.volmit.iris.Iris; import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.core.loader.ResourceLoader; import com.volmit.iris.core.service.StudioSVC; -import com.volmit.iris.engine.object.IrisWorld; import com.volmit.iris.engine.object.IrisDimension; +import com.volmit.iris.engine.object.IrisWorld; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.exceptions.IrisException; import com.volmit.iris.util.format.Form; diff --git a/src/main/java/com/volmit/iris/core/project/IrisProject.java b/src/main/java/com/volmit/iris/core/project/IrisProject.java index 7c9ed8bb9..7ba21934b 100644 --- a/src/main/java/com/volmit/iris/core/project/IrisProject.java +++ b/src/main/java/com/volmit/iris/core/project/IrisProject.java @@ -25,16 +25,7 @@ import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.core.loader.IrisRegistrant; import com.volmit.iris.core.loader.ResourceLoader; import com.volmit.iris.core.tools.IrisToolbelt; -import com.volmit.iris.engine.object.IrisBiome; -import com.volmit.iris.engine.object.IrisBlockData; -import com.volmit.iris.engine.object.IrisDimension; -import com.volmit.iris.engine.object.IrisEntity; -import com.volmit.iris.engine.object.IrisLootTable; -import com.volmit.iris.engine.object.IrisGenerator; -import com.volmit.iris.engine.object.IrisObject; -import com.volmit.iris.engine.object.IrisObjectPlacement; -import com.volmit.iris.engine.object.IrisRegion; -import com.volmit.iris.engine.object.IrisSpawner; +import com.volmit.iris.engine.object.*; import com.volmit.iris.engine.object.annotations.Snippet; import com.volmit.iris.engine.platform.PlatformChunkGenerator; import com.volmit.iris.util.collection.KList; @@ -276,10 +267,8 @@ public class IrisProject { } } - for(Class i : Iris.getClasses("com.volmit.iris.engine.object.", Snippet.class)) - { - try - { + for (Class i : Iris.getClasses("com.volmit.iris.engine.object.", Snippet.class)) { + try { String snipType = i.getDeclaredAnnotation(Snippet.class).value(); JSONObject o = new JSONObject(); KList fm = new KList<>(); @@ -293,20 +282,13 @@ public class IrisProject { schemas.put(o); File a = new File(dm.getDataFolder(), ".iris/schema/snippet/" + snipType + "-schema.json"); J.attemptAsync(() -> { - try - { + try { IO.writeAll(a, new SchemaBuilder(i, dm).compute().toString(4)); - } - - catch(Throwable e) - { + } catch (Throwable e) { e.printStackTrace(); } }); - } - - catch(Throwable e) - { + } catch (Throwable e) { e.printStackTrace(); } } diff --git a/src/main/java/com/volmit/iris/core/project/SchemaBuilder.java b/src/main/java/com/volmit/iris/core/project/SchemaBuilder.java index c7912750f..ef1a364d2 100644 --- a/src/main/java/com/volmit/iris/core/project/SchemaBuilder.java +++ b/src/main/java/com/volmit/iris/core/project/SchemaBuilder.java @@ -131,8 +131,7 @@ public class SchemaBuilder { o.put("properties", properties); - if(c.isAnnotationPresent(Snippet.class)) - { + if (c.isAnnotationPresent(Snippet.class)) { JSONObject anyOf = new JSONObject(); JSONArray arr = new JSONArray(); JSONObject str = new JSONObject(); @@ -533,8 +532,7 @@ public class SchemaBuilder { d.add(fancyType); d.add(getDescription(k.getType())); - if(k.getType().isAnnotationPresent(Snippet.class)) - { + if (k.getType().isAnnotationPresent(Snippet.class)) { String sm = k.getType().getDeclaredAnnotation(Snippet.class).value(); d.add(" "); d.add("You can instead specify \"snippet/" + sm + "/some-name.json\" to use a snippet file instead of specifying it here."); @@ -556,7 +554,7 @@ public class SchemaBuilder { d.add("* Default Value is " + value); } } - } catch (Throwable ignored) { + } catch (Throwable ignored) { } @@ -564,14 +562,13 @@ public class SchemaBuilder { prop.put("type", type); prop.put("description", d.toString("\n")); - if(k.getType().isAnnotationPresent(Snippet.class)) - { + if (k.getType().isAnnotationPresent(Snippet.class)) { JSONObject anyOf = new JSONObject(); JSONArray arr = new JSONArray(); JSONObject str = new JSONObject(); str.put("type", "string"); String key = "enum-snippet-" + k.getType().getDeclaredAnnotation(Snippet.class).value(); - str.put("$ref", "#/definitions/"+key); + str.put("$ref", "#/definitions/" + key); if (!definitions.containsKey(key)) { JSONObject j = new JSONObject(); 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 fc6950b07..3308c3da6 100644 --- a/src/main/java/com/volmit/iris/core/service/BoardSVC.java +++ b/src/main/java/com/volmit/iris/core/service/BoardSVC.java @@ -23,48 +23,41 @@ import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.core.tools.IrisToolbelt; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.object.IrisFeaturePositional; +import com.volmit.iris.util.board.BoardManager; import com.volmit.iris.util.board.BoardProvider; import com.volmit.iris.util.board.BoardSettings; import com.volmit.iris.util.board.ScoreDirection; 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 org.bukkit.Bukkit; -import org.bukkit.World; -import org.bukkit.boss.BarColor; -import org.bukkit.boss.BarStyle; -import org.bukkit.boss.BossBar; +import lombok.Data; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.player.PlayerChangedWorldEvent; +import org.bukkit.event.player.PlayerJoinEvent; import java.util.List; public class BoardSVC implements IrisService, BoardProvider { - private BossBar energyBar; private com.volmit.iris.util.board.BoardManager manager; - private String mem = "..."; - public final RollingSequence tp = new RollingSequence(100); - private final ChronoLatch cl = new ChronoLatch(1000); - private final ChronoLatch ecl = new ChronoLatch(50); + private final KMap boards = new KMap<>(); @Override public void onEnable() { - manager = new com.volmit.iris.util.board.BoardManager(Iris.instance, BoardSettings.builder() + J.ar(this::tick, 20); + manager = new BoardManager(Iris.instance, BoardSettings.builder() .boardProvider(this) .scoreDirection(ScoreDirection.DOWN) .build()); - energyBar = Bukkit.createBossBar("Spawner Energy " + 0, BarColor.BLUE, BarStyle.SOLID); } @Override public void onDisable() { manager.onDisable(); - energyBar.removeAll(); + boards.clear(); } @EventHandler @@ -72,19 +65,18 @@ public class BoardSVC implements IrisService, BoardProvider { J.s(() -> updatePlayer(e.getPlayer())); } - private boolean isIrisWorld(World w) { - return IrisToolbelt.isIrisWorld(w) && IrisToolbelt.access(w).isStudio(); + @EventHandler + public void on(PlayerJoinEvent e) { + J.s(() -> updatePlayer(e.getPlayer())); } public void updatePlayer(Player p) { - if (isIrisWorld(p.getWorld())) { + if (IrisToolbelt.isIrisStudioWorld(p.getWorld())) { manager.remove(p); manager.setup(p); - energyBar.removePlayer(p); - energyBar.addPlayer(p); } else { manager.remove(p); - energyBar.removePlayer(p); + boards.remove(p); } } @@ -93,73 +85,57 @@ public class BoardSVC implements IrisService, BoardProvider { return C.GREEN + "Iris"; } + public void tick() { + boards.forEach((k, v) -> v.update()); + } @Override public List getLines(Player player) { - KList v = new KList<>(); + PlayerBoard pb = boards.computeIfAbsent(player, PlayerBoard::new); + synchronized (pb.lines) { + return pb.lines; + } + } - if (!isIrisWorld(player.getWorld())) { - return v; + @Data + public static class PlayerBoard { + private final Player player; + private final KList lines; + + public PlayerBoard(Player player) { + this.player = player; + this.lines = new KList<>(); + update(); } - Engine engine = IrisToolbelt.access(player.getWorld()).getEngine(); + public void update() { + synchronized (lines) { + lines.clear(); - if (cl.flip()) { - mem = Form.memSize(0, 2); + if (!IrisToolbelt.isIrisStudioWorld(player.getWorld())) { + return; + } + + Engine engine = IrisToolbelt.access(player.getWorld()).getEngine(); + int x = player.getLocation().getBlockX(); + int y = player.getLocation().getBlockY(); + int z = player.getLocation().getBlockZ(); + KList f = new KList<>(); + f.add(engine.getMantle().forEachFeature(x, z)); + + lines.add("&7&m "); + lines.add(C.GREEN + "Speed" + C.GRAY + ": " + Form.f(engine.getGeneratedPerSecond(), 0) + "/s " + Form.duration(1000D / engine.getGeneratedPerSecond(), 0)); + lines.add(C.AQUA + "Cache" + C.GRAY + ": " + Form.f(IrisData.cacheSize())); + lines.add(C.AQUA + "Mantle" + C.GRAY + ": " + engine.getMantle().getLoadedRegionCount()); + lines.add("&7&m "); + lines.add(C.AQUA + "Region" + C.GRAY + ": " + engine.getRegion(x, z).getName()); + lines.add(C.AQUA + "Biome" + C.GRAY + ": " + engine.getBiomeOrMantle(x, y, z).getName()); + lines.add(C.AQUA + "Height" + C.GRAY + ": " + Math.round(engine.getHeight(x, z))); + lines.add(C.AQUA + "Slope" + C.GRAY + ": " + Form.f(engine.getComplex().getSlopeStream().get(x, z), 2)); + lines.add(C.AQUA + "Features" + C.GRAY + ": " + Form.f(f.size())); + lines.add(C.AQUA + "BUD/s" + C.GRAY + ": " + Form.f(engine.getBlockUpdatesPerSecond())); + lines.add("&7&m "); + } } - - int x = player.getLocation().getBlockX(); - int y = player.getLocation().getBlockY(); - int z = player.getLocation().getBlockZ(); - - if (ecl.flip()) { - energyBar.setProgress(Math.min(1000D, engine.getWorldManager().getEnergy()) / 1000D); - energyBar.setTitle("Spawner Energy: " + Form.f((int) Math.min(1000D, engine.getWorldManager().getEnergy()))); - } - - int parallaxChunks = 0; - int parallaxRegions = 0; - long memoryGuess = 0; - int loadedObjects = 0; - - loadedObjects += engine.getData().getObjectLoader().getSize(); - memoryGuess += engine.getData().getObjectLoader().getTotalStorage() * 225L; - memoryGuess += parallaxChunks * 3500L; - memoryGuess += parallaxRegions * 1700000L; - - tp.put(engine.getGeneratedPerSecond()); - - - v.add("&7&m------------------"); - v.add(C.GREEN + "Speed" + C.GRAY + ": " + Form.f(tp.getAverage(), 0) + "/s " + Form.duration(1000D / engine.getGeneratedPerSecond(), 0)); - v.add(C.GREEN + "Memory Use" + C.GRAY + ": ~" + Form.memSize(memoryGuess, 0)); - - if (engine != null) { - v.add("&7&m------------------"); - KList f = new KList<>(); - f.add(engine.getMantle().forEachFeature(x, z)); - v.add(C.AQUA + "Region" + C.GRAY + ": " + engine.getRegion(x, z).getName()); - v.add(C.AQUA + "Biome" + C.GRAY + ": " + engine.getBiome(x, y, z).getName()); - v.add(C.AQUA + "Height" + C.GRAY + ": " + Math.round(engine.getHeight(x, z))); - v.add(C.AQUA + "Slope" + C.GRAY + ": " + Form.f(engine.getComplex().getSlopeStream().get(x, z), 2)); - v.add(C.AQUA + "Features" + C.GRAY + ": " + Form.f(f.size())); - v.add(C.AQUA + "Cache" + C.GRAY + ": " + Form.f(IrisData.cacheSize())); - v.add(C.AQUA + "Sat" + C.GRAY + ": " + Form.f(engine.getWorldManager().getEntityCount()) + "e / " + Form.f(engine.getWorldManager().getChunkCount()) + "c (" + Form.pc(engine.getWorldManager().getEntitySaturation(), 0) + ")"); - } - - if (Iris.jobCount() > 0) { - v.add("&7&m------------------"); - v.add(C.LIGHT_PURPLE + "Tasks" + C.GRAY + ": " + Form.f(Iris.jobCount())); - } - - if(engine.getBlockUpdatesPerSecond() > 0) - { - v.add("&7&m------------------"); - v.add(C.LIGHT_PURPLE + "BUD/s" + C.GRAY + ": " + Form.f(engine.getBlockUpdatesPerSecond())); - } - - v.add("&7&m------------------"); - - return v; } } diff --git a/src/main/java/com/volmit/iris/core/service/CommandSVC.java b/src/main/java/com/volmit/iris/core/service/CommandSVC.java index 2c5b2478e..898093798 100644 --- a/src/main/java/com/volmit/iris/core/service/CommandSVC.java +++ b/src/main/java/com/volmit/iris/core/service/CommandSVC.java @@ -19,13 +19,16 @@ package com.volmit.iris.core.service; import com.volmit.iris.Iris; -import com.volmit.iris.core.IrisSettings; import com.volmit.iris.core.commands.CommandIris; +import com.volmit.iris.core.tools.IrisToolbelt; import com.volmit.iris.engine.data.cache.AtomicCache; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.decree.DecreeSystem; import com.volmit.iris.util.decree.virtual.VirtualDecreeCommand; +import com.volmit.iris.util.format.C; import com.volmit.iris.util.plugin.IrisService; +import com.volmit.iris.util.plugin.VolmitSender; +import com.volmit.iris.util.scheduling.J; import org.bukkit.event.EventHandler; import org.bukkit.event.player.PlayerCommandPreprocessEvent; @@ -38,7 +41,7 @@ public class CommandSVC implements IrisService, DecreeSystem { @Override public void onEnable() { Iris.instance.getCommand("iris").setExecutor(this); - getRoot().cacheAll(); + J.a(() -> getRoot().cacheAll()); } @Override @@ -47,21 +50,24 @@ public class CommandSVC implements IrisService, DecreeSystem { } @EventHandler - public void on(PlayerCommandPreprocessEvent e) - { + public void on(PlayerCommandPreprocessEvent e) { String msg = e.getMessage().startsWith("/") ? e.getMessage().substring(1) : e.getMessage(); - if(msg.startsWith("irisdecree ")) - { + if (msg.startsWith("irisdecree ")) { String[] args = msg.split("\\Q \\E"); CompletableFuture future = futures.get(args[1]); - if(future != null) - { + if (future != null) { future.complete(args[2]); e.setCancelled(true); + return; } } + + if ((msg.startsWith("locate ") || msg.startsWith("locatebiome ")) && IrisToolbelt.isIrisWorld(e.getPlayer().getWorld())){ + new VolmitSender(e.getPlayer()).sendMessage(C.RED + "Locating biomes & objects is disabled in Iris Worlds. Use /iris studio goto "); + e.setCancelled(true); + } } @Override diff --git a/src/main/java/com/volmit/iris/core/service/ConversionSVC.java b/src/main/java/com/volmit/iris/core/service/ConversionSVC.java index 68734ba5b..356dc4716 100644 --- a/src/main/java/com/volmit/iris/core/service/ConversionSVC.java +++ b/src/main/java/com/volmit/iris/core/service/ConversionSVC.java @@ -20,12 +20,7 @@ package com.volmit.iris.core.service; import com.google.gson.Gson; import com.volmit.iris.Iris; -import com.volmit.iris.engine.object.IrisPosition; -import com.volmit.iris.engine.object.IrisJigsawPiece; -import com.volmit.iris.engine.object.IrisJigsawPieceConnector; -import com.volmit.iris.engine.object.IrisJigsawPool; -import com.volmit.iris.engine.object.IrisDirection; -import com.volmit.iris.engine.object.IrisObject; +import com.volmit.iris.engine.object.*; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.format.Form; diff --git a/src/main/java/com/volmit/iris/core/service/TreeSVC.java b/src/main/java/com/volmit/iris/core/service/TreeSVC.java index 73b0120a5..9d00e830e 100644 --- a/src/main/java/com/volmit/iris/core/service/TreeSVC.java +++ b/src/main/java/com/volmit/iris/core/service/TreeSVC.java @@ -21,14 +21,7 @@ package com.volmit.iris.core.service; import com.volmit.iris.Iris; import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.core.tools.IrisToolbelt; -import com.volmit.iris.engine.object.IrisBiome; -import com.volmit.iris.engine.object.IObjectPlacer; -import com.volmit.iris.engine.object.IrisObject; -import com.volmit.iris.engine.object.IrisObjectPlacement; -import com.volmit.iris.engine.object.IrisRegion; -import com.volmit.iris.engine.object.TileData; -import com.volmit.iris.engine.object.IrisTreeModes; -import com.volmit.iris.engine.object.IrisTreeSize; +import com.volmit.iris.engine.object.*; import com.volmit.iris.engine.platform.PlatformChunkGenerator; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; diff --git a/src/main/java/com/volmit/iris/core/tools/IrisToolbelt.java b/src/main/java/com/volmit/iris/core/tools/IrisToolbelt.java index 7ec267ae7..4892583c1 100644 --- a/src/main/java/com/volmit/iris/core/tools/IrisToolbelt.java +++ b/src/main/java/com/volmit/iris/core/tools/IrisToolbelt.java @@ -90,6 +90,10 @@ public class IrisToolbelt { return world.getGenerator() instanceof PlatformChunkGenerator; } + public static boolean isIrisStudioWorld(World world) { + return isIrisWorld(world) && access(world).isStudio(); + } + /** * Get the Iris generator for the given world * diff --git a/src/main/java/com/volmit/iris/core/tools/IrisWorldCreator.java b/src/main/java/com/volmit/iris/core/tools/IrisWorldCreator.java index c42b8d15d..c05d3b0a3 100644 --- a/src/main/java/com/volmit/iris/core/tools/IrisWorldCreator.java +++ b/src/main/java/com/volmit/iris/core/tools/IrisWorldCreator.java @@ -19,8 +19,8 @@ package com.volmit.iris.core.tools; import com.volmit.iris.core.loader.IrisData; -import com.volmit.iris.engine.object.IrisWorld; import com.volmit.iris.engine.object.IrisDimension; +import com.volmit.iris.engine.object.IrisWorld; import com.volmit.iris.engine.platform.BukkitChunkGenerator; import org.bukkit.World; import org.bukkit.WorldCreator; diff --git a/src/main/java/com/volmit/iris/engine/IrisComplex.java b/src/main/java/com/volmit/iris/engine/IrisComplex.java index 889844d2f..4731b4bda 100644 --- a/src/main/java/com/volmit/iris/engine/IrisComplex.java +++ b/src/main/java/com/volmit/iris/engine/IrisComplex.java @@ -22,13 +22,7 @@ import com.google.common.util.concurrent.AtomicDouble; import com.volmit.iris.Iris; import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.engine.framework.Engine; -import com.volmit.iris.engine.object.InferredType; -import com.volmit.iris.engine.object.IrisBiome; -import com.volmit.iris.engine.object.IrisDecorationPart; -import com.volmit.iris.engine.object.IrisDecorator; -import com.volmit.iris.engine.object.IrisFeaturePositional; -import com.volmit.iris.engine.object.IrisGenerator; -import com.volmit.iris.engine.object.IrisRegion; +import com.volmit.iris.engine.object.*; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.data.DataProvider; diff --git a/src/main/java/com/volmit/iris/engine/IrisEngine.java b/src/main/java/com/volmit/iris/engine/IrisEngine.java index 456eec76c..ca721aa71 100644 --- a/src/main/java/com/volmit/iris/engine/IrisEngine.java +++ b/src/main/java/com/volmit/iris/engine/IrisEngine.java @@ -34,11 +34,7 @@ import com.volmit.iris.engine.mantle.EngineMantle; import com.volmit.iris.engine.modifier.IrisCarveModifier; import com.volmit.iris.engine.modifier.IrisDepositModifier; import com.volmit.iris.engine.modifier.IrisPostModifier; -import com.volmit.iris.engine.object.IrisBiome; -import com.volmit.iris.engine.object.IrisBiomePaletteLayer; -import com.volmit.iris.engine.object.IrisDecorator; -import com.volmit.iris.engine.object.IrisEngineData; -import com.volmit.iris.engine.object.IrisObjectPlacement; +import com.volmit.iris.engine.object.*; import com.volmit.iris.engine.scripting.EngineExecutionEnvironment; import com.volmit.iris.util.atomics.AtomicRollingSequence; import com.volmit.iris.util.collection.KMap; @@ -136,8 +132,7 @@ public class IrisEngine implements Engine { } private void tickRandomPlayer() { - if(perSecondBudLatch.flip()) - { + if (perSecondBudLatch.flip()) { buds.set(bud.get()); bud.set(0); } @@ -433,9 +428,9 @@ public class IrisEngine implements Engine { getTerrainActuator().actuate(x, z, blocks, multicore); getBiomeActuator().actuate(x, z, vbiomes, multicore); getDecorantActuator().actuate(x, z, blocks, multicore); - getDepositModifier().modify(x, z, blocks, multicore); getCaveModifier().modify(x >> 4, z >> 4, blocks, multicore); getPostModifier().modify(x, z, blocks, multicore); + getDepositModifier().modify(x, z, blocks, multicore); getMantle().insertMatter(x >> 4, z >> 4, BlockData.class, blocks, multicore); } getMetrics().getTotal().put(p.getMilliseconds()); diff --git a/src/main/java/com/volmit/iris/engine/IrisEngineEffects.java b/src/main/java/com/volmit/iris/engine/IrisEngineEffects.java index a3b45b28b..8fcc6799c 100644 --- a/src/main/java/com/volmit/iris/engine/IrisEngineEffects.java +++ b/src/main/java/com/volmit/iris/engine/IrisEngineEffects.java @@ -25,7 +25,6 @@ import com.volmit.iris.engine.framework.EnginePlayer; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.math.M; import com.volmit.iris.util.scheduling.PrecisionStopwatch; -import org.bukkit.Location; import org.bukkit.entity.Player; import java.util.List; diff --git a/src/main/java/com/volmit/iris/engine/IrisEngineMantle.java b/src/main/java/com/volmit/iris/engine/IrisEngineMantle.java index 9d69d2510..71c15bae8 100644 --- a/src/main/java/com/volmit/iris/engine/IrisEngineMantle.java +++ b/src/main/java/com/volmit/iris/engine/IrisEngineMantle.java @@ -23,15 +23,11 @@ import com.volmit.iris.engine.data.cache.AtomicCache; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.mantle.EngineMantle; import com.volmit.iris.engine.mantle.MantleComponent; -import com.volmit.iris.engine.mantle.components.*; -import com.volmit.iris.engine.object.IrisBiome; -import com.volmit.iris.engine.object.IrisDepositGenerator; -import com.volmit.iris.engine.object.IrisFeaturePotential; -import com.volmit.iris.engine.object.IrisJigsawStructurePlacement; -import com.volmit.iris.engine.object.IrisObject; -import com.volmit.iris.engine.object.IrisObjectPlacement; -import com.volmit.iris.engine.object.IrisObjectScale; -import com.volmit.iris.engine.object.IrisRegion; +import com.volmit.iris.engine.mantle.components.MantleCarvingComponent; +import com.volmit.iris.engine.mantle.components.MantleFeatureComponent; +import com.volmit.iris.engine.mantle.components.MantleJigsawComponent; +import com.volmit.iris.engine.mantle.components.MantleObjectComponent; +import com.volmit.iris.engine.object.*; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.collection.KSet; diff --git a/src/main/java/com/volmit/iris/engine/IrisWorldManager.java b/src/main/java/com/volmit/iris/engine/IrisWorldManager.java index 1ac4030ec..be850807f 100644 --- a/src/main/java/com/volmit/iris/engine/IrisWorldManager.java +++ b/src/main/java/com/volmit/iris/engine/IrisWorldManager.java @@ -22,15 +22,7 @@ import com.volmit.iris.Iris; import com.volmit.iris.engine.data.cache.Cache; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.EngineAssignedWorldManager; -import com.volmit.iris.engine.object.IrisBiome; -import com.volmit.iris.engine.object.IrisBlockDrops; -import com.volmit.iris.engine.object.IRare; -import com.volmit.iris.engine.object.IrisEngineChunkData; -import com.volmit.iris.engine.object.IrisEngineData; -import com.volmit.iris.engine.object.IrisEngineSpawnerCooldown; -import com.volmit.iris.engine.object.IrisEntitySpawn; -import com.volmit.iris.engine.object.IrisRegion; -import com.volmit.iris.engine.object.IrisSpawner; +import com.volmit.iris.engine.object.*; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.format.Form; @@ -105,8 +97,7 @@ public class IrisWorldManager extends EngineAssignedWorldManager { interrupt(); } - if(!getEngine().getWorld().hasRealWorld() && clw.flip()) - { + if (!getEngine().getWorld().hasRealWorld() && clw.flip()) { getEngine().getWorld().tryGetRealWorld(); } @@ -227,8 +218,7 @@ public class IrisWorldManager extends EngineAssignedWorldManager { Chunk c = cc[RNG.r.nextInt(cc.length)]; - if(!c.isLoaded() || !Chunks.isSafe(c.getWorld(), c.getX(), c.getZ())) - { + if (!c.isLoaded() || !Chunks.isSafe(c.getWorld(), c.getX(), c.getZ())) { continue; } 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 050d69e4b..4185dff3e 100644 --- a/src/main/java/com/volmit/iris/engine/framework/Engine.java +++ b/src/main/java/com/volmit/iris/engine/framework/Engine.java @@ -26,18 +26,7 @@ import com.volmit.iris.engine.IrisComplex; import com.volmit.iris.engine.data.cache.Cache; import com.volmit.iris.engine.data.chunk.TerrainChunk; import com.volmit.iris.engine.mantle.EngineMantle; -import com.volmit.iris.engine.object.IrisColor; -import com.volmit.iris.engine.object.IrisPosition; -import com.volmit.iris.engine.object.IrisBiome; -import com.volmit.iris.engine.object.IrisWorld; -import com.volmit.iris.engine.object.IrisDimension; -import com.volmit.iris.engine.object.IrisEngineData; -import com.volmit.iris.engine.object.IrisLootMode; -import com.volmit.iris.engine.object.IrisLootReference; -import com.volmit.iris.engine.object.IrisLootTable; -import com.volmit.iris.engine.object.InventorySlotType; -import com.volmit.iris.engine.object.IrisObjectPlacement; -import com.volmit.iris.engine.object.IrisRegion; +import com.volmit.iris.engine.object.*; import com.volmit.iris.engine.scripting.EngineExecutionEnvironment; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; @@ -195,6 +184,21 @@ public interface Engine extends DataProvider, Fallible, LootProvider, BlockUpdat return getComplex().getRegionStream().get(x, z); } + @BlockCoordinates + 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()) { + IrisBiome biome = getData().getBiomeLoader().load(m.getCustomBiome()); + + if (biome != null) { + return biome; + } + } + + return getCaveBiome(x, z); + } + @BlockCoordinates default IrisBiome getCaveBiome(int x, int z) { return getComplex().getCaveBiomeStream().get(x, z); @@ -672,6 +676,14 @@ public interface Engine extends DataProvider, Fallible, LootProvider, BlockUpdat return getSurfaceBiome(x, z); } + default IrisBiome getBiomeOrMantle(int x, int y, int z) { + if (y <= getHeight(x, z) - 2) { + return getCaveOrMantleBiome(x, y, z); + } + + return getSurfaceBiome(x, z); + } + default String getObjectPlacementKey(int x, int y, int z) { PlacedObject o = getObjectPlacement(x, y, z); @@ -712,4 +724,8 @@ public interface Engine extends DataProvider, Fallible, LootProvider, BlockUpdat } int getCacheID(); + + default IrisBiome getBiomeOrMantle(Location l) { + return getBiomeOrMantle(l.getBlockX(), l.getBlockY(), l.getBlockZ()); + } } diff --git a/src/main/java/com/volmit/iris/engine/framework/EngineAssignedModifier.java b/src/main/java/com/volmit/iris/engine/framework/EngineAssignedModifier.java index d39ab4d48..543a3739f 100644 --- a/src/main/java/com/volmit/iris/engine/framework/EngineAssignedModifier.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineAssignedModifier.java @@ -33,13 +33,9 @@ public abstract class EngineAssignedModifier extends EngineAssignedComponent @BlockCoordinates @Override public void modify(int x, int z, Hunk output, boolean multicore) { - try - { + try { onModify(x, z, output, multicore); - } - - catch(Throwable e) - { + } catch (Throwable e) { Iris.error("Modifier Failure: " + getName()); e.printStackTrace(); } diff --git a/src/main/java/com/volmit/iris/engine/framework/EngineTarget.java b/src/main/java/com/volmit/iris/engine/framework/EngineTarget.java index 8665570a1..2bb7db7c2 100644 --- a/src/main/java/com/volmit/iris/engine/framework/EngineTarget.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineTarget.java @@ -19,8 +19,8 @@ package com.volmit.iris.engine.framework; import com.volmit.iris.core.loader.IrisData; -import com.volmit.iris.engine.object.IrisWorld; import com.volmit.iris.engine.object.IrisDimension; +import com.volmit.iris.engine.object.IrisWorld; import com.volmit.iris.util.parallel.MultiBurst; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/engine/framework/LootProvider.java b/src/main/java/com/volmit/iris/engine/framework/LootProvider.java index d94a0b0ef..a3c4c2391 100644 --- a/src/main/java/com/volmit/iris/engine/framework/LootProvider.java +++ b/src/main/java/com/volmit/iris/engine/framework/LootProvider.java @@ -18,9 +18,9 @@ package com.volmit.iris.engine.framework; +import com.volmit.iris.engine.object.InventorySlotType; import com.volmit.iris.engine.object.IrisLootReference; import com.volmit.iris.engine.object.IrisLootTable; -import com.volmit.iris.engine.object.InventorySlotType; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.math.RNG; import org.bukkit.block.Block; diff --git a/src/main/java/com/volmit/iris/engine/jigsaw/PlannedPiece.java b/src/main/java/com/volmit/iris/engine/jigsaw/PlannedPiece.java index ce50af0fc..5df15341f 100644 --- a/src/main/java/com/volmit/iris/engine/jigsaw/PlannedPiece.java +++ b/src/main/java/com/volmit/iris/engine/jigsaw/PlannedPiece.java @@ -21,16 +21,7 @@ package com.volmit.iris.engine.jigsaw; import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.core.tools.IrisToolbelt; import com.volmit.iris.engine.framework.Engine; -import com.volmit.iris.engine.object.IrisPosition; -import com.volmit.iris.engine.object.IObjectPlacer; -import com.volmit.iris.engine.object.IrisJigsawPiece; -import com.volmit.iris.engine.object.IrisJigsawPieceConnector; -import com.volmit.iris.engine.object.IrisLootTable; -import com.volmit.iris.engine.object.InventorySlotType; -import com.volmit.iris.engine.object.IrisObject; -import com.volmit.iris.engine.object.IrisObjectRotation; -import com.volmit.iris.engine.object.IrisObjectTranslate; -import com.volmit.iris.engine.object.TileData; +import com.volmit.iris.engine.object.*; import com.volmit.iris.engine.platform.PlatformChunkGenerator; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.math.AxisAlignedBB; 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 e8d6f86f6..936520b9c 100644 --- a/src/main/java/com/volmit/iris/engine/mantle/EngineMantle.java +++ b/src/main/java/com/volmit/iris/engine/mantle/EngineMantle.java @@ -35,7 +35,6 @@ import com.volmit.iris.util.mantle.MantleFlag; import com.volmit.iris.util.matter.Matter; import com.volmit.iris.util.matter.MatterCavern; import com.volmit.iris.util.matter.MatterMarker; -import com.volmit.iris.util.matter.slices.MarkerMatter; import com.volmit.iris.util.matter.slices.UpdateMatter; import com.volmit.iris.util.parallel.BurstExecutor; import com.volmit.iris.util.parallel.MultiBurst; @@ -65,12 +64,10 @@ public interface EngineMantle extends IObjectPlacer { } @ChunkCoordinates - default KList findMarkers(int x, int z, MatterMarker marker) - { + default KList findMarkers(int x, int z, MatterMarker marker) { KList p = new KList<>(); getMantle().iterateChunk(x, z, MatterMarker.class, (xx, yy, zz, mm) -> { - if(marker.equals(mm)) - { + if (marker.equals(mm)) { p.add(new IrisPosition(xx + (x << 4), yy, zz + (z << 4))); } }); @@ -315,4 +312,8 @@ public interface EngineMantle extends IObjectPlacer { default boolean dequeueRegenerate(int x, int z) { return false;// TODO: } + + default int getLoadedRegionCount() { + return getMantle().getLoadedRegionCount(); + } } diff --git a/src/main/java/com/volmit/iris/engine/mantle/MantleWriter.java b/src/main/java/com/volmit/iris/engine/mantle/MantleWriter.java index fa6572389..e9e297270 100644 --- a/src/main/java/com/volmit/iris/engine/mantle/MantleWriter.java +++ b/src/main/java/com/volmit/iris/engine/mantle/MantleWriter.java @@ -22,9 +22,9 @@ import com.google.common.collect.ImmutableList; import com.volmit.iris.Iris; import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.engine.data.cache.Cache; -import com.volmit.iris.engine.object.IrisPosition; import com.volmit.iris.engine.object.IObjectPlacer; import com.volmit.iris.engine.object.IrisFeaturePositional; +import com.volmit.iris.engine.object.IrisPosition; import com.volmit.iris.engine.object.TileData; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.collection.KSet; @@ -475,7 +475,7 @@ public class MantleWriter implements IObjectPlacer { } } - public void setConsumer(Set positions, Function3 data) { + public void setConsumer(Set positions, Function3 data) { for (IrisPosition i : positions) { set(i, data.apply(i.getX(), i.getY(), i.getZ())); } diff --git a/src/main/java/com/volmit/iris/engine/mantle/components/MantleJigsawComponent.java b/src/main/java/com/volmit/iris/engine/mantle/components/MantleJigsawComponent.java index 67e51a29e..96a7178e7 100644 --- a/src/main/java/com/volmit/iris/engine/mantle/components/MantleJigsawComponent.java +++ b/src/main/java/com/volmit/iris/engine/mantle/components/MantleJigsawComponent.java @@ -22,13 +22,7 @@ import com.volmit.iris.engine.jigsaw.PlannedStructure; import com.volmit.iris.engine.mantle.EngineMantle; import com.volmit.iris.engine.mantle.IrisMantleComponent; import com.volmit.iris.engine.mantle.MantleWriter; -import com.volmit.iris.engine.object.IrisPosition; -import com.volmit.iris.engine.object.IrisBiome; -import com.volmit.iris.engine.object.IrisFeaturePositional; -import com.volmit.iris.engine.object.IrisJigsawStructure; -import com.volmit.iris.engine.object.IrisJigsawStructurePlacement; -import com.volmit.iris.engine.object.NoiseStyle; -import com.volmit.iris.engine.object.IrisRegion; +import com.volmit.iris.engine.object.*; import com.volmit.iris.util.documentation.BlockCoordinates; import com.volmit.iris.util.documentation.ChunkCoordinates; import com.volmit.iris.util.mantle.MantleFlag; diff --git a/src/main/java/com/volmit/iris/engine/mantle/components/MantleObjectComponent.java b/src/main/java/com/volmit/iris/engine/mantle/components/MantleObjectComponent.java index 10b2c22e0..73b734521 100644 --- a/src/main/java/com/volmit/iris/engine/mantle/components/MantleObjectComponent.java +++ b/src/main/java/com/volmit/iris/engine/mantle/components/MantleObjectComponent.java @@ -23,13 +23,7 @@ import com.volmit.iris.engine.data.cache.Cache; import com.volmit.iris.engine.mantle.EngineMantle; import com.volmit.iris.engine.mantle.IrisMantleComponent; import com.volmit.iris.engine.mantle.MantleWriter; -import com.volmit.iris.engine.object.IrisBiome; -import com.volmit.iris.engine.object.IrisFeature; -import com.volmit.iris.engine.object.IrisFeaturePositional; -import com.volmit.iris.engine.object.IrisFeaturePotential; -import com.volmit.iris.engine.object.IrisObject; -import com.volmit.iris.engine.object.IrisObjectPlacement; -import com.volmit.iris.engine.object.IrisRegion; +import com.volmit.iris.engine.object.*; import com.volmit.iris.util.documentation.BlockCoordinates; import com.volmit.iris.util.documentation.ChunkCoordinates; import com.volmit.iris.util.mantle.MantleFlag; diff --git a/src/main/java/com/volmit/iris/engine/modifier/IrisCarveModifier.java b/src/main/java/com/volmit/iris/engine/modifier/IrisCarveModifier.java index 0bfeabaa0..d622e1df0 100644 --- a/src/main/java/com/volmit/iris/engine/modifier/IrisCarveModifier.java +++ b/src/main/java/com/volmit/iris/engine/modifier/IrisCarveModifier.java @@ -23,11 +23,7 @@ import com.volmit.iris.engine.actuator.IrisDecorantActuator; import com.volmit.iris.engine.data.cache.Cache; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.EngineAssignedModifier; -import com.volmit.iris.engine.object.IrisPosition; -import com.volmit.iris.engine.object.InferredType; -import com.volmit.iris.engine.object.IrisBiome; -import com.volmit.iris.engine.object.IrisDecorationPart; -import com.volmit.iris.engine.object.IrisDecorator; +import com.volmit.iris.engine.object.*; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.data.B; @@ -51,6 +47,7 @@ public class IrisCarveModifier extends EngineAssignedModifier { private final RNG rng; private final BlockData AIR = Material.CAVE_AIR.createBlockData(); private final BlockData WATER = Material.WATER.createBlockData(); + private final BlockData LAVA = Material.LAVA.createBlockData(); public IrisCarveModifier(Engine engine) { super(engine, "Carve"); @@ -65,8 +62,7 @@ public class IrisCarveModifier extends EngineAssignedModifier { KMap> positions = new KMap<>(); KMap walls = new KMap<>(); Consumer4 iterator = (xx, yy, zz, c) -> { - if(c == null) - { + if (c == null) { return; } @@ -105,14 +101,13 @@ public class IrisCarveModifier extends EngineAssignedModifier { return; } - if(c.isWater()) - { - output.set(rx, yy, rz, WATER); + if (c.isWater()) { + output.set(rx, yy, rz, WATER); + } else if(c.isLava()) { + output.set(rx, yy, rz, LAVA); } - - else - { - output.set(rx, yy, rz, AIR); + else { + output.set(rx, yy, rz, AIR); } }; @@ -127,7 +122,7 @@ public class IrisCarveModifier extends EngineAssignedModifier { biome.setInferredType(InferredType.CAVE); BlockData d = biome.getWall().get(rng, i.getX() + (x << 4), i.getY(), i.getZ() + (z << 4), getData()); - if (d != null && B.isSolid(output.get(i.getX(), i.getY(), i.getZ()))) { + if (d != null && B.isSolid(output.get(i.getX(), i.getY(), i.getZ())) && i.getY() <= getComplex().getHeightStream().get(i.getX() + (x << 4), i.getZ() + (z << 4))) { output.set(i.getX(), i.getY(), i.getZ(), d); } } @@ -169,20 +164,28 @@ public class IrisCarveModifier extends EngineAssignedModifier { getEngine().getMetrics().getDeposit().put(p.getMilliseconds()); } - private void processZone(Hunk output, MantleChunk mc, Mantle mantle, CaveZone zone, int rx, int rz, int xx, int zz) { + private void processZone(Hunk output, MantleChunk mc, Mantle mantle, CaveZone zone, int rx, int rz, int xx, int zz) { boolean decFloor = B.isSolid(output.get(rx, zone.floor - 1, rz)); boolean decCeiling = B.isSolid(output.get(rx, zone.ceiling + 1, rz)); int center = (zone.floor + zone.ceiling) / 2; int thickness = zone.airThickness(); String customBiome = ""; - if(M.r(1D/16D)) + if(B.isDecorant(output.get(rx, zone.ceiling+1, rz))) { + output.set(rx, zone.ceiling+1, rz, AIR); + } + + if(B.isDecorant(output.get(rx, zone.ceiling, rz))) + { + output.set(rx, zone.ceiling, rz, AIR); + } + + if (M.r(1D / 16D)) { mantle.set(xx, zone.ceiling, zz, MarkerMatter.CAVE_CEILING); } - if(M.r(1D/16D)) - { + if (M.r(1D / 16D)) { mantle.set(xx, zone.floor, zz, MarkerMatter.CAVE_FLOOR); } @@ -240,15 +243,19 @@ public class IrisCarveModifier extends EngineAssignedModifier { break; } - if (!B.isSolid(output.get(rx, zone.ceiling + i + 1, rz))) { + BlockData b = blocks.get(i); + BlockData up = output.get(rx, zone.ceiling + i + 1, rz); + + if (!B.isSolid(up)) { continue; } - if (B.isOre(output.get(rx, zone.ceiling + i + 1, rz))) { + if (B.isOre(up)) { + output.set(rx, zone.ceiling + i + 1, rz, B.toDeepSlateOre(up, b)); continue; } - output.set(rx, zone.ceiling + i + 1, rz, blocks.get(i)); + output.set(rx, zone.ceiling + i + 1, rz, b); } } diff --git a/src/main/java/com/volmit/iris/engine/modifier/IrisDepositModifier.java b/src/main/java/com/volmit/iris/engine/modifier/IrisDepositModifier.java index c8a90e62c..980ed1a34 100644 --- a/src/main/java/com/volmit/iris/engine/modifier/IrisDepositModifier.java +++ b/src/main/java/com/volmit/iris/engine/modifier/IrisDepositModifier.java @@ -24,6 +24,7 @@ import com.volmit.iris.engine.object.IrisBiome; import com.volmit.iris.engine.object.IrisDepositGenerator; import com.volmit.iris.engine.object.IrisObject; import com.volmit.iris.engine.object.IrisRegion; +import com.volmit.iris.util.data.B; import com.volmit.iris.util.data.HeightMap; import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.util.math.RNG; @@ -120,20 +121,9 @@ public class IrisDepositModifier extends EngineAssignedModifier { continue; } - boolean allow = false; - - BlockData b = data.get(nx, ny, nz); - if (b != null) { - for (BlockData f : getDimension().getRockPalette().getBlockData(getData())) { - if (f.getMaterial().equals(b.getMaterial())) { - allow = true; - break; - } - } - } - - if (allow) { - data.set(nx, ny, nz, clump.getBlocks().get(j)); + if(!getEngine().getMantle().isCarved((cx << 4) + nx, ny, (cz << 4) + nz)) + { + data.set(nx, ny, nz, B.toDeepSlateOre(data.get(nx, ny, nz), clump.getBlocks().get(j))); } } } diff --git a/src/main/java/com/volmit/iris/engine/object/IrisCave.java b/src/main/java/com/volmit/iris/engine/object/IrisCave.java index dbed15fbd..251d63c3b 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisCave.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisCave.java @@ -18,6 +18,7 @@ package com.volmit.iris.engine.object; +import com.volmit.iris.Iris; import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.core.loader.IrisRegistrant; import com.volmit.iris.engine.framework.Engine; @@ -65,7 +66,6 @@ public class IrisCave extends IrisRegistrant { return "Cave"; } - public void generate(MantleWriter writer, RNG rng, Engine engine, int x, int y, int z) { generate(writer, rng, engine, x, y, z, -1); } @@ -73,42 +73,34 @@ public class IrisCave extends IrisRegistrant { public void generate(MantleWriter writer, RNG rng, Engine engine, int x, int y, int z, int waterHint) { double girth = getWorm().getGirth().get(rng, x, z, engine.getData()); - KList points = getWorm().generate(rng, engine.getData(), writer, verticalRange, x, y, z, - (at) -> {}); + KList points = getWorm().generate(rng, engine.getData(), writer, verticalRange, x, y, z, (at) -> {}); int highestWater = Math.max(waterHint, -1); - boolean water = false; - if(highestWater == -1) - { - for(IrisPosition i : points) - { + if (highestWater == -1) { + for (IrisPosition i : points) { double yy = i.getY() + girth; int th = engine.getHeight(x, z, true); - if(yy > th && th < engine.getDimension().getFluidHeight()) - { - highestWater = Math.max(highestWater, (int)yy); - water = true; + if (yy > th && th < engine.getDimension().getFluidHeight()) { + highestWater = Math.max(highestWater, (int) yy); break; } } } - else - { - water = true; - } - int h = Math.min(Math.max(highestWater, waterHint), engine.getDimension().getFluidHeight()); + int h = Math.min(Math.max(highestWater, waterHint), engine.getDimension().getFluidHeight()); - for(IrisPosition i : points) - { + for (IrisPosition i : points) { fork.doCarving(writer, rng, engine, i.getX(), i.getY(), i.getZ(), h); } + MatterCavern c = new MatterCavern(true, customBiome, (byte) 0); + MatterCavern w = new MatterCavern(true, customBiome, (byte) 1); + writer.setLineConsumer(points, - girth, true, - (xf, yf, zf) -> new MatterCavern(true, customBiome, yf <= h)); + girth, true, + (xf, yf, zf) -> yf <= h ? w : c); } @Override diff --git a/src/main/java/com/volmit/iris/engine/object/IrisCavePlacer.java b/src/main/java/com/volmit/iris/engine/object/IrisCavePlacer.java index 9ab80a265..83b5b8f5f 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisCavePlacer.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisCavePlacer.java @@ -62,6 +62,7 @@ public class IrisCavePlacer implements IRare { public IrisCave getRealCave(IrisData data) { return caveCache.aquire(() -> data.getCaveLoader().load(getCave())); } + public void generateCave(MantleWriter mantle, RNG rng, Engine engine, int x, int y, int z) { generateCave(mantle, rng, engine, x, y, z, -1); } @@ -101,8 +102,7 @@ public class IrisCavePlacer implements IRare { public int getSize(IrisData data) { IrisCave cave = getRealCave(data); - if(cave != null) - { + if (cave != null) { return cave.getMaxSize(data); } diff --git a/src/main/java/com/volmit/iris/engine/object/IrisDimension.java b/src/main/java/com/volmit/iris/engine/object/IrisDimension.java index 75b5faa2a..cacb266e0 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisDimension.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisDimension.java @@ -287,7 +287,7 @@ public class IrisDimension extends IrisRegistrant { int jump = strongholdJumpDistance; RNG rng = new RNG((seed * 223) + 12945); - for (int i = 0; i < maxStrongholds; i++) { + for (int i = 0; i < maxStrongholds+1; i++) { int m = i + 1; pos.add(new Position2( (int) ((rng.i(jump * i) + (jump * i)) * (rng.b() ? -1D : 1D)), @@ -295,6 +295,8 @@ public class IrisDimension extends IrisRegistrant { )); } + pos.remove(0); + return pos; }); } diff --git a/src/main/java/com/volmit/iris/engine/object/IrisElipsoid.java b/src/main/java/com/volmit/iris/engine/object/IrisElipsoid.java index 644a9dfcb..b15b6cf8c 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisElipsoid.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisElipsoid.java @@ -55,7 +55,7 @@ public class IrisElipsoid implements IRare { writer.setElipsoid(x, y, z, xRadius.get(rng, z, y, engine.getData()), yRadius.get(rng, x, z, engine.getData()), - zRadius.get(rng, y, x, engine.getData()), true, matterNodeCache.aquire(() -> CavernMatter.get(getCustomBiome(), false))); + zRadius.get(rng, y, x, engine.getData()), true, matterNodeCache.aquire(() -> CavernMatter.get(getCustomBiome(), 0))); } public double maxSize() { diff --git a/src/main/java/com/volmit/iris/engine/object/IrisEngineSpawnerCooldown.java b/src/main/java/com/volmit/iris/engine/object/IrisEngineSpawnerCooldown.java index 1e47506df..9c9deeadf 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisEngineSpawnerCooldown.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisEngineSpawnerCooldown.java @@ -19,7 +19,6 @@ package com.volmit.iris.engine.object; import com.volmit.iris.engine.framework.Engine; -import com.volmit.iris.engine.object.IrisRate; import com.volmit.iris.util.math.M; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisEntity.java b/src/main/java/com/volmit/iris/engine/object/IrisEntity.java index cd76c2cbd..e3fb62723 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisEntity.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisEntity.java @@ -166,8 +166,7 @@ public class IrisEntity extends IrisRegistrant { } public Entity spawn(Engine gen, Location at, RNG rng) { - if(!Chunks.isSafe(at)) - { + if (!Chunks.isSafe(at)) { return null; } @@ -180,8 +179,7 @@ public class IrisEntity extends IrisRegistrant { Entity ee = doSpawn(at); - if(ee == null && !Chunks.isSafe(at)) - { + if (ee == null && !Chunks.isSafe(at)) { return null; } @@ -345,8 +343,7 @@ public class IrisEntity extends IrisRegistrant { AtomicInteger t = new AtomicInteger(0); AtomicInteger v = new AtomicInteger(0); v.set(J.sr(() -> { - if(t.get() > 100) - { + if (t.get() > 100) { J.csr(v.get()); return; } @@ -389,8 +386,7 @@ public class IrisEntity extends IrisRegistrant { } private Entity doSpawn(Location at) { - if(!Chunks.isSafe(at)) - { + if (!Chunks.isSafe(at)) { return null; } diff --git a/src/main/java/com/volmit/iris/engine/object/IrisEntitySpawn.java b/src/main/java/com/volmit/iris/engine/object/IrisEntitySpawn.java index 4b3cc2e32..4c35fb1e0 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisEntitySpawn.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisEntitySpawn.java @@ -19,14 +19,11 @@ package com.volmit.iris.engine.object; import com.volmit.iris.Iris; -import com.volmit.iris.engine.IrisComplex; import com.volmit.iris.engine.data.cache.AtomicCache; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.object.annotations.*; -import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.format.C; import com.volmit.iris.util.math.RNG; -import com.volmit.iris.util.matter.MatterMarker; import com.volmit.iris.util.matter.slices.MarkerMatter; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisInterpolator.java b/src/main/java/com/volmit/iris/engine/object/IrisInterpolator.java index f4997f832..724b72225 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisInterpolator.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisInterpolator.java @@ -34,6 +34,8 @@ import lombok.experimental.Accessors; @Desc("Configures rotation for iris") @Data public class IrisInterpolator { + public static final IrisInterpolator DEFAULT = new IrisInterpolator(); + @Required @Desc("The interpolation method when two biomes use different heights but this same generator") private InterpolationMethod function = InterpolationMethod.BILINEAR_STARCAST_6; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisModBiomeReplacer.java b/src/main/java/com/volmit/iris/engine/object/IrisModBiomeReplacer.java index f3e099405..ff5fae59d 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisModBiomeReplacer.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisModBiomeReplacer.java @@ -19,7 +19,6 @@ package com.volmit.iris.engine.object; import com.volmit.iris.engine.object.annotations.*; -import com.volmit.iris.engine.object.IrisBiome; import com.volmit.iris.util.collection.KList; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisObjectLoot.java b/src/main/java/com/volmit/iris/engine/object/IrisObjectLoot.java index 114a40fa5..5c57f1685 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisObjectLoot.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisObjectLoot.java @@ -21,8 +21,6 @@ package com.volmit.iris.engine.object; import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.engine.data.cache.AtomicCache; import com.volmit.iris.engine.object.annotations.*; -import com.volmit.iris.engine.object.IrisBlockData; -import com.volmit.iris.engine.object.IrisLootTable; import com.volmit.iris.util.collection.KList; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisObjectReplace.java b/src/main/java/com/volmit/iris/engine/object/IrisObjectReplace.java index 7e141adfd..acfc66da7 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisObjectReplace.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisObjectReplace.java @@ -21,8 +21,6 @@ package com.volmit.iris.engine.object; import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.engine.data.cache.AtomicCache; import com.volmit.iris.engine.object.annotations.*; -import com.volmit.iris.engine.object.IrisBlockData; -import com.volmit.iris.engine.object.IrisMaterialPalette; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.noise.CNG; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisPyramid.java b/src/main/java/com/volmit/iris/engine/object/IrisPyramid.java index 03ea93d75..8e6d23db9 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisPyramid.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisPyramid.java @@ -46,7 +46,7 @@ public class IrisPyramid implements IRare { private transient final AtomicCache matterNodeCache = new AtomicCache<>(); public void generate(RNG rng, Engine engine, MantleWriter writer, int x, int y, int z) { - writer.setPyramid(x, y, z, matterNodeCache.aquire(() -> CavernMatter.get(getCustomBiome(), false)), + writer.setPyramid(x, y, z, matterNodeCache.aquire(() -> CavernMatter.get(getCustomBiome(), 0)), (int) baseWidth.get(rng, z, y, engine.getData()), true); } diff --git a/src/main/java/com/volmit/iris/engine/object/IrisRavine.java b/src/main/java/com/volmit/iris/engine/object/IrisRavine.java index ba34945b1..d0ca1c432 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisRavine.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisRavine.java @@ -18,6 +18,7 @@ package com.volmit.iris.engine.object; +import com.volmit.iris.Iris; import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.core.loader.IrisRegistrant; import com.volmit.iris.engine.framework.Engine; @@ -62,15 +63,18 @@ public class IrisRavine extends IrisRegistrant { private IrisShapedGeneratorStyle baseWidthStyle = new IrisShapedGeneratorStyle(NoiseStyle.PERLIN, 3, 6); @MinNumber(1) - @MaxNumber(70) + @MaxNumber(100) @Desc("The angle at which the ravine widens as it gets closer to the surface") private double angle = 18; @MinNumber(1) - @MaxNumber(70) + @MaxNumber(100) @Desc("The angle at which the ravine widens as it gets closer to the surface") private double topAngle = 38; + @Desc("To fill this cave with lava, set the lava level to a height from the bottom most point of the cave.") + private int lavaLevel = -1; + @Desc("How many worm nodes must be placed to actually generate a ravine? Higher reduces the chances but also reduces ravine 'holes'") private int nodeThreshold = 5; @@ -88,93 +92,97 @@ public class IrisRavine extends IrisRegistrant { public String getTypeName() { return "Ravine"; } + public void generate(MantleWriter writer, RNG rng, Engine engine, int x, int y, int z) { generate(writer, rng, engine, x, y, z, -1); } public void generate(MantleWriter writer, RNG rng, Engine engine, int x, int y, int z, int waterHint) { - - KList pos = getWorm().generate(rng, engine.getData(), writer, null, x, y, z, (at) -> {}); + KList pos = getWorm().generate(rng, engine.getData(), writer, null, x, y, z, (at) -> { + }); CNG dg = depthStyle.getGenerator().createNoCache(rng, engine.getData()); CNG bw = baseWidthStyle.getGenerator().createNoCache(rng, engine.getData()); int highestWater = Math.max(waterHint, -1); boolean water = false; - if(highestWater == -1) - { - for(IrisPosition i : pos) - { + if (highestWater == -1) { + for (IrisPosition i : pos) { int rsurface = y == -1 ? engine.getComplex().getHeightStream().get(x, z).intValue() : y; int depth = (int) Math.round(dg.fitDouble(depthStyle.getMin(), depthStyle.getMax(), i.getX(), i.getZ())); int surface = (int) Math.round(rsurface - depth * 0.45); int yy = surface + depth; int th = engine.getHeight(x, z, true); - if(yy > th && th < engine.getDimension().getFluidHeight()) - { + if (yy > th && th < engine.getDimension().getFluidHeight()) { highestWater = Math.max(highestWater, yy); water = true; break; } } - } - - else - { + } else { water = true; } - MatterCavern c = new MatterCavern(true, customBiome, water); + MatterCavern c = new MatterCavern(true, customBiome, (byte) (water ? 1 : 0)); + MatterCavern l = new MatterCavern(true, customBiome, (byte) 2); - if(pos.size() < nodeThreshold) - { + if (pos.size() < nodeThreshold) { return; } - for(IrisPosition p : pos) - { + for (IrisPosition p : pos) { int rsurface = y == -1 ? engine.getComplex().getHeightStream().get(x, z).intValue() : y; int depth = (int) Math.round(dg.fitDouble(depthStyle.getMin(), depthStyle.getMax(), p.getX(), p.getZ())); int width = (int) Math.round(bw.fitDouble(baseWidthStyle.getMin(), baseWidthStyle.getMax(), p.getX(), p.getZ())); int surface = (int) Math.round(rsurface - depth * 0.45); - fork.doCarving(writer, rng, engine, p.getX(), rng.i(surface-depth, surface), p.getZ(), Math.max(highestWater, waterHint)); + fork.doCarving(writer, rng, engine, p.getX(), rng.i(surface - depth, surface), p.getZ(), Math.max(highestWater, waterHint)); - for(int i = surface + depth; i >= surface; i--) - { - if(i % ribThickness == 0) { + for (int i = surface + depth; i >= surface; i--) { + if (i % ribThickness == 0) { double v = width + ((((surface + depth) - i) * (angle / 360D))); - if(v <= 0.25) - { + if (v <= 0.25) { break; } - if(i <= ribThickness+2) - { + if (i <= ribThickness + 2) { break; } - writer.setElipsoid(p.getX(), i, p.getZ(), v, ribThickness, v, true, c); + if(lavaLevel >= 0 && i <= lavaLevel + (surface - depthStyle.getMid())) + { + writer.setElipsoid(p.getX(), i, p.getZ(), v, ribThickness, v, true, l); + } + + else + { + writer.setElipsoid(p.getX(), i, p.getZ(), v, ribThickness, v, true, c); + } } } - for(int i = surface - depth; i <= surface; i++) - { - if(i % ribThickness == 0) { + for (int i = surface - depth; i <= surface; i++) { + if (i % ribThickness == 0) { double v = width - ((((surface - depth) - i) * (angle / 360D))); - if(v <= 0.25) - { + if (v <= 0.25) { break; } - if(i <= ribThickness+2) - { + if (i <= ribThickness + 2) { break; } - writer.setElipsoid(p.getX(), i, p.getZ(), v, ribThickness, v, true, c); + if(lavaLevel >= 0 && i <= lavaLevel + (surface - depthStyle.getMid())) + { + writer.setElipsoid(p.getX(), i, p.getZ(), v, ribThickness, v, true, l); + } + + else + { + writer.setElipsoid(p.getX(), i, p.getZ(), v, ribThickness, v, true, c); + } } } } diff --git a/src/main/java/com/volmit/iris/engine/object/IrisSeed.java b/src/main/java/com/volmit/iris/engine/object/IrisSeed.java new file mode 100644 index 000000000..947f0c154 --- /dev/null +++ b/src/main/java/com/volmit/iris/engine/object/IrisSeed.java @@ -0,0 +1,47 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.volmit.iris.engine.object; + +import com.volmit.iris.engine.object.annotations.Desc; +import com.volmit.iris.engine.object.annotations.Snippet; +import com.volmit.iris.util.math.RNG; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; + +@Snippet("color") +@Accessors(chain = true) +@NoArgsConstructor +@Desc("Represents a color") +@Data +public class IrisSeed { + @Desc("The seed to use") + private long seed = 1337; + + @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) { + return (seed * 47) + getSeed() + 29334667L; + } + + public RNG rng(long inseed) { + return new RNG(getSeed(inseed)); + } +} diff --git a/src/main/java/com/volmit/iris/engine/object/IrisShapedGeneratorStyle.java b/src/main/java/com/volmit/iris/engine/object/IrisShapedGeneratorStyle.java index 6f3244963..ad4deb88d 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisShapedGeneratorStyle.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisShapedGeneratorStyle.java @@ -66,4 +66,8 @@ public class IrisShapedGeneratorStyle { public boolean isFlat() { return min == max || getGenerator().isFlat(); } + + public int getMid() { + return (getMax() + getMin()) / 2; + } } diff --git a/src/main/java/com/volmit/iris/engine/object/IrisSphere.java b/src/main/java/com/volmit/iris/engine/object/IrisSphere.java index 6c24344d5..8bc0ac611 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisSphere.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisSphere.java @@ -46,7 +46,7 @@ public class IrisSphere implements IRare { private transient final AtomicCache matterNodeCache = new AtomicCache<>(); public void generate(RNG rng, Engine engine, MantleWriter writer, int x, int y, int z) { - writer.setSphere(x, y, z, radius.get(rng, z, y, engine.getData()), true, matterNodeCache.aquire(() -> CavernMatter.get(getCustomBiome(), false))); + writer.setSphere(x, y, z, radius.get(rng, z, y, engine.getData()), true, matterNodeCache.aquire(() -> CavernMatter.get(getCustomBiome(), 0))); } public double maxSize() { diff --git a/src/main/java/com/volmit/iris/engine/object/IrisStyledRange.java b/src/main/java/com/volmit/iris/engine/object/IrisStyledRange.java index 1fa826107..1a2e2c8bf 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisStyledRange.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisStyledRange.java @@ -65,4 +65,8 @@ public class IrisStyledRange { public boolean isFlat() { return getMax() == getMin() || style.isFlat(); } + + public int getMid() { + return (int) ((getMax() + getMin()) / 2); + } } diff --git a/src/main/java/com/volmit/iris/engine/object/annotations/Snippet.java b/src/main/java/com/volmit/iris/engine/object/annotations/Snippet.java index aec442b0b..bd0afc43c 100644 --- a/src/main/java/com/volmit/iris/engine/object/annotations/Snippet.java +++ b/src/main/java/com/volmit/iris/engine/object/annotations/Snippet.java @@ -21,7 +21,7 @@ package com.volmit.iris.engine.object.annotations; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import static java.lang.annotation.ElementType.*; +import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; @Retention(RUNTIME) diff --git a/src/main/java/com/volmit/iris/engine/platform/BukkitChunkGenerator.java b/src/main/java/com/volmit/iris/engine/platform/BukkitChunkGenerator.java index 84e196154..54c69c081 100644 --- a/src/main/java/com/volmit/iris/engine/platform/BukkitChunkGenerator.java +++ b/src/main/java/com/volmit/iris/engine/platform/BukkitChunkGenerator.java @@ -26,8 +26,8 @@ import com.volmit.iris.engine.data.chunk.TerrainChunk; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.EngineTarget; import com.volmit.iris.engine.framework.WrongEngineBroException; -import com.volmit.iris.engine.object.IrisWorld; import com.volmit.iris.engine.object.IrisDimension; +import com.volmit.iris.engine.object.IrisWorld; import com.volmit.iris.engine.object.StudioMode; import com.volmit.iris.engine.platform.studio.StudioGenerator; import com.volmit.iris.util.collection.KList; @@ -93,7 +93,7 @@ public class BukkitChunkGenerator extends ChunkGenerator implements PlatformChun this.dimensionKey = dimensionKey; this.folder = new ReactiveFolder(dataLocation, (_a, _b, _c) -> hotload()); setupEngine(); - this.hotloader = new Looper() { + this.hotloader = studio ? new Looper() { @Override protected long loop() { if (hotloadChecker.flip()) { @@ -102,10 +102,14 @@ public class BukkitChunkGenerator extends ChunkGenerator implements PlatformChun return 250; } - }; - hotloader.setPriority(Thread.MIN_PRIORITY); - hotloader.start(); - hotloader.setName(getTarget().getWorld().name() + " Hotloader"); + } : null; + + if(studio) + { + hotloader.setPriority(Thread.MIN_PRIORITY); + hotloader.start(); + hotloader.setName(getTarget().getWorld().name() + " Hotloader"); + } } private void setupEngine() { @@ -117,7 +121,7 @@ public class BukkitChunkGenerator extends ChunkGenerator implements PlatformChun IrisDimension test = IrisData.loadAnyDimension(dimensionKey); if (test != null) { - Iris.warn("Looks like " + dimensionKey + " exists in " + test.getLoadFile().getPath()); + Iris.warn("Looks like " + dimensionKey + " exists in " + test.getLoadFile().getPath() + " "); Iris.service(StudioSVC.class).installIntoWorld(Iris.getSender(), dimensionKey, dataLocation.getParentFile().getParentFile()); Iris.warn("Attempted to install into " + data.getDataFolder().getPath()); data.dump(); @@ -232,7 +236,11 @@ public class BukkitChunkGenerator extends ChunkGenerator implements PlatformChun @Override public void close() { withExclusiveControl(() -> { - hotloader.interrupt(); + if(isStudio()) + { + hotloader.interrupt(); + } + getEngine().close(); }); } @@ -244,6 +252,11 @@ public class BukkitChunkGenerator extends ChunkGenerator implements PlatformChun @Override public void hotload() { + if(!isStudio()) + { + return; + } + withExclusiveControl(() -> getEngine().hotload()); } diff --git a/src/main/java/com/volmit/iris/util/board/BoardManager.java b/src/main/java/com/volmit/iris/util/board/BoardManager.java index d4d55aaab..7f3fbdb29 100644 --- a/src/main/java/com/volmit/iris/util/board/BoardManager.java +++ b/src/main/java/com/volmit/iris/util/board/BoardManager.java @@ -48,7 +48,7 @@ public class BoardManager { this.plugin = plugin; this.boardSettings = boardSettings; this.scoreboards = new ConcurrentHashMap<>(); - this.updateTask = new BoardUpdateTask(this).runTaskTimer(plugin, 2L, 2L); + this.updateTask = new BoardUpdateTask(this).runTaskTimer(plugin, 2L, 20L); plugin.getServer().getOnlinePlayers().forEach(this::setup); } diff --git a/src/main/java/com/volmit/iris/util/data/B.java b/src/main/java/com/volmit/iris/util/data/B.java index 0730ef792..d5d99a6a1 100644 --- a/src/main/java/com/volmit/iris/util/data/B.java +++ b/src/main/java/com/volmit/iris/util/data/B.java @@ -22,9 +22,8 @@ import com.volmit.iris.Iris; import com.volmit.iris.core.IrisSettings; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.scheduling.ChronoLatch; -import it.unimi.dsi.fastutil.ints.IntOpenHashSet; -import it.unimi.dsi.fastutil.ints.IntSet; -import it.unimi.dsi.fastutil.ints.IntSets; +import it.unimi.dsi.fastutil.ints.*; +import net.minecraft.world.level.levelgen.OreVeinifier; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.block.data.BlockData; @@ -43,6 +42,9 @@ public class B { private static final Material AIR_MATERIAL = Material.AIR; private static final BlockData AIR = AIR_MATERIAL.createBlockData(); private static final IntSet foliageCache = buildFoliageCache(); + private static final IntSet deepslateCache = buildDeepslateCache(); + private static final Int2IntMap normal2DeepslateCache = buildNormal2DeepslateCache(); + private static final Int2IntMap deepslate2NormalCache = buildNormal2DeepslateCache(); private static final IntSet decorantCache = buildDecorantCache(); private static final IntSet storageCache = buildStorageCache(); private static final IntSet storageChestCache = buildStorageChestCache(); @@ -84,6 +86,54 @@ public class B { return IntSets.unmodifiable(b); } + private static IntSet buildDeepslateCache() { + IntSet b = new IntOpenHashSet(); + Arrays.stream(new Material[]{ + DEEPSLATE, + DEEPSLATE_BRICKS, + DEEPSLATE_BRICK_SLAB, + DEEPSLATE_BRICK_STAIRS, + DEEPSLATE_BRICK_WALL, + DEEPSLATE_TILE_SLAB, + DEEPSLATE_TILES, + DEEPSLATE_TILE_STAIRS, + DEEPSLATE_TILE_WALL, + CRACKED_DEEPSLATE_TILES + }).forEach((i) -> b.add(i.ordinal())); + + return IntSets.unmodifiable(b); + } + + private static Int2IntMap buildNormal2DeepslateCache() { + Int2IntMap b = new Int2IntOpenHashMap(); + + b.put(COAL_ORE.ordinal(), DEEPSLATE_COAL_ORE.ordinal()); + b.put(EMERALD_ORE.ordinal(), DEEPSLATE_EMERALD_ORE.ordinal()); + b.put(DIAMOND_ORE.ordinal(), DEEPSLATE_DIAMOND_ORE.ordinal()); + b.put(COPPER_ORE.ordinal(), DEEPSLATE_COPPER_ORE.ordinal()); + b.put(GOLD_ORE.ordinal(), DEEPSLATE_GOLD_ORE.ordinal()); + b.put(IRON_ORE.ordinal(), DEEPSLATE_IRON_ORE.ordinal()); + b.put(LAPIS_ORE.ordinal(), DEEPSLATE_LAPIS_ORE.ordinal()); + b.put(REDSTONE_ORE.ordinal(), DEEPSLATE_REDSTONE_ORE.ordinal()); + + return b; + } + + private static Int2IntMap buildDeepslate2NormalCache() { + Int2IntMap b = new Int2IntOpenHashMap(); + + b.put(DEEPSLATE_COAL_ORE.ordinal(), COAL_ORE.ordinal()); + b.put(DEEPSLATE_EMERALD_ORE.ordinal(), EMERALD_ORE.ordinal()); + b.put(DEEPSLATE_DIAMOND_ORE.ordinal(), DIAMOND_ORE.ordinal()); + b.put(DEEPSLATE_COPPER_ORE.ordinal(), COPPER_ORE.ordinal()); + b.put(DEEPSLATE_GOLD_ORE.ordinal(), GOLD_ORE.ordinal()); + b.put(DEEPSLATE_IRON_ORE.ordinal(), IRON_ORE.ordinal()); + b.put(DEEPSLATE_LAPIS_ORE.ordinal(), LAPIS_ORE.ordinal()); + b.put(DEEPSLATE_REDSTONE_ORE.ordinal(), REDSTONE_ORE.ordinal()); + + return b; + } + private static IntSet buildDecorantCache() { IntSet b = new IntOpenHashSet(); Arrays.stream(new Material[]{ @@ -216,6 +266,32 @@ public class B { return IntSets.unmodifiable(b); } + public static BlockData toDeepSlateOre(BlockData block, BlockData ore) { + int key = ore.getMaterial().ordinal(); + + if(isDeepSlate(block)) + { + if(normal2DeepslateCache.containsKey(key)) + { + return Material.values()[normal2DeepslateCache.get(key)].createBlockData(); + } + } + + else + { + if(deepslate2NormalCache.containsKey(key)) + { + return Material.values()[deepslate2NormalCache.get(key)].createBlockData(); + } + } + + return ore; + } + + public static boolean isDeepSlate(BlockData blockData) { + return deepslateCache.contains(blockData.getMaterial().ordinal()); + } + public static boolean isOre(BlockData blockData) { return blockData.getMaterial().name().endsWith("_ORE"); } diff --git a/src/main/java/com/volmit/iris/util/decree/DecreeParameterHandler.java b/src/main/java/com/volmit/iris/util/decree/DecreeParameterHandler.java index 1ba681705..d2b06d6bf 100644 --- a/src/main/java/com/volmit/iris/util/decree/DecreeParameterHandler.java +++ b/src/main/java/com/volmit/iris/util/decree/DecreeParameterHandler.java @@ -69,7 +69,7 @@ public interface DecreeParameterHandler { /** * Should parse a String into the designated type. You can force it to not throw a whichexception * - * @param in The string to parse + * @param in The string to parse * @param force force an option instead of throwing decreewhich * @return The value extracted from the string, of the designated type * @throws DecreeParsingException Thrown when the parsing fails (ex: "oop" translated to an integer throws this) diff --git a/src/main/java/com/volmit/iris/util/decree/DecreeSystem.java b/src/main/java/com/volmit/iris/util/decree/DecreeSystem.java index 6c1f1dc67..09648640b 100644 --- a/src/main/java/com/volmit/iris/util/decree/DecreeSystem.java +++ b/src/main/java/com/volmit/iris/util/decree/DecreeSystem.java @@ -59,11 +59,9 @@ public interface DecreeSystem extends CommandExecutor, TabCompleter { KList v = getRoot().tabComplete(enhanced, enhanced.toString(" ")); v.removeDuplicates(); - if(sender instanceof Player) - { - if(IrisSettings.get().getGeneral().isCommandSounds()) - { - ((Player)sender).playSound(((Player)sender).getLocation(), Sound.BLOCK_AMETHYST_BLOCK_CHIME, 0.25f, RNG.r.f(0.125f, 1.95f)); + if (sender instanceof Player) { + if (IrisSettings.get().getGeneral().isCommandSounds()) { + ((Player) sender).playSound(((Player) sender).getLocation(), Sound.BLOCK_AMETHYST_BLOCK_CHIME, 0.25f, RNG.r.f(0.125f, 1.95f)); } } @@ -79,26 +77,19 @@ public interface DecreeSystem extends CommandExecutor, TabCompleter { J.aBukkit(() -> { if (!call(new VolmitSender(sender), args)) { - if(IrisSettings.get().getGeneral().isCommandSounds()) - { - if(sender instanceof Player) - { - ((Player)sender).playSound(((Player)sender).getLocation(), Sound.BLOCK_AMETHYST_CLUSTER_BREAK, 0.77f, 0.25f); - ((Player)sender).playSound(((Player)sender).getLocation(), Sound.BLOCK_BEACON_DEACTIVATE, 0.2f, 0.45f); + if (IrisSettings.get().getGeneral().isCommandSounds()) { + if (sender instanceof Player) { + ((Player) sender).playSound(((Player) sender).getLocation(), Sound.BLOCK_AMETHYST_CLUSTER_BREAK, 0.77f, 0.25f); + ((Player) sender).playSound(((Player) sender).getLocation(), Sound.BLOCK_BEACON_DEACTIVATE, 0.2f, 0.45f); } } sender.sendMessage(C.RED + "Unknown Iris Command"); - } - - else - { - if(IrisSettings.get().getGeneral().isCommandSounds()) - { - if(sender instanceof Player) - { - ((Player)sender).playSound(((Player)sender).getLocation(), Sound.BLOCK_AMETHYST_CLUSTER_BREAK, 0.77f, 1.65f); - ((Player)sender).playSound(((Player)sender).getLocation(), Sound.BLOCK_RESPAWN_ANCHOR_CHARGE, 0.125f, 2.99f); + } else { + if (IrisSettings.get().getGeneral().isCommandSounds()) { + if (sender instanceof Player) { + ((Player) sender).playSound(((Player) sender).getLocation(), Sound.BLOCK_AMETHYST_CLUSTER_BREAK, 0.77f, 1.65f); + ((Player) sender).playSound(((Player) sender).getLocation(), Sound.BLOCK_RESPAWN_ANCHOR_CHARGE, 0.125f, 2.99f); } } } diff --git a/src/main/java/com/volmit/iris/util/decree/context/BiomeContextHandler.java b/src/main/java/com/volmit/iris/util/decree/context/BiomeContextHandler.java index c011c47d2..619500ac9 100644 --- a/src/main/java/com/volmit/iris/util/decree/context/BiomeContextHandler.java +++ b/src/main/java/com/volmit/iris/util/decree/context/BiomeContextHandler.java @@ -32,7 +32,7 @@ public class BiomeContextHandler implements DecreeContextHandler { if (sender.isPlayer() && IrisToolbelt.isIrisWorld(sender.player().getWorld()) && IrisToolbelt.access(sender.player().getWorld()).getEngine() != null) { - return IrisToolbelt.access(sender.player().getWorld()).getEngine().getBiome(sender.player().getLocation()); + return IrisToolbelt.access(sender.player().getWorld()).getEngine().getBiomeOrMantle(sender.player().getLocation()); } return null; diff --git a/src/main/java/com/volmit/iris/util/decree/handlers/BiomeHandler.java b/src/main/java/com/volmit/iris/util/decree/handlers/BiomeHandler.java index ae2164bf1..445f6db3b 100644 --- a/src/main/java/com/volmit/iris/util/decree/handlers/BiomeHandler.java +++ b/src/main/java/com/volmit/iris/util/decree/handlers/BiomeHandler.java @@ -65,21 +65,13 @@ public class BiomeHandler implements DecreeParameterHandler { if (options.isEmpty()) { throw new DecreeParsingException("Unable to find Biome \"" + in + "\""); } else if (options.size() > 1) { - if(force) - { - try - { + if (force) { + try { return options.stream().filter((i) -> toString(i).equalsIgnoreCase(in)).collect(Collectors.toList()).get(0); - } - - catch(Throwable e) - { + } catch (Throwable e) { throw new DecreeParsingException("Unable to filter which Biome \"" + in + "\""); } - } - - else - { + } else { throw new DecreeWhichException(); } } diff --git a/src/main/java/com/volmit/iris/util/decree/handlers/DimensionHandler.java b/src/main/java/com/volmit/iris/util/decree/handlers/DimensionHandler.java index 372e3aa7a..0d3df912f 100644 --- a/src/main/java/com/volmit/iris/util/decree/handlers/DimensionHandler.java +++ b/src/main/java/com/volmit/iris/util/decree/handlers/DimensionHandler.java @@ -62,21 +62,13 @@ public class DimensionHandler implements DecreeParameterHandler { if (options.isEmpty()) { throw new DecreeParsingException("Unable to find Dimension \"" + in + "\""); } else if (options.size() > 1) { - if(force) - { - try - { + if (force) { + try { return options.stream().filter((i) -> toString(i).equalsIgnoreCase(in)).collect(Collectors.toList()).get(0); - } - - catch(Throwable e) - { + } catch (Throwable e) { throw new DecreeParsingException("Unable to filter which Biome \"" + in + "\""); } - } - - else - { + } else { throw new DecreeWhichException(); } } diff --git a/src/main/java/com/volmit/iris/util/decree/handlers/EntityHandler.java b/src/main/java/com/volmit/iris/util/decree/handlers/EntityHandler.java index f7e56ad81..1526eaa66 100644 --- a/src/main/java/com/volmit/iris/util/decree/handlers/EntityHandler.java +++ b/src/main/java/com/volmit/iris/util/decree/handlers/EntityHandler.java @@ -82,21 +82,13 @@ public class EntityHandler implements DecreeParameterHandler { if (options.isEmpty()) { throw new DecreeParsingException("Unable to find Entity \"" + in + "\""); } else if (options.size() > 1) { - if(force) - { - try - { + if (force) { + try { return options.stream().filter((i) -> toString(i).equalsIgnoreCase(in)).collect(Collectors.toList()).get(0); - } - - catch(Throwable e) - { + } catch (Throwable e) { throw new DecreeParsingException("Unable to filter which Biome \"" + in + "\""); } - } - - else - { + } else { throw new DecreeWhichException(); } } diff --git a/src/main/java/com/volmit/iris/util/decree/handlers/GeneratorHandler.java b/src/main/java/com/volmit/iris/util/decree/handlers/GeneratorHandler.java index 0974ea4d9..062047a1c 100644 --- a/src/main/java/com/volmit/iris/util/decree/handlers/GeneratorHandler.java +++ b/src/main/java/com/volmit/iris/util/decree/handlers/GeneratorHandler.java @@ -62,21 +62,13 @@ public class GeneratorHandler implements DecreeParameterHandler { if (options.isEmpty()) { throw new DecreeParsingException("Unable to find Generator \"" + in + "\""); } else if (options.size() > 1) { - if(force) - { - try - { + if (force) { + try { return options.stream().filter((i) -> toString(i).equalsIgnoreCase(in)).collect(Collectors.toList()).get(0); - } - - catch(Throwable e) - { + } catch (Throwable e) { throw new DecreeParsingException("Unable to filter which Biome \"" + in + "\""); } - } - - else - { + } else { throw new DecreeWhichException(); } } diff --git a/src/main/java/com/volmit/iris/util/decree/handlers/PlayerHandler.java b/src/main/java/com/volmit/iris/util/decree/handlers/PlayerHandler.java index f9b139516..c2d499c09 100644 --- a/src/main/java/com/volmit/iris/util/decree/handlers/PlayerHandler.java +++ b/src/main/java/com/volmit/iris/util/decree/handlers/PlayerHandler.java @@ -46,21 +46,13 @@ public class PlayerHandler implements DecreeParameterHandler { if (options.isEmpty()) { throw new DecreeParsingException("Unable to find Player \"" + in + "\""); } else if (options.size() > 1) { - if(force) - { - try - { + if (force) { + try { return options.stream().filter((i) -> toString(i).equalsIgnoreCase(in)).collect(Collectors.toList()).get(0); - } - - catch(Throwable e) - { + } catch (Throwable e) { throw new DecreeParsingException("Unable to filter which Biome \"" + in + "\""); } - } - - else - { + } else { throw new DecreeWhichException(); } } diff --git a/src/main/java/com/volmit/iris/util/decree/handlers/RegionHandler.java b/src/main/java/com/volmit/iris/util/decree/handlers/RegionHandler.java index abe6018b5..ea0482516 100644 --- a/src/main/java/com/volmit/iris/util/decree/handlers/RegionHandler.java +++ b/src/main/java/com/volmit/iris/util/decree/handlers/RegionHandler.java @@ -65,21 +65,13 @@ public class RegionHandler implements DecreeParameterHandler { if (options.isEmpty()) { throw new DecreeParsingException("Unable to find Region \"" + in + "\""); } else if (options.size() > 1) { - if(force) - { - try - { + if (force) { + try { return options.stream().filter((i) -> toString(i).equalsIgnoreCase(in)).collect(Collectors.toList()).get(0); - } - - catch(Throwable e) - { + } catch (Throwable e) { throw new DecreeParsingException("Unable to filter which Biome \"" + in + "\""); } - } - - else - { + } else { throw new DecreeWhichException(); } } diff --git a/src/main/java/com/volmit/iris/util/decree/handlers/ScriptHandler.java b/src/main/java/com/volmit/iris/util/decree/handlers/ScriptHandler.java index 7c7ac365c..eef7beb57 100644 --- a/src/main/java/com/volmit/iris/util/decree/handlers/ScriptHandler.java +++ b/src/main/java/com/volmit/iris/util/decree/handlers/ScriptHandler.java @@ -62,21 +62,13 @@ public class ScriptHandler implements DecreeParameterHandler { if (options.isEmpty()) { throw new DecreeParsingException("Unable to find Script \"" + in + "\""); } else if (options.size() > 1) { - if(force) - { - try - { + if (force) { + try { return options.stream().filter((i) -> toString(i).equalsIgnoreCase(in)).collect(Collectors.toList()).get(0); - } - - catch(Throwable e) - { + } catch (Throwable e) { throw new DecreeParsingException("Unable to filter which Biome \"" + in + "\""); } - } - - else - { + } else { throw new DecreeWhichException(); } } diff --git a/src/main/java/com/volmit/iris/util/decree/handlers/WorldHandler.java b/src/main/java/com/volmit/iris/util/decree/handlers/WorldHandler.java index 3c3bf898f..c3393c17f 100644 --- a/src/main/java/com/volmit/iris/util/decree/handlers/WorldHandler.java +++ b/src/main/java/com/volmit/iris/util/decree/handlers/WorldHandler.java @@ -51,21 +51,13 @@ public class WorldHandler implements DecreeParameterHandler { if (options.isEmpty()) { throw new DecreeParsingException("Unable to find World \"" + in + "\""); } else if (options.size() > 1) { - if(force) - { - try - { + if (force) { + try { return options.stream().filter((i) -> toString(i).equalsIgnoreCase(in)).collect(Collectors.toList()).get(0); - } - - catch(Throwable e) - { + } catch (Throwable e) { throw new DecreeParsingException("Unable to filter which Biome \"" + in + "\""); } - } - - else - { + } else { throw new DecreeWhichException(); } } diff --git a/src/main/java/com/volmit/iris/util/decree/specialhandlers/ObjectHandler.java b/src/main/java/com/volmit/iris/util/decree/specialhandlers/ObjectHandler.java index 9ac6aaa58..1fd2b4252 100644 --- a/src/main/java/com/volmit/iris/util/decree/specialhandlers/ObjectHandler.java +++ b/src/main/java/com/volmit/iris/util/decree/specialhandlers/ObjectHandler.java @@ -56,21 +56,13 @@ public class ObjectHandler implements DecreeParameterHandler { if (options.isEmpty()) { throw new DecreeParsingException("Unable to find Object \"" + in + "\""); } else if (options.size() > 1) { - if(force) - { - try - { + if (force) { + try { return options.stream().filter((i) -> toString(i).equalsIgnoreCase(in)).collect(Collectors.toList()).get(0); - } - - catch(Throwable e) - { + } catch (Throwable e) { throw new DecreeParsingException("Unable to filter which Biome \"" + in + "\""); } - } - - else - { + } else { throw new DecreeWhichException(); } } diff --git a/src/main/java/com/volmit/iris/util/decree/virtual/VirtualDecreeCommand.java b/src/main/java/com/volmit/iris/util/decree/virtual/VirtualDecreeCommand.java index 668231064..b44777f26 100644 --- a/src/main/java/com/volmit/iris/util/decree/virtual/VirtualDecreeCommand.java +++ b/src/main/java/com/volmit/iris/util/decree/virtual/VirtualDecreeCommand.java @@ -34,18 +34,18 @@ import com.volmit.iris.util.plugin.CommandDummy; import com.volmit.iris.util.plugin.VolmitSender; import com.volmit.iris.util.scheduling.ChronoLatch; import com.volmit.iris.util.scheduling.J; -import com.volmit.iris.util.stream.utility.SemaphoreStream; import lombok.Data; import org.bukkit.Sound; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.util.Objects; import java.util.UUID; -import java.util.concurrent.*; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; @Data public class VirtualDecreeCommand { @@ -105,17 +105,14 @@ public class VirtualDecreeCommand { private ChronoLatch cl = new ChronoLatch(1000); - public void cacheAll() - { + public void cacheAll() { VolmitSender sender = new VolmitSender(new CommandDummy()); - if(isNode()) - { - J.a(() -> sender.sendDecreeHelpNode(this)); + if (isNode()) { + sender.sendDecreeHelpNode(this); } - for(VirtualDecreeCommand j : nodes) - { + for (VirtualDecreeCommand j : nodes) { j.cacheAll(); } } @@ -286,8 +283,7 @@ public class VirtualDecreeCommand { for (int ix = 0; ix < in.size(); ix++) { String i = in.get(ix); - if(i == null) - { + if (i == null) { continue; } @@ -337,8 +333,7 @@ public class VirtualDecreeCommand { Iris.debug("Found multiple results for " + key + "=" + value + " in " + getPath() + " using the handler " + param.getHandler().getClass().getSimpleName() + " with potential matches [" + validOptions.toString(",") + "]. Asking client to define one"); String update = pickValidOption(sender, validOptions, param.getHandler(), param.getName(), param.getType().getSimpleName()); - if(update == null) - { + if (update == null) { return null; } @@ -360,8 +355,7 @@ public class VirtualDecreeCommand { KList validOptions = par.getHandler().getPossibilities(i); String update = pickValidOption(sender, validOptions, par.getHandler(), par.getName(), par.getType().getSimpleName()); - if(update == null) - { + if (update == null) { return null; } @@ -403,15 +397,10 @@ public class VirtualDecreeCommand { sender.sendDecreeHelp(this); return true; - } - - else if(args.size() == 1) - { - for(String i : args) - { - if(i.startsWith("help=")) - { - sender.sendDecreeHelp(this, Integer.parseInt(i.split("\\Q=\\E")[1])-1); + } else if (args.size() == 1) { + for (String i : args) { + if (i.startsWith("help=")) { + sender.sendDecreeHelp(this, Integer.parseInt(i.split("\\Q=\\E")[1]) - 1); return true; } } @@ -452,8 +441,7 @@ public class VirtualDecreeCommand { KList validOptions = i.getHandler().getPossibilities(i.getParam().defaultValue()); String update = pickValidOption(sender, validOptions, i.getHandler(), i.getName(), i.getType().getSimpleName()); - if(update == null) - { + if (update == null) { return false; } @@ -530,17 +518,15 @@ public class VirtualDecreeCommand { String password = UUID.randomUUID().toString().replaceAll("\\Q-\\E", ""); int m = 0; - for(String i : validOptions.convert(handler::toStringForce)) - { - sender.sendMessage( "'>"+"- " + gradients[m%gradients.length] + i + ""); + for (String i : validOptions.convert(handler::toStringForce)) { + sender.sendMessage("'>" + "- " + gradients[m % gradients.length] + i + ""); m++; } CompletableFuture future = new CompletableFuture<>(); Iris.service(CommandSVC.class).post(password, future); - if(IrisSettings.get().getGeneral().isCommandSounds() && sender.isPlayer()) - { + if (IrisSettings.get().getGeneral().isCommandSounds() && sender.isPlayer()) { (sender.player()).playSound((sender.player()).getLocation(), Sound.BLOCK_AMETHYST_CLUSTER_BREAK, 0.77f, 0.65f); (sender.player()).playSound((sender.player()).getLocation(), Sound.BLOCK_BEACON_DEACTIVATE, 0.125f, 1.99f); } diff --git a/src/main/java/com/volmit/iris/util/io/ReactiveFolder.java b/src/main/java/com/volmit/iris/util/io/ReactiveFolder.java index c26d5ab67..bbd385c3e 100644 --- a/src/main/java/com/volmit/iris/util/io/ReactiveFolder.java +++ b/src/main/java/com/volmit/iris/util/io/ReactiveFolder.java @@ -20,7 +20,6 @@ package com.volmit.iris.util.io; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.function.Consumer3; -import com.volmit.iris.util.plugin.VolmitSender; import java.io.File; @@ -48,8 +47,7 @@ public class ReactiveFolder { if (checkCycle % 3 == 0 ? fw.checkModified() : fw.checkModifiedFast()) { for (File i : fw.getCreated()) { if (i.getName().endsWith(".iob") || i.getName().endsWith(".json") || i.getName().endsWith(".js")) { - if(i.getPath().contains(".iris")) - { + if (i.getPath().contains(".iris")) { continue; } @@ -60,8 +58,7 @@ public class ReactiveFolder { if (!modified) { for (File i : fw.getChanged()) { - if(i.getPath().contains(".iris")) - { + if (i.getPath().contains(".iris")) { continue; } @@ -74,8 +71,7 @@ public class ReactiveFolder { if (!modified) { for (File i : fw.getDeleted()) { - if(i.getPath().contains(".iris")) - { + if (i.getPath().contains(".iris")) { continue; } diff --git a/src/main/java/com/volmit/iris/util/mantle/Mantle.java b/src/main/java/com/volmit/iris/util/mantle/Mantle.java index bc69b1503..1b4be5b1f 100644 --- a/src/main/java/com/volmit/iris/util/mantle/Mantle.java +++ b/src/main/java/com/volmit/iris/util/mantle/Mantle.java @@ -502,4 +502,8 @@ public class Mantle { public void deleteChunkSlice(int x, int z, Class c) { getChunk(x, z).deleteSlices(c); } + + public int getLoadedRegionCount() { + return loadedRegions.size(); + } } diff --git a/src/main/java/com/volmit/iris/util/matter/MatterCavern.java b/src/main/java/com/volmit/iris/util/matter/MatterCavern.java index 9c6bf70a3..601339913 100644 --- a/src/main/java/com/volmit/iris/util/matter/MatterCavern.java +++ b/src/main/java/com/volmit/iris/util/matter/MatterCavern.java @@ -26,5 +26,20 @@ import lombok.Data; public class MatterCavern { private final boolean cavern; private final String customBiome; - private final boolean water; + private final byte liquid; // 0 none 1 water 2 lava + + public boolean isAir() + { + return liquid == 0; + } + + public boolean isWater() + { + return liquid == 1; + } + + public boolean isLava() + { + return liquid == 2; + } } diff --git a/src/main/java/com/volmit/iris/util/matter/MatterMarker.java b/src/main/java/com/volmit/iris/util/matter/MatterMarker.java index 9ad23b685..bae34e822 100644 --- a/src/main/java/com/volmit/iris/util/matter/MatterMarker.java +++ b/src/main/java/com/volmit/iris/util/matter/MatterMarker.java @@ -18,7 +18,6 @@ package com.volmit.iris.util.matter; -import com.volmit.iris.util.matter.slices.MarkerMatter; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/util/matter/slices/CavernMatter.java b/src/main/java/com/volmit/iris/util/matter/slices/CavernMatter.java index 88331e5f7..612df6ed6 100644 --- a/src/main/java/com/volmit/iris/util/matter/slices/CavernMatter.java +++ b/src/main/java/com/volmit/iris/util/matter/slices/CavernMatter.java @@ -27,8 +27,8 @@ import java.io.IOException; @Sliced public class CavernMatter extends RawMatter { - public static MatterCavern get(String customBiome, boolean underwater) { - return new MatterCavern(true, customBiome, underwater); + public static MatterCavern get(String customBiome, int liquid) { + return new MatterCavern(true, customBiome, (byte) liquid); } public CavernMatter() { @@ -42,16 +42,16 @@ public class CavernMatter extends RawMatter { @Override public void writeNode(MatterCavern b, DataOutputStream dos) throws IOException { dos.writeBoolean(b.isCavern()); - dos.writeBoolean(b.isWater()); dos.writeUTF(b.getCustomBiome()); + dos.writeByte(b.getLiquid()); } @Override public MatterCavern readNode(DataInputStream din) throws IOException { boolean b = din.readBoolean(); - boolean w = din.readBoolean(); String v = din.readUTF(); + byte l = din.readByte(); - return new MatterCavern(b, v, w); + return new MatterCavern(b, v, l); } } diff --git a/src/main/java/com/volmit/iris/util/plugin/Chunks.java b/src/main/java/com/volmit/iris/util/plugin/Chunks.java index 5ba3b0dbc..60e26c0c6 100644 --- a/src/main/java/com/volmit/iris/util/plugin/Chunks.java +++ b/src/main/java/com/volmit/iris/util/plugin/Chunks.java @@ -23,31 +23,26 @@ import org.bukkit.World; import org.bukkit.entity.Player; public class Chunks { - public static boolean isSafe(World w, int x, int z) - { + public static boolean isSafe(World w, int x, int z) { return w.isChunkLoaded(x, z) - && w.isChunkLoaded(x+1, z) - && w.isChunkLoaded(x, z+1) - && w.isChunkLoaded(x-1, z) - && w.isChunkLoaded(x, z-1) - && w.isChunkLoaded(x-1, z-1) - && w.isChunkLoaded(x+1, z+1) - && w.isChunkLoaded(x+1, z-1) - && w.isChunkLoaded(x-1, z+1); + && w.isChunkLoaded(x + 1, z) + && w.isChunkLoaded(x, z + 1) + && w.isChunkLoaded(x - 1, z) + && w.isChunkLoaded(x, z - 1) + && w.isChunkLoaded(x - 1, z - 1) + && w.isChunkLoaded(x + 1, z + 1) + && w.isChunkLoaded(x + 1, z - 1) + && w.isChunkLoaded(x - 1, z + 1); } - public static boolean isSafe(Location l) - { + public static boolean isSafe(Location l) { return isSafe(l.getWorld(), l.getBlockX() >> 4, l.getBlockZ() >> 4); } public static boolean hasPlayersNearby(Location at) { - try{ + try { return !at.getWorld().getNearbyEntities(at, 32, 32, 32, (i) -> i instanceof Player).isEmpty(); - } - - catch(Throwable ignored) - { + } catch (Throwable ignored) { return false; } } diff --git a/src/main/java/com/volmit/iris/util/plugin/VolmitSender.java b/src/main/java/com/volmit/iris/util/plugin/VolmitSender.java index c5bce1585..5513c3c05 100644 --- a/src/main/java/com/volmit/iris/util/plugin/VolmitSender.java +++ b/src/main/java/com/volmit/iris/util/plugin/VolmitSender.java @@ -42,7 +42,6 @@ import org.bukkit.permissions.Permission; import org.bukkit.permissions.PermissionAttachment; import org.bukkit.permissions.PermissionAttachmentInfo; import org.bukkit.plugin.Plugin; -import org.bukkit.util.ChatPaginator; import java.time.Duration; import java.util.Set; @@ -251,8 +250,7 @@ public class VolmitSender implements CommandSender { } private Component createNoPrefixComponent(String message) { - if(!IrisSettings.get().getGeneral().canUseCustomColors(this)) - { + if (!IrisSettings.get().getGeneral().canUseCustomColors(this)) { String t = C.translateAlternateColorCodes('&', MiniMessage.get().stripTokens(message)); return MiniMessage.get().parse(t); } @@ -267,8 +265,7 @@ public class VolmitSender implements CommandSender { } private Component createComponent(String message) { - if(!IrisSettings.get().getGeneral().canUseCustomColors(this)) - { + if (!IrisSettings.get().getGeneral().canUseCustomColors(this)) { String t = C.translateAlternateColorCodes('&', MiniMessage.get().stripTokens(getTag() + message)); return MiniMessage.get().parse(t); } @@ -279,8 +276,7 @@ public class VolmitSender implements CommandSender { } private Component createComponentRaw(String message) { - if(!IrisSettings.get().getGeneral().canUseCustomColors(this)) - { + if (!IrisSettings.get().getGeneral().canUseCustomColors(this)) { String t = C.translateAlternateColorCodes('&', MiniMessage.get().stripTokens(getTag() + message)); return MiniMessage.get().parse(t); } @@ -315,8 +311,7 @@ public class VolmitSender implements CommandSender { @Override public void sendMessage(String message) { - if(s instanceof CommandDummy) - { + if (s instanceof CommandDummy) { return; } @@ -341,8 +336,7 @@ public class VolmitSender implements CommandSender { } public void sendMessageRaw(String message) { - if(s instanceof CommandDummy) - { + if (s instanceof CommandDummy) { return; } @@ -445,15 +439,13 @@ public class VolmitSender implements CommandSender { } - public static KList paginate(KList all, int linesPerPage, int page, AtomicBoolean hasNext) - { - int totalPages = (int) Math.ceil((double)all.size() / linesPerPage); + public static KList paginate(KList all, int linesPerPage, int page, AtomicBoolean hasNext) { + int totalPages = (int) Math.ceil((double) all.size() / linesPerPage); page = page < 0 ? 0 : page >= totalPages ? totalPages - 1 : page; - hasNext.set(page < totalPages-1); + hasNext.set(page < totalPages - 1); KList d = new KList<>(); - for(int i = linesPerPage * page; i < Math.min(all.size(), linesPerPage * (page + 1)); i++) - { + for (int i = linesPerPage * page; i < Math.min(all.size(), linesPerPage * (page + 1)); i++) { d.add(all.get(i)); } @@ -461,8 +453,7 @@ public class VolmitSender implements CommandSender { } public void sendDecreeHelp(VirtualDecreeCommand v, int page) { - if(!isPlayer()) - { + if (!isPlayer()) { for (VirtualDecreeCommand i : v.getNodes()) { sendDecreeHelpNode(i); } @@ -475,7 +466,7 @@ public class VolmitSender implements CommandSender { sendMessageRaw("\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"); if (v.getNodes().isNotEmpty()) { - sendHeader(v.getPath() + (page > 0 ? (" {" + (page+1) + "}") : "")); + sendHeader(v.getPath() + (page > 0 ? (" {" + (page + 1) + "}") : "")); if (isPlayer() && v.getParent() != null) { sendMessageRaw("Click to go back to <#3299bf>" + Form.capitalize(v.getParent().getName()) + " Help" + "'><#f58571>〈 Back"); } @@ -488,16 +479,14 @@ public class VolmitSender implements CommandSender { String s = ""; int l = 75 - (page > 0 ? 10 : 0) - (next.get() ? 10 : 0); - if(page > 0) - { + if (page > 0) { s += "Click to go back to page " + page + "'>〈 Page " + page + " "; } s += "" + Form.repeat(" ", l) + ""; - if(next.get()) - { - s += " Click to go to back to page " + (page+2) + "'>Page " + (page+2) + " ❭"; + if (next.get()) { + s += " Click to go to back to page " + (page + 2) + "'>Page " + (page + 2) + " ❭"; } sendMessageRaw(s); @@ -512,8 +501,7 @@ public class VolmitSender implements CommandSender { public void sendDecreeHelpNode(VirtualDecreeCommand i) { if (isPlayer() || s instanceof CommandDummy) { sendMessageRaw(helpCache.compute(i.getPath(), (k, v) -> { - if(v != null) - { + if (v != null) { return v; }