Angelica Compat + Cleanup

src/main/java/com/cardinalstar/cubicchunks/api/compat/CubicChunksVideoSettings.java

@@ -1,7 +1,7 @@
 package com.cardinalstar.cubicchunks.api.compat;
 
 import com.cardinalstar.cubicchunks.CubicChunksConfig;
-import com.cardinalstar.cubicchunks.modcompat.angelica.AngelicaInterop;
+import com.cardinalstar.cubicchunks.util.Mods;
 
 public class CubicChunksVideoSettings {
 
@@ -10,7 +10,7 @@ public static int getMinVerticalViewDistance() {
     }
 
     public static int getMaxVerticalViewDistance() {
-        return AngelicaInterop.hasDelegate() ? 64 : 32;
+        return Mods.Angelica.isModLoaded() ? 64 : 32;
     }
 
     public static int getVerticalViewDistance() {

src/main/java/com/cardinalstar/cubicchunks/event/handlers/ClientEventHandler.java

@@ -37,9 +37,9 @@
 import com.cardinalstar.cubicchunks.mixin.api.ICubicWorldInternal;
 import com.cardinalstar.cubicchunks.mixin.early.client.IGuiOptionsRowList;
 import com.cardinalstar.cubicchunks.mixin.early.client.IGuiVideoSettings;
-import com.cardinalstar.cubicchunks.modcompat.angelica.AngelicaInterop;
 import com.cardinalstar.cubicchunks.server.ICubicPlayerList;
 import com.cardinalstar.cubicchunks.util.MathUtil;
+import com.cardinalstar.cubicchunks.util.Mods;
 
 import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.common.FMLCommonHandler;
@@ -81,7 +81,7 @@ public void onServerTick(TickEvent.ServerTickEvent event) {
     public void initGuiEvent(InitGuiEvent.Post event) {
 
         GuiScreen currentGui = event.gui;
-        if (currentGui instanceof GuiVideoSettings && !AngelicaInterop.hasDelegate()) {
+        if (currentGui instanceof GuiVideoSettings && !Mods.Angelica.isModLoaded()) {
             GuiVideoSettings gvs = (GuiVideoSettings) currentGui;
             IGuiOptionsRowList gowl = (IGuiOptionsRowList) ((IGuiVideoSettings) gvs).getOptionsRowList();
             GuiOptionsRowList.Row row = this.createRow(100, gvs.width);

src/main/java/com/cardinalstar/cubicchunks/mixin/Mixins.java

@@ -76,12 +76,6 @@ public enum Mixins implements IMixins {
         .addCommonMixins("common.worldgen.MixinChunkProviderGenerate")
         .setPhase(Phase.EARLY)
         .setApplyIf(() -> true)),
-    MIXIN_EBS(new MixinBuilder("Add simple cache to ExtendedBlockStorage.getBlockByExtId")
-        .addCommonMixins("common.MixinExtendedBlockStorage")
-        .setPhase(Phase.EARLY)
-        .addExcludedMod(Mods.NotEnoughIDs)
-        .addExcludedMod(Mods.ChunkAPI)
-        .setApplyIf(() -> true)),
     ACCESSOR_S23(new MixinBuilder("Accessors for X/Y/Z fields for S23PacketBlockChange")
         .addCommonMixins("common.AccessorS23PacketBlockChange")
         .setPhase(Phase.EARLY)

src/main/java/com/cardinalstar/cubicchunks/network/PacketEncoderColumn.java

@@ -26,7 +26,6 @@
 import net.minecraft.world.chunk.Chunk;
 
 import com.cardinalstar.cubicchunks.client.CubeProviderClient;
-import com.cardinalstar.cubicchunks.modcompat.angelica.AngelicaInterop;
 import com.cardinalstar.cubicchunks.world.ICubicWorld;
 import com.github.bsideup.jabel.Desugar;
 
@@ -84,10 +83,5 @@ public void process(World world, PacketColumn packet) {
 
             WorldEncoder.decodeColumn(new CCPacketBuffer(buf), column);
         });
-
-        if (AngelicaInterop.hasDelegate()) {
-            AngelicaInterop.getDelegate()
-                .onColumnLoaded(packet.chunkX, packet.chunkZ);
-        }
     }
 }

src/main/java/com/cardinalstar/cubicchunks/network/PacketEncoderCube.java

@@ -31,7 +31,6 @@
 
 import com.cardinalstar.cubicchunks.CubicChunks;
 import com.cardinalstar.cubicchunks.client.CubeProviderClient;
-import com.cardinalstar.cubicchunks.modcompat.angelica.AngelicaInterop;
 import com.cardinalstar.cubicchunks.network.PacketEncoderCube.PacketCube;
 import com.cardinalstar.cubicchunks.util.CubePos;
 import com.cardinalstar.cubicchunks.util.CubeStatusVisualizer;
@@ -125,11 +124,6 @@ public void process(World world, PacketCube packet) {
 
         cube.markForRenderUpdate();
 
-        if (AngelicaInterop.hasDelegate()) {
-            AngelicaInterop.getDelegate()
-                .onCubeLoaded(cube.getX(), cube.getY(), cube.getZ());
-        }
-
         for (var tag : packet.tileEntityTags) {
             int blockX = tag.getInteger("x");
             int blockY = tag.getInteger("y");

src/main/java/com/cardinalstar/cubicchunks/network/PacketEncoderUnloadColumn.java

@@ -25,7 +25,6 @@
 import net.minecraft.world.World;
 
 import com.cardinalstar.cubicchunks.client.CubeProviderClient;
-import com.cardinalstar.cubicchunks.modcompat.angelica.AngelicaInterop;
 import com.cardinalstar.cubicchunks.world.ICubicWorld;
 import com.github.bsideup.jabel.Desugar;
 
@@ -69,10 +68,5 @@ public void process(World world, PacketUnloadColumn packet) {
         CubeProviderClient cubeCache = (CubeProviderClient) worldClient.getCubeCache();
 
         cubeCache.unloadChunk(packet.chunkX, packet.chunkZ);
-
-        if (AngelicaInterop.hasDelegate()) {
-            AngelicaInterop.getDelegate()
-                .onColumnUnloaded(packet.chunkX, packet.chunkZ);
-        }
     }
 }

src/main/java/com/cardinalstar/cubicchunks/network/PacketEncoderUnloadCube.java

@@ -25,7 +25,6 @@
 import net.minecraft.world.World;
 
 import com.cardinalstar.cubicchunks.client.CubeProviderClient;
-import com.cardinalstar.cubicchunks.modcompat.angelica.AngelicaInterop;
 import com.cardinalstar.cubicchunks.util.CubePos;
 import com.cardinalstar.cubicchunks.world.ICubicWorld;
 import com.github.bsideup.jabel.Desugar;
@@ -72,10 +71,5 @@ public void process(World world, PacketUnloadCube packet) {
         cubeCache.getCube(packet.pos)
             .markForRenderUpdate();
         cubeCache.unloadCube(packet.pos);
-
-        if (AngelicaInterop.hasDelegate()) {
-            AngelicaInterop.getDelegate()
-                .onCubeUnloaded(packet.pos.getX(), packet.pos.getY(), packet.pos.getZ());
-        }
     }
 }