fix: dumb mistake with PriorityQueue #27

--- Would you believe this was actually in an old stashed change... whoops Signed-off-by: AterAnimAvis <AterAnimAvis@gmail.com>
AterAnimAvis · May 1, 2021 · 616b5e4 · 616b5e4
1 parent 0610901
commit 616b5e4
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/common/src/main/java/com/unascribed/blockrenderer/render/IRequest.java b/common/src/main/java/com/unascribed/blockrenderer/render/IRequest.java
@@ -4,4 +4,8 @@ public interface IRequest {
 
     boolean render();
 
+    default int priority() {
+        return 0;
+    }
+
 }
diff --git a/...rc/main/java/com/unascribed/blockrenderer/fabric/client/render/manager/RenderManager.java b/...rc/main/java/com/unascribed/blockrenderer/fabric/client/render/manager/RenderManager.java
@@ -7,6 +7,7 @@
 import net.minecraft.util.text.TextFormatting;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Comparator;
 import java.util.PriorityQueue;
 import java.util.Queue;
 import java.util.function.Function;
@@ -23,7 +24,7 @@ public class RenderManager extends BaseRenderManager<ITextComponent> {
     public static final BaseRenderManager<ITextComponent> INSTANCE = new RenderManager();
 
     public static boolean isRendering = false;
-    public static Queue<IRequest> requests = new PriorityQueue<>();
+    public static Queue<IRequest> requests = new PriorityQueue<>(Comparator.comparingInt(IRequest::priority));
     @Nullable
     private static IRequest request = null;
 

diff --git a/...src/main/java/com/unascribed/blockrenderer/forge/client/render/manager/RenderManager.java b/...src/main/java/com/unascribed/blockrenderer/forge/client/render/manager/RenderManager.java
@@ -7,6 +7,7 @@
 import net.minecraft.util.text.TextFormatting;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Comparator;
 import java.util.PriorityQueue;
 import java.util.Queue;
 import java.util.function.Function;
@@ -23,7 +24,7 @@ public class RenderManager extends BaseRenderManager<ITextComponent> {
     public static final BaseRenderManager<ITextComponent> INSTANCE = new RenderManager();
 
     public static boolean isRendering = false;
-    public static Queue<IRequest> requests = new PriorityQueue<>();
+    public static Queue<IRequest> requests = new PriorityQueue<>(Comparator.comparingInt(IRequest::priority));
     @Nullable
     private static IRequest request = null;
 

diff --git a/gradle.properties b/gradle.properties
@@ -16,7 +16,7 @@ yarnBuild                 =9.mcp.snapshot.20201028.1.16.3
 
 ##################################### Mod #####################################
 modId                     =block_renderer
-modVersion                =1.5.2
+modVersion                =1.5.3
 modGroup                  =com.unascribed
 vendor                    =AterAnimAvis
 

diff --git a/patches/forge2fabric/client/render/manager/RenderManager.java.patch b/patches/forge2fabric/client/render/manager/RenderManager.java.patch
@@ -9,7 +9,7 @@
  import com.unascribed.blockrenderer.render.IRequest;
  import com.unascribed.blockrenderer.render.manager.BaseRenderManager;
  import net.minecraft.util.text.ITextComponent;
-@@ -11,7 +11,7 @@
+@@ -12,7 +12,7 @@
  import java.util.Queue;
  import java.util.function.Function;