Void world generator 1.17 variant

DenizenScript · Nov 24, 2021 · 3df81b2 · 3df81b2
1 parent 385cf8c
commit 3df81b2
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 3 deletions.
diff --git a/plugin/src/main/java/com/denizenscript/denizen/Denizen.java b/plugin/src/main/java/com/denizenscript/denizen/Denizen.java
@@ -39,6 +39,7 @@
 import com.denizenscript.denizen.npc.DenizenNPCHelper;
 import com.denizenscript.denizen.utilities.packets.NetworkInterceptHelper;
 import com.denizenscript.denizen.utilities.world.VoidGenerator;
+import com.denizenscript.denizen.utilities.world.VoidGenerator1_17;
 import com.denizenscript.denizencore.DenizenCore;
 import com.denizenscript.denizencore.events.OldEventManager;
 import com.denizenscript.denizencore.flags.MapTagBasedFlagTracker;
@@ -593,8 +594,13 @@ private boolean suggestClosestModifier(CommandSender sender, String command, Str
 
     @Override
     public ChunkGenerator getDefaultWorldGenerator(String worldName, String id) {
-        if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_16) && CoreUtilities.toLowerCase(id).equals("void")) {
-            return new VoidGenerator();
+        if (CoreUtilities.toLowerCase(id).equals("void")) {
+            if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_17)) {
+                return new VoidGenerator1_17();
+            }
+            else if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_16)) {
+                return new VoidGenerator();
+            }
         }
         return null;
     }

diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityDamagedScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityDamagedScriptEvent.java
@@ -31,8 +31,8 @@ public class EntityDamagedScriptEvent extends BukkitScriptEvent implements Liste
 
     // <--[event]
     // @Events
-    // <entity> damaged (by <'cause'>)
     // <entity> damaged by <entity>
+    // <entity> damaged (by <'cause'>)
     // <entity> damages <entity>
     //
     // @Group Entity

diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/world/VoidGenerator1_17.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/world/VoidGenerator1_17.java
@@ -0,0 +1,34 @@
+package com.denizenscript.denizen.utilities.world;
+
+import org.bukkit.block.Biome;
+import org.bukkit.generator.BiomeProvider;
+import org.bukkit.generator.ChunkGenerator;
+import org.bukkit.generator.WorldInfo;
+
+import java.util.Collections;
+import java.util.List;
+
+public class VoidGenerator1_17 extends ChunkGenerator {
+
+    public static class VoidBiomeProvider extends BiomeProvider {
+
+        public static List<Biome> biomes = Collections.singletonList(Biome.THE_VOID);
+
+        @Override
+        public Biome getBiome(WorldInfo worldInfo, int i, int i1, int i2) {
+            return Biome.THE_VOID;
+        }
+
+        @Override
+        public List<Biome> getBiomes(WorldInfo worldInfo) {
+            return biomes;
+        }
+    }
+
+    public static VoidBiomeProvider biomeProviderInstance = new VoidBiomeProvider();
+
+    @Override
+    public BiomeProvider getDefaultBiomeProvider(WorldInfo worldInfo) {
+        return biomeProviderInstance;
+    }
+}