Merge pull request #847 from VolmitSoftware/Development

Development update

build.gradle

@@ -24,10 +24,10 @@ plugins {
     id "de.undercouch.download" version "5.0.1"
 }
 
-version '2.2.5-1.19' // Needs to be version specific
-def nmsVersion = "1.19"
+version '2.2.8-1.19.2' // Needs to be version specific
+def nmsVersion = "1.19.2"
 def apiVersion = '1.19'
-def spigotJarVersion = '1.19-R0.1-SNAPSHOT'
+def spigotJarVersion = '1.19.1-R0.1-SNAPSHOT'
 def name = getRootProject().getName() // Defined in settings.gradle
 def main = 'com.volmit.iris.Iris'
 
@@ -38,7 +38,7 @@ registerCustomOutputTask('Psycho', 'D://Dan/MinecraftDevelopment/server/plugins'
 registerCustomOutputTask('ArcaneArts', 'C://Users/arcane/Documents/development/server/plugins')
 registerCustomOutputTask('Coco', 'D://Documents/MC/plugins')
 registerCustomOutputTask('Strange', 'D://Servers/1.17 Test Server/plugins')
-registerCustomOutputTask('Vatuu', 'D://Minecraft/Servers/1.19/plugins')
+registerCustomOutputTask('Vatuu', 'D://Minecraft/Servers/1.19.1/plugins')
 // ========================== UNIX ==============================
 registerCustomOutputTaskUnix('CyberpwnLT', '/Users/danielmills/development/server/plugins')
 registerCustomOutputTaskUnix('PsychoLT', '/Users/brianfopiano/Desktop/REMOTES/RemoteMinecraft/plugins')
@@ -124,10 +124,10 @@ dependencies {
     // Provided or Classpath
     compileOnly 'org.projectlombok:lombok:1.18.24'
     annotationProcessor 'org.projectlombok:lombok:1.18.24'
-    implementation 'org.spigotmc:spigot-api:1.19-R0.1-SNAPSHOT'
+    implementation 'org.spigotmc:spigot-api:1.19.1-R0.1-SNAPSHOT'
     implementation 'me.clip:placeholderapi:2.11.1'
     implementation 'io.th0rgal:oraxen:1.94.0'
-    implementation 'org.bukkit:craftbukkit:1.19-R0.1-SNAPSHOT:remapped-mojang'
+    implementation 'org.bukkit:craftbukkit:1.19.1-R0.1-SNAPSHOT:remapped-mojang'
     implementation 'com.github.LoneDev6:api-itemsadder:3.1.0b'
 
     // Shaded

src/main/java/com/volmit/iris/core/commands/CommandIris.java

@@ -78,8 +78,6 @@ public class CommandIris implements DecreeExecutor {
             return;
         }
 
-        sender().sendMessage(C.RED + "You should not be using this command to create new worlds. Instead, use the tutorial: https://docs.volmit.com/iris/getting-started");
-
         try {
             IrisToolbelt.createWorld()
                 .dimension(type.getLoadKey())
@@ -140,7 +138,7 @@ public class CommandIris implements DecreeExecutor {
         sender().sendMessage(C.GREEN + "Total Height: " + (sender().player().getWorld().getMaxHeight() - sender().player().getWorld().getMinHeight()));
     }
 
-    @Decree(description = "QOL command to open a overworld studio world.")
+    @Decree(description = "QOL command to open a overworld studio world.", sync = true)
     public void so() {
         sender().sendMessage(C.GREEN + "Opening studio for the \"Overworld\" pack (seed: 1337)");
         Iris.service(StudioSVC.class).open(sender(), 1337, "overworld");

src/main/java/com/volmit/iris/core/gui/NoiseExplorerGUI.java

@@ -148,7 +148,7 @@ public class NoiseExplorerGUI extends JPanel implements MouseWheelListener, List
         JFrame frame = new JFrame("Noise Explorer");
         NoiseExplorerGUI nv = new NoiseExplorerGUI();
         frame.setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE);
-        KList<String> li = new KList<>(NoiseStyle.values()).toStringList();
+        KList<String> li = new KList<>(NoiseStyle.values()).toStringList().sort();
         combo = new JComboBox<>(li.toArray(new String[0]));
         combo.setSelectedItem("STATIC");
         combo.setFocusable(false);

src/main/java/com/volmit/iris/core/nms/INMS.java

@@ -20,7 +20,7 @@ package com.volmit.iris.core.nms;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.core.IrisSettings;
-import com.volmit.iris.core.nms.v19_1.NMSBinding19_1;
+import com.volmit.iris.core.nms.v19_2.NMSBinding19_2;
 import com.volmit.iris.core.nms.v1X.NMSBinding1X;
 import com.volmit.iris.util.collection.KMap;
 import org.bukkit.Bukkit;
@@ -28,7 +28,7 @@ import org.bukkit.Bukkit;
 public class INMS {
     //@builder
     private static final KMap<String, Class<? extends INMSBinding>> bindings = new KMap<String, Class<? extends INMSBinding>>()
-        .qput("v1_19_R1", NMSBinding19_1.class);
+        .qput("v1_19_R1", NMSBinding19_2.class);
     //@done
     private static final INMSBinding binding = bind();
 

src/main/java/com/volmit/iris/core/nms/v19_2/NMSBinding19_2.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.core.nms.v19_1;
+package com.volmit.iris.core.nms.v19_2;
 
 
 import com.volmit.iris.Iris;
@@ -39,15 +39,10 @@ import it.unimi.dsi.fastutil.objects.Object2IntMap;
 import net.minecraft.core.*;
 import net.minecraft.nbt.NbtIo;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.util.BitStorage;
-import net.minecraft.util.Mth;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.chunk.ChunkAccess;
-import net.minecraft.world.level.chunk.LevelChunkSection;
-import net.minecraft.world.level.chunk.Palette;
-import net.minecraft.world.level.chunk.PalettedContainer;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -74,7 +69,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
-public class NMSBinding19_1 implements INMSBinding {
+public class NMSBinding19_2 implements INMSBinding {
 
     private final KMap<Biome, Object> baseBiomeCache = new KMap<>();
     private final BlockData AIR = Material.AIR.createBlockData();

src/main/java/com/volmit/iris/core/pregenerator/IrisPregenerator.java

@@ -29,6 +29,7 @@ import com.volmit.iris.util.scheduling.ChronoLatch;
 import com.volmit.iris.util.scheduling.J;
 import com.volmit.iris.util.scheduling.Looper;
 
+import java.util.concurrent.Semaphore;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
@@ -55,10 +56,12 @@ public class IrisPregenerator {
     private final KSet<Position2> retry;
     private final KSet<Position2> net;
     private final ChronoLatch cl;
+    private final Semaphore limiter;
 
     public IrisPregenerator(PregenTask task, PregeneratorMethod generator, PregenListener listener) {
         this.listener = listenify(listener);
         cl = new ChronoLatch(5000);
+        limiter = new Semaphore(Runtime.getRuntime().availableProcessors());
         generatedRegions = new KSet<>();
         this.shutdown = new AtomicBoolean(false);
         this.paused = new AtomicBoolean(false);
@@ -140,6 +143,7 @@ public class IrisPregenerator {
         generator.close();
         ticker.interrupt();
         listener.onClose();
+        getMantle().trim(0);
     }
 
     private void visitRegion(int x, int z, boolean regions) {
@@ -162,12 +166,26 @@ public class IrisPregenerator {
         boolean hit = false;
         if(generator.supportsRegions(x, z, listener) && regions) {
             hit = true;
-            listener.onRegionGenerating(x, z);
-            generator.generateRegion(x, z, listener);
+            try {
+                limiter.acquire();
+                listener.onRegionGenerating(x, z);
+                generator.generateRegion(x, z, listener);
+                limiter.release();
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
         } else if(!regions) {
             hit = true;
             listener.onRegionGenerating(x, z);
-            PregenTask.iterateRegion(x, z, (xx, zz) -> generator.generateChunk(xx, zz, listener));
+            PregenTask.iterateRegion(x, z, (xx, zz) -> {
+                try {
+                    limiter.acquire();
+                    generator.generateChunk(xx, zz, listener);
+                    limiter.release();
+                } catch (InterruptedException e) {
+                    throw new RuntimeException(e);
+                }
+            });
         }
 
         if(hit) {

src/main/java/com/volmit/iris/engine/decorator/IrisCeilingDecorator.java

@@ -23,6 +23,7 @@ import com.volmit.iris.engine.framework.Engine;
 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.util.data.B;
 import com.volmit.iris.util.documentation.BlockCoordinates;
 import com.volmit.iris.util.hunk.Hunk;
 import org.bukkit.Material;
@@ -100,14 +101,13 @@ public class IrisCeilingDecorator extends IrisEngineDecorator {
     }
 
     private BlockData fixFaces(BlockData b, int x, int y, int z) {
-        Material mat = b.getMaterial();
-        if(mat == Material.VINE || mat == Material.GLOW_LICHEN) {
+        if(B.isVineBlock(b)) {
             MultipleFacing data = (MultipleFacing)b.clone();
             boolean found = false;
             for(BlockFace f : BlockFace.values()) {
                 if(!f.isCartesian())
                     continue;
-                Material m = getEngine().getMantle().get(x, y, z).getMaterial();
+                Material m = getEngine().getMantle().get(x + f.getModX(), y + f.getModY(), z + f.getModZ()).getMaterial();
                 if(m.isSolid()) {
                     found = true;
                     data.setFace(f, m.isSolid());

src/main/java/com/volmit/iris/engine/decorator/IrisSurfaceDecorator.java

@@ -25,12 +25,14 @@ 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.util.data.B;
 import com.volmit.iris.util.documentation.BlockCoordinates;
 import com.volmit.iris.util.hunk.Hunk;
 import org.bukkit.Material;
 import org.bukkit.block.BlockFace;
 import org.bukkit.block.data.Bisected;
 import org.bukkit.block.data.BlockData;
+import org.bukkit.block.data.MultipleFacing;
 import org.bukkit.block.data.type.PointedDripstone;
 
 public class IrisSurfaceDecorator extends IrisEngineDecorator {
@@ -73,8 +75,8 @@ public class IrisSurfaceDecorator extends IrisEngineDecorator {
                 }
 
                 if(decorator.getForceBlock() != null)
-                    data.set(x, height, z, decorator.getForceBlock().getBlockData(getData()));
-                data.set(x, height + 1, z, bd);
+                    data.set(x, height, z, fixFaces(decorator.getForceBlock().getBlockData(getData()), x, height, z));
+                data.set(x, height + 1, z, fixFaces(bd, x, height, z));
             } else {
                 if(height < getDimension().getFluidHeight()) {
                     max = getDimension().getFluidHeight();
@@ -140,4 +142,24 @@ public class IrisSurfaceDecorator extends IrisEngineDecorator {
             }
         }
     }
+
+    private BlockData fixFaces(BlockData b, int x, int y, int z) {
+        if(B.isVineBlock(b)) {
+            MultipleFacing data = (MultipleFacing)b.clone();
+            boolean found = false;
+            for(BlockFace f : BlockFace.values()) {
+                if(!f.isCartesian())
+                    continue;
+                Material m = getEngine().getMantle().get(x + f.getModX(), y + f.getModY(), z + f.getModZ()).getMaterial();
+                if(m.isSolid()) {
+                    found = true;
+                    data.setFace(f, m.isSolid());
+                }
+            }
+            if(!found)
+                data.setFace(BlockFace.UP, true);
+            return data;
+        }
+        return b;
+    }
 }

src/main/java/com/volmit/iris/engine/mode/ModeOverworld.java

@@ -42,10 +42,10 @@ public class ModeOverworld extends IrisEngineMode implements EngineMode {
         var deposit = new IrisDepositModifier(getEngine());
         var perfection = new IrisPerfectionModifier(getEngine());
 
+        registerStage((x, z, k, p, m) -> biome.actuate(x, z, p, m));
         registerStage(burst(
             (x, z, k, p, m) -> generateMatter(x >> 4, z >> 4, m),
-            (x, z, k, p, m) -> terrain.actuate(x, z, k, m),
-            (x, z, k, p, m) -> biome.actuate(x, z, p, m)
+            (x, z, k, p, m) -> terrain.actuate(x, z, k, m)
         ));
         registerStage((x, z, k, p, m) -> cave.modify(x >> 4, z >> 4, k, m));
         registerStage((x, z, k, p, m) -> deposit.modify(x, z, k, m));

src/main/java/com/volmit/iris/engine/object/IrisObject.java

@@ -47,9 +47,11 @@ import lombok.experimental.Accessors;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
 import org.bukkit.block.BlockState;
 import org.bukkit.block.TileState;
 import org.bukkit.block.data.BlockData;
+import org.bukkit.block.data.MultipleFacing;
 import org.bukkit.block.data.Waterlogged;
 import org.bukkit.block.data.type.Leaves;
 import org.bukkit.util.BlockVector;
@@ -803,6 +805,16 @@ public class IrisObject extends IrisRegistrant {
                     ((Waterlogged) data).setWaterlogged(true);
                 }
 
+                if(B.isVineBlock(data)) {
+                    MultipleFacing f = (MultipleFacing)data;
+                    for(BlockFace face : f.getAllowedFaces()) {
+                        BlockData facingBlock = placer.get(xx + face.getModX(), yy + face.getModY(), zz + face.getModZ());
+                        if(B.isSolid(facingBlock) && !B.isVineBlock(facingBlock)) {
+                            f.setFace(face, true);
+                        }
+                    }
+                }
+
                 if(listener != null) {
                     listener.accept(new BlockPosition(xx, yy, zz));
                 }
@@ -895,8 +907,19 @@ public class IrisObject extends IrisRegistrant {
                     if(settings.getYMax() != 0)
                         lowerBound -= Math.min(config.getStiltSettings().getYMax() - (lowest + y - highest), 0);
                 }
-                for(int j = lowest + y; j > lowerBound; j--)
+                for(int j = lowest + y; j > lowerBound; j--) {
+                    if(B.isVineBlock(d)) {
+                        MultipleFacing f = (MultipleFacing)d;
+                        for(BlockFace face : f.getAllowedFaces()) {
+                            BlockData facingBlock = placer.get(xx + face.getModX(), j + face.getModY(), zz + face.getModZ());
+                            if(B.isSolid(facingBlock) && !B.isVineBlock(facingBlock)) {
+                                f.setFace(face, true);
+                            }
+                        }
+                    }
                     placer.set(xx, j, zz, d);
+                }
+
             }
 
             readLock.unlock();

src/main/java/com/volmit/iris/util/data/B.java

@@ -201,7 +201,8 @@ public class B {
             TORCH,
             SOUL_TORCH,
             GLOW_LICHEN,
-            VINE
+            VINE,
+            SCULK_VEIN
         }).forEach((i) -> b.add(i.ordinal()));
         b.addAll(foliageCache);
 
@@ -674,4 +675,11 @@ public class B {
     public static void registerCustomBlockData(String namespace, String key, BlockData blockData) {
         custom.put(namespace + ":" + key, blockData);
     }
+
+    public static boolean isVineBlock(BlockData data) {
+        return switch(data.getMaterial()) {
+            case VINE, SCULK_VEIN, GLOW_LICHEN -> true;
+            default -> false;
+        };
+    }
 }

src/main/java/com/volmit/iris/util/hunk/view/BiomeGridHunkView.java

@@ -62,7 +62,6 @@ public class BiomeGridHunkView implements Hunk<Biome> {
         if(y > highest)
         {
             highest = y;
-            Iris.info("Highest = " + highest);
         }
     }