Setup for 1.14.4-Fabric

[BoundingBoxOutlineReloaded.git] / src / main / java / com / irtimaled / bbor / client / providers / SpawnableBlocksProvider.java

diff --git a/src/main/java/com/irtimaled/bbor/client/providers/SpawnableBlocksProvider.java b/src/main/java/com/irtimaled/bbor/client/providers/SpawnableBlocksProvider.java
index 243cf48d752f74cf88889d27e312adc4e2cd56d2..b28b0e1a04029f51451bcdcd2e6270ab50c80fc2 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/client/providers/SpawnableBlocksProvider.java
+++ b/src/main/java/com/irtimaled/bbor/client/providers/SpawnableBlocksProvider.java
@@ -7,18 +7,20 @@ import com.irtimaled.bbor.client.interop.SpawnableBlocksHelper;
 import com.irtimaled.bbor.client.models.BoundingBoxSpawnableBlocks;
 import com.irtimaled.bbor.common.BoundingBoxType;
 import com.irtimaled.bbor.common.MathHelper;
-import net.minecraft.client.Minecraft;
+import com.irtimaled.bbor.common.models.DimensionId;
+import net.minecraft.client.MinecraftClient;
 
 import java.util.HashSet;
 import java.util.Set;
 
-public class SpawnableBlocksProvider implements IBoundingBoxProvider<BoundingBoxSpawnableBlocks> {
-    public static final Minecraft minecraft = Minecraft.getInstance();
+public class SpawnableBlocksProvider implements IBoundingBoxProvider<BoundingBoxSpawnableBlocks>, ICachingProvider {
+    public static final MinecraftClient minecraft = MinecraftClient.getInstance();
     private static Long lastGameTime = null;
 
     private static Set<BoundingBoxSpawnableBlocks> lastBoundingBox = null;
 
-    public static void clear() {
+    public void clearCache() {
+        lastGameTime = null;
         lastBoundingBox = null;
     }
 
@@ -29,14 +31,14 @@ public class SpawnableBlocksProvider implements IBoundingBoxProvider<BoundingBox
     }
 
     @Override
-    public boolean canProvide(int dimensionId) {
+    public boolean canProvide(DimensionId dimensionId) {
         return BoundingBoxTypeHelper.shouldRender(BoundingBoxType.SpawnableBlocks) &&
                 !isWithinActiveSpawningSphere();
     }
 
     @Override
-    public Iterable<BoundingBoxSpawnableBlocks> get(int dimensionId) {
-        long gameTime = minecraft.world.getGameTime();
+    public Iterable<BoundingBoxSpawnableBlocks> get(DimensionId dimensionId) {
+        long gameTime = minecraft.world.getTime();
         if (lastBoundingBox == null || (!((Long) gameTime).equals(lastGameTime) && gameTime % 2L == 0L)) {
             lastGameTime = gameTime;
             lastBoundingBox = getSpawnableBlocks();