Implemented final Forge features (#199)

* Cache world instead of creating a new instance every time on Forge

* Implemented regenerateChunk

* Implemented ForgeBlockData.getCopy, made ILeaves extend IBlockData (same as the other subclasses)

* Implemented Forge Leaves and Waterlogged - Leaves are also watterlogged since 1.19 - not yet 100% sure what to do with that on spigot

* remove substring from getWorld

Author: Lennart99

VoxelSniperCore/src/main/java/com/github/kevindagame/voxelsniper/blockdata/leaves/ILeaves.kt

@@ -1,6 +1,8 @@
 package com.github.kevindagame.voxelsniper.blockdata.leaves
 
-interface ILeaves {
+import com.github.kevindagame.voxelsniper.blockdata.IBlockData
+
+interface ILeaves : IBlockData {
     fun isPersistent(): Boolean
     fun setPersistent(persistent: Boolean)
 }

VoxelSniperForge/src/main/java/com/github/kevindagame/voxelsniperforge/ForgeVoxelSniperListener.java

@@ -81,7 +81,7 @@ private BlockFace getBlockFace(PlayerInteractEvent event) {
     private @Nullable
     IBlock getClickedBlock(PlayerInteractEvent event) {
         if (event instanceof PlayerInteractEvent.LeftClickBlock || event instanceof PlayerInteractEvent.RightClickBlock) {
-            var world = new ForgeWorld(((ServerLevel) event.getLevel()));
+            var world = VoxelSniperForge.getInstance().getWorld(((ServerLevel) event.getLevel()));
             var pos = ForgeLocation.fromForgeBlockPos(world, event.getPos());
             return world.getBlock(pos);
 

VoxelSniperForge/src/main/java/com/github/kevindagame/voxelsniperforge/VoxelSniperForge.java

@@ -18,12 +18,12 @@
 import com.github.kevindagame.voxelsniperforge.material.BlockMaterial;
 import com.github.kevindagame.voxelsniperforge.material.ItemMaterial;
 import com.github.kevindagame.voxelsniperforge.permissions.ForgePermissionManager;
+import com.github.kevindagame.voxelsniperforge.world.ForgeWorld;
 
-import net.minecraft.core.Holder;
 import net.minecraft.core.Registry;
 import net.minecraft.core.registries.Registries;
-import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.levelgen.feature.ChorusPlantFeature;
@@ -65,6 +65,7 @@ public class VoxelSniperForge implements IVoxelsniper {
     private static VoxelSniperForge instance;
 
     private final Map<UUID, ForgePlayer> players = new HashMap<>();
+    private final Map<String, ForgeWorld> worlds = new HashMap<>();
     public static VoxelSniperForge getInstance() {
         return instance;
     }
@@ -243,4 +244,13 @@ public static boolean isTreeType(@NotNull ConfiguredFeature<?, ?> feature) {
                 feature.config() instanceof HugeFungusConfiguration ||
                 feature.feature() instanceof ChorusPlantFeature;
     }
+
+    @NotNull
+    public ForgeWorld getWorld(@NotNull ServerLevel level) {
+        var name = level.toString();
+        if (this.worlds.get(name) != null) return this.worlds.get(name);
+        ForgeWorld res = new ForgeWorld(level);
+        this.worlds.put(name, res);
+        return res;
+    }
 }

VoxelSniperForge/src/main/java/com/github/kevindagame/voxelsniperforge/blockdata/ForgeBlockData.java

@@ -2,7 +2,9 @@
 
 import com.github.kevindagame.voxelsniper.blockdata.IBlockData;
 import com.github.kevindagame.voxelsniper.material.VoxelMaterial;
+import com.github.kevindagame.voxelsniperforge.blockdata.leaves.ForgeLeaves;
 import com.github.kevindagame.voxelsniperforge.blockdata.redstoneWire.ForgeRedstoneWire;
+import com.github.kevindagame.voxelsniperforge.blockdata.waterlogged.ForgeWaterlogged;
 import com.github.kevindagame.voxelsniperforge.material.BlockMaterial;
 import com.google.common.base.Preconditions;
 import com.mojang.brigadier.StringReader;
@@ -13,7 +15,9 @@
 import net.minecraft.commands.arguments.blocks.BlockStateParser;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.LeavesBlock;
 import net.minecraft.world.level.block.RedStoneWireBlock;
+import net.minecraft.world.level.block.SimpleWaterloggedBlock;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraftforge.registries.ForgeRegistries;
@@ -89,7 +93,7 @@ public IBlockData merge(IBlockData newData) {
 
     @Override
     public IBlockData getCopy() {
-        throw new UnsupportedOperationException("Not implemented yet");
+        return this.clone();
     }
 
     @Override
@@ -150,6 +154,10 @@ public static ForgeBlockData fromData(BlockState blockData) {
         Block b = blockData.getBlock();
         if (b instanceof RedStoneWireBlock)
             return new ForgeRedstoneWire(blockData);
+        if (b instanceof LeavesBlock)
+            return new ForgeLeaves(blockData);
+        if (b instanceof SimpleWaterloggedBlock)
+            return new ForgeWaterlogged(blockData);
         return new ForgeBlockData(blockData);
     }
 }

VoxelSniperForge/src/main/java/com/github/kevindagame/voxelsniperforge/blockdata/leaves/ForgeLeaves.kt

@@ -0,0 +1,16 @@
+package com.github.kevindagame.voxelsniperforge.blockdata.leaves
+
+import com.github.kevindagame.voxelsniper.blockdata.leaves.ILeaves
+import com.github.kevindagame.voxelsniperforge.blockdata.waterlogged.ForgeWaterlogged
+import net.minecraft.world.level.block.LeavesBlock
+import net.minecraft.world.level.block.state.BlockState
+
+class ForgeLeaves(state: BlockState?) : ForgeWaterlogged(state), ILeaves {
+    override fun isPersistent(): Boolean {
+        return get(LeavesBlock.PERSISTENT)
+    }
+
+    override fun setPersistent(persistent: Boolean) {
+        set(LeavesBlock.PERSISTENT, persistent)
+    }
+}

VoxelSniperForge/src/main/java/com/github/kevindagame/voxelsniperforge/blockdata/waterlogged/ForgeWaterlogged.kt

@@ -0,0 +1,16 @@
+package com.github.kevindagame.voxelsniperforge.blockdata.waterlogged
+
+import com.github.kevindagame.voxelsniper.blockdata.waterlogged.IWaterlogged
+import com.github.kevindagame.voxelsniperforge.blockdata.ForgeBlockData
+import net.minecraft.world.level.block.state.BlockState
+import net.minecraft.world.level.block.state.properties.BlockStateProperties
+
+open class ForgeWaterlogged(state: BlockState?) : ForgeBlockData(state), IWaterlogged {
+    override fun isWaterlogged(): Boolean {
+        return get(BlockStateProperties.WATERLOGGED)
+    }
+
+    override fun setWaterlogged(waterlogged: Boolean) {
+        set(BlockStateProperties.WATERLOGGED, waterlogged)
+    }
+}

VoxelSniperForge/src/main/java/com/github/kevindagame/voxelsniperforge/entity/ForgeEntity.java

@@ -58,7 +58,7 @@ public BaseLocation getLocation() {
 
     @Override
     public IWorld getWorld() {
-        return new ForgeWorld((ServerLevel) this.entity.level());
+        return VoxelSniperForge.getInstance().getWorld((ServerLevel) this.entity.level());
     }
 
     @Override

VoxelSniperForge/src/main/java/com/github/kevindagame/voxelsniperforge/world/ForgeWorld.java

@@ -16,24 +16,34 @@
 import com.github.kevindagame.voxelsniperforge.chunk.ForgeChunk;
 import com.github.kevindagame.voxelsniperforge.entity.ForgeEntity;
 import com.github.kevindagame.voxelsniperforge.location.ForgeLocation;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
+import com.mojang.datafixers.util.Unit;
 
+import net.minecraft.Util;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Holder;
 import net.minecraft.core.QuartPos;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.server.level.ServerChunkCache;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.util.RandomSource;
+import net.minecraft.util.thread.ProcessorMailbox;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.LightningBolt;
+import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.WorldGenLevel;
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.biome.BiomeResolver;
+import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import net.minecraft.world.level.chunk.ChunkGenerator;
 import net.minecraft.world.level.chunk.ChunkStatus;
+import net.minecraft.world.level.chunk.ImposterProtoChunk;
+import net.minecraft.world.level.chunk.LevelChunk;
 import net.minecraft.world.level.levelgen.Heightmap;
 import net.minecraft.world.level.levelgen.LegacyRandomSource;
 import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
@@ -46,6 +56,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
+import java.util.concurrent.CompletableFuture;
 import java.util.function.Predicate;
 
 public record ForgeWorld(@NotNull ServerLevel level) implements IWorld {
@@ -109,7 +120,6 @@ public String getName() {
 
     @Override
     public void spawn(BaseLocation location, VoxelEntityType entity) {
-        //TODO test this
         var tag = EntityType.byString(entity.getKey());
         if (tag.isPresent()) {
             Entity created = tag.get().create(level);
@@ -149,13 +159,67 @@ public void setBiome(int x, int y, int z, VoxelBiome selectedBiome) {
 
     @Override
     public int getHighestBlockYAt(int x, int z) {
-        //TODO test this
         return level.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING, new BlockPos(x, 0, z)).getY();
     }
 
     @Override
     public void regenerateChunk(int x, int z) {
-        throw new UnsupportedOperationException("Not implemented yet");
+        // copied from net.minecraft.server.commands.ResetChunksCommand, seems to work
+        ServerChunkCache serverchunkcache = this.level.getChunkSource();
+        serverchunkcache.chunkMap.debugReloadGenerator();
+
+        // clear all blocks
+        final ChunkPos chunkPos = new ChunkPos(x, z);
+        if (serverchunkcache.getChunk(x, z, false) != null) {
+            for(BlockPos blockpos : BlockPos.betweenClosed(chunkPos.getMinBlockX(), this.level.getMinBuildHeight(), chunkPos.getMinBlockZ(), chunkPos.getMaxBlockX(), this.level.getMaxBuildHeight() - 1, chunkPos.getMaxBlockZ())) {
+                this.level.setBlock(blockpos, Blocks.AIR.defaultBlockState(), 16);
+            }
+        }
+
+        ProcessorMailbox<Runnable> processormailbox = ProcessorMailbox.create(Util.backgroundExecutor(), "worldgen-resetchunks");
+
+        // Generate chunk
+        for(ChunkStatus chunkstatus : ImmutableList.of(ChunkStatus.BIOMES, ChunkStatus.NOISE, ChunkStatus.SURFACE, ChunkStatus.CARVERS, ChunkStatus.FEATURES, ChunkStatus.INITIALIZE_LIGHT)) {
+            CompletableFuture<Unit> completablefuture = CompletableFuture.supplyAsync(() -> Unit.INSTANCE, processormailbox::tell);
+
+            if (serverchunkcache.getChunk(x, z, false) != null) {
+                List<ChunkAccess> list = Lists.newArrayList();
+                int range = Math.max(1, chunkstatus.getRange());
+
+                for(int z1 = z - range; z1 <= z + range; ++z1) {
+                    for(int x1 = x - range; x1 <= x + range; ++x1) {
+                        ChunkAccess chunkaccess = serverchunkcache.getChunk(x1, z1, chunkstatus.getParent(), true);
+                        ChunkAccess newChunkaccess;
+                        if (chunkaccess instanceof ImposterProtoChunk) {
+                            newChunkaccess = new ImposterProtoChunk(((ImposterProtoChunk)chunkaccess).getWrapped(), true);
+                        } else if (chunkaccess instanceof LevelChunk) {
+                            newChunkaccess = new ImposterProtoChunk((LevelChunk)chunkaccess, true);
+                        } else {
+                            newChunkaccess = chunkaccess;
+                        }
+                        list.add(newChunkaccess);
+                    }
+                }
+
+                completablefuture = completablefuture.thenComposeAsync((unit) -> chunkstatus.generate(processormailbox::tell, this.level, serverchunkcache.getGenerator(), this.level.getStructureManager(), serverchunkcache.getLightEngine(), (access) -> {
+                    throw new UnsupportedOperationException("Not creating full chunks here");
+                }, list).thenApply((either) -> {
+                    if (chunkstatus == ChunkStatus.NOISE) {
+                        either.left().ifPresent((access) -> Heightmap.primeHeightmaps(access, ChunkStatus.POST_FEATURES));
+                    }
+                    return Unit.INSTANCE;
+                }), processormailbox::tell);
+            }
+
+            this.level.getServer().managedBlock(completablefuture::isDone);
+        }
+
+        // fire blockChanged events
+        if (serverchunkcache.getChunk(x, z, false) != null) {
+            for(BlockPos blockpos1 : BlockPos.betweenClosed(chunkPos.getMinBlockX(), this.level.getMinBuildHeight(), chunkPos.getMinBlockZ(), chunkPos.getMaxBlockX(), this.level.getMaxBuildHeight() - 1, chunkPos.getMaxBlockZ())) {
+                serverchunkcache.blockChanged(blockpos1);
+            }
+        }
     }
 
     @Override