Merge pull request #1003 from CocoTheOwner/better-pregen-pred

Predict the ETA for pregeneration more rapidly

.github/ISSUE_TEMPLATE/bug.yml

@@ -40,6 +40,9 @@ body:
         - 1.17.1
         - 1.18
         - 1.19
+        - 1.20
+        - 1.21
+        - 1.22
     validations:
       required: true
   - type: input

build.gradle

@@ -24,7 +24,7 @@ plugins {
     id "de.undercouch.download" version "5.0.1"
 }
 
-version '2.7.1-1.20.1'
+version '2.7.3-1.20.1'
 def nmsVersion = '1.20.1' //[NMS]
 def apiVersion = '1.20'
 def specialSourceVersion = '1.11.0' //[NMS]
@@ -83,6 +83,7 @@ repositories {
     maven { url "https://mvn.lumine.io/repository/maven/" }
     maven { url "https://repo.triumphteam.dev/snapshots" }
     maven { url "https://repo.mineinabyss.com/releases" }
+    maven { url = 'https://hub.jeff-media.com/nexus/repository/jeff-media-public/' }
 }
 
 /**
@@ -133,7 +134,8 @@ dependencies {
     implementation 'org.bukkit:craftbukkit:1.20.1-R0.1-SNAPSHOT:remapped-mojang' //[NMS]
 
     // Third Party Integrations
-    implementation 'com.github.oraxen:oraxen:1.152.5'
+    implementation 'com.ticxo.playeranimator:PlayerAnimator:R1.2.7'
+    implementation 'com.github.oraxen:oraxen:1.158.0'
     implementation 'com.github.LoneDev6:api-itemsadder:3.4.1-r4'
     implementation 'me.clip:placeholderapi:2.11.3'
     //implementation files('libs/CustomItems.jar')

src/main/java/com/volmit/iris/Iris.java

@@ -91,7 +91,7 @@ import java.util.Map;
 
 @SuppressWarnings("CanBeFinal")
 public class Iris extends VolmitPlugin implements Listener {
-    public static final String OVERWORLD_TAG = "3003";
+    public static final String OVERWORLD_TAG = "3005";
 
     private static final Queue<Runnable> syncJobs = new ShurikenQueue<>();
 

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

@@ -50,7 +50,7 @@ public class CommandPregen implements DecreeExecutor {
             int w = (radius >> 9 + 1) * 2;
             IrisToolbelt.pregenerate(PregenTask
                     .builder()
-                    .center(new Position2(center))
+                    .center(new Position2(center.getBlockX() >> 9, center.getBlockZ() >> 9))
                     .width(w)
                     .height(w)
                     .build(), world);

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

@@ -111,8 +111,12 @@ public class IrisPregenerator {
     }
 
     private long computeETA() {
-        return (long) ((totalChunks.get() - generated.get()) *
-                ((double) (M.ms() - startTime.get()) / (double) generated.get()));
+        return (long) (totalChunks.get() > 1024 ? // Generated chunks exceed 1/8th of total?
+                // If yes, use smooth function (which gets more accurate over time since its less sensitive to outliers)
+                ((totalChunks.get() - generated.get()) * ((double) (M.ms() - startTime.get()) / (double) generated.get())) :
+                // If no, use quick function (which is less accurate over time but responds better to the initial delay)
+                ((totalChunks.get() - generated.get()) / chunksPerSecond.getAverage()) * 1000 //
+        );
     }
 
     public void close() {