diff --git a/src/main/java/com/cardinalstar/cubicchunks/api/compat/CubicChunksVideoSettings.java b/src/main/java/com/cardinalstar/cubicchunks/api/compat/CubicChunksVideoSettings.java index cd4231a6..6ba1538b 100644 --- a/src/main/java/com/cardinalstar/cubicchunks/api/compat/CubicChunksVideoSettings.java +++ b/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() { diff --git a/src/main/java/com/cardinalstar/cubicchunks/event/handlers/ClientEventHandler.java b/src/main/java/com/cardinalstar/cubicchunks/event/handlers/ClientEventHandler.java index 88ae8d62..ef2c43a3 100644 --- a/src/main/java/com/cardinalstar/cubicchunks/event/handlers/ClientEventHandler.java +++ b/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); diff --git a/src/main/java/com/cardinalstar/cubicchunks/mixin/Mixins.java b/src/main/java/com/cardinalstar/cubicchunks/mixin/Mixins.java index b199a590..1a601ab3 100644 --- a/src/main/java/com/cardinalstar/cubicchunks/mixin/Mixins.java +++ b/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) diff --git a/src/main/java/com/cardinalstar/cubicchunks/mixin/early/common/MixinExtendedBlockStorage.java b/src/main/java/com/cardinalstar/cubicchunks/mixin/early/common/MixinExtendedBlockStorage.java deleted file mode 100644 index 719c58d8..00000000 --- a/src/main/java/com/cardinalstar/cubicchunks/mixin/early/common/MixinExtendedBlockStorage.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.cardinalstar.cubicchunks.mixin.early.common; - -import net.minecraft.block.Block; -import net.minecraft.init.Blocks; -import net.minecraft.world.chunk.storage.ExtendedBlockStorage; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Unique; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Redirect; - -@Mixin(ExtendedBlockStorage.class) -public class MixinExtendedBlockStorage { - - @Unique - private Block prevBlock = Blocks.air; - @Unique - private int prevId = 0; - - @Redirect( - method = "getBlockByExtId", - at = @At(value = "INVOKE", target = "Lnet/minecraft/block/Block;getBlockById(I)Lnet/minecraft/block/Block;")) - public final Block optimizeGetBlock(int id) { - if (id == prevId) return prevBlock; - - prevId = id; - return prevBlock = Block.getBlockById(id); - } -} diff --git a/src/main/java/com/cardinalstar/cubicchunks/modcompat/angelica/AngelicaInterop.java b/src/main/java/com/cardinalstar/cubicchunks/modcompat/angelica/AngelicaInterop.java deleted file mode 100644 index 713d279f..00000000 --- a/src/main/java/com/cardinalstar/cubicchunks/modcompat/angelica/AngelicaInterop.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.cardinalstar.cubicchunks.modcompat.angelica; - -public class AngelicaInterop { - - private static IAngelicaDelegate delegate; - - public static boolean hasDelegate() { - return delegate != null; - } - - public static IAngelicaDelegate getDelegate() { - return delegate; - } - - public static void setDelegate(IAngelicaDelegate delegate) { - AngelicaInterop.delegate = delegate; - } -} diff --git a/src/main/java/com/cardinalstar/cubicchunks/modcompat/angelica/IAngelicaDelegate.java b/src/main/java/com/cardinalstar/cubicchunks/modcompat/angelica/IAngelicaDelegate.java deleted file mode 100644 index 44d85ce0..00000000 --- a/src/main/java/com/cardinalstar/cubicchunks/modcompat/angelica/IAngelicaDelegate.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.cardinalstar.cubicchunks.modcompat.angelica; - -public interface IAngelicaDelegate { - - void onColumnLoaded(int chunkX, int chunkZ); - - void onColumnUnloaded(int chunkX, int chunkZ); - - void onCubeLoaded(int cubeX, int cubeY, int cubeZ); - - void onCubeUnloaded(int cubeX, int cubeY, int cubeZ); - -} diff --git a/src/main/java/com/cardinalstar/cubicchunks/network/PacketEncoderColumn.java b/src/main/java/com/cardinalstar/cubicchunks/network/PacketEncoderColumn.java index b9ea141f..6bb040ee 100644 --- a/src/main/java/com/cardinalstar/cubicchunks/network/PacketEncoderColumn.java +++ b/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); - } } } diff --git a/src/main/java/com/cardinalstar/cubicchunks/network/PacketEncoderCube.java b/src/main/java/com/cardinalstar/cubicchunks/network/PacketEncoderCube.java index ae2dfb71..ea4677c9 100644 --- a/src/main/java/com/cardinalstar/cubicchunks/network/PacketEncoderCube.java +++ b/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"); diff --git a/src/main/java/com/cardinalstar/cubicchunks/network/PacketEncoderUnloadColumn.java b/src/main/java/com/cardinalstar/cubicchunks/network/PacketEncoderUnloadColumn.java index 7067d9f9..bff4414f 100644 --- a/src/main/java/com/cardinalstar/cubicchunks/network/PacketEncoderUnloadColumn.java +++ b/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); - } } } diff --git a/src/main/java/com/cardinalstar/cubicchunks/network/PacketEncoderUnloadCube.java b/src/main/java/com/cardinalstar/cubicchunks/network/PacketEncoderUnloadCube.java index 2aac913e..9e7bcf47 100644 --- a/src/main/java/com/cardinalstar/cubicchunks/network/PacketEncoderUnloadCube.java +++ b/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()); - } } }