Remove some more preprocessor statements in favor of remap

2019-05-28 11:25:46 +02:00
parent f3acf8cde7
commit d89655e69a
18 changed files with 137 additions and 254 deletions
--- a/src/main/java/com/replaymod/core/ReplayMod.java
+++ b/src/main/java/com/replaymod/core/ReplayMod.java
@@ -1,7 +1,6 @@
 package com.replaymod.core;

 import com.google.common.io.Files;
-import com.google.common.util.concurrent.ListenableFutureTask;
 import com.replaymod.compat.ReplayModCompat;
 import com.replaymod.core.gui.GuiBackgroundProcesses;
 import com.replaymod.core.gui.GuiReplaySettings;
@@ -30,7 +29,6 @@ import org.apache.commons.io.FileUtils;

 //#if MC>=11400
 import com.github.steveice10.mc.protocol.MinecraftConstants;
-import com.replaymod.core.versions.LangResourcePack;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.SharedConstants;
@@ -39,11 +37,12 @@ import net.minecraft.resource.DirectoryResourcePack;
 import net.minecraft.resource.ResourcePackCreator;
 import net.minecraft.resource.ResourcePackContainer;
 //#else
+//$$ import com.google.common.util.concurrent.ListenableFutureTask;
+//$$ import net.minecraft.resources.FolderPack;
 //$$ import net.minecraftforge.eventbus.api.SubscribeEvent;
 //$$
 //#if MC>=11300
 //$$ import com.replaymod.core.versions.LangResourcePack;
-//$$ import net.minecraft.resources.FolderPack;
 //$$ import net.minecraft.resources.IPackFinder;
 //$$ import net.minecraft.resources.ResourcePackInfo;
 //$$ import net.minecraftforge.fml.DeferredWorkQueue;
@@ -52,7 +51,6 @@ import net.minecraft.resource.ResourcePackContainer;
 //$$ import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 //$$ import net.minecraftforge.versions.mcp.MCPVersion;
 //#else
-//$$ import net.minecraft.client.resources.FolderResourcePack;
 //$$ import net.minecraft.client.resources.IResourcePack;
 //$$ import net.minecraftforge.common.config.Configuration;
 //#endif
@@ -232,21 +230,11 @@ public class ReplayMod implements
        //$$ //noinspection ConstantConditions
        //$$ if (false) {
        //#endif
-        @SuppressWarnings("unchecked")
-        //#if MC>=11300
        DirectoryResourcePack jGuiResourcePack = new DirectoryResourcePack(new File("../jGui/src/main/resources")) {
            @Override
            protected InputStream openFile(String resourceName) throws IOException {
                try {
                    return super.openFile(resourceName);
-        //#else
-        //$$ List<IResourcePack> defaultResourcePacks = ((MinecraftAccessor) mc).getDefaultResourcePacks();
-        //$$ FolderResourcePack jGuiResourcePack = new FolderResourcePack(new File("../jGui/src/main/resources")) {
-        //$$     @Override
-        //$$     protected InputStream getInputStreamByName(String resourceName) throws IOException {
-        //$$         try {
-        //$$             return super.getInputStreamByName(resourceName);
-        //#endif
                } catch (IOException e) {
                    if ("pack.mcmeta".equals(resourceName)) {
                        //#if MC>=11400
@@ -269,6 +257,8 @@ public class ReplayMod implements
            }
        });
        //#else
+        //$$ @SuppressWarnings("unchecked")
+        //$$ List<IResourcePack> defaultResourcePacks = ((MinecraftAccessor) mc).getDefaultResourcePacks();
        //$$ defaultResourcePacks.add(jGuiResourcePack);
        //#endif
        //#if MC<=10710
--- a/src/main/java/com/replaymod/core/utils/ModCompat.java
+++ b/src/main/java/com/replaymod/core/utils/ModCompat.java
@@ -12,25 +12,16 @@ import net.minecraft.util.registry.Registry;
 //$$ import net.minecraftforge.registries.ForgeRegistry;
 //$$ import net.minecraftforge.registries.RegistryManager;
 //#else
-//#if MC>=10800
 //$$ import net.minecraftforge.fml.common.registry.GameData;
-//#else
-//$$ import cpw.mods.fml.common.registry.GameData;
-//#endif
 //$$ import java.util.stream.Stream;
 //#endif
 //$$
-//#if MC>=10800
 //#if MC>=11300
 //$$ import net.minecraftforge.fml.ModList;
 //#else
 //$$ import net.minecraftforge.fml.common.Loader;
 //$$ import net.minecraftforge.fml.common.ModContainer;
 //#endif
-//#else
-//$$ import cpw.mods.fml.common.Loader;
-//$$ import cpw.mods.fml.common.ModContainer;
-//#endif
 //#endif

 import java.util.*;
--- a/src/main/java/com/replaymod/core/utils/Restrictions.java
+++ b/src/main/java/com/replaymod/core/utils/Restrictions.java
@@ -1,11 +1,9 @@
 package com.replaymod.core.utils;

+import net.minecraft.client.network.packet.CustomPayloadS2CPacket;
 import net.minecraft.util.PacketByteBuf;
 //#if MC>=10904
-import net.minecraft.client.network.packet.CustomPayloadS2CPacket;
 import net.minecraft.util.Identifier;
-//#else
-//$$ import net.minecraft.network.play.server.S3FPacketCustomPayload;
 //#endif

 //#if MC<=10710
@@ -29,11 +27,7 @@ public class Restrictions {
    private boolean onlyFirstPerson;
    private boolean onlyRecordingPlayer;

-    //#if MC>=10904
    public String handle(CustomPayloadS2CPacket packet) {
-    //#else
-    //$$ public String handle(S3FPacketCustomPayload packet) {
-    //#endif
        //#if MC>=10800
        PacketByteBuf buffer = packet.getData();
        //#else
--- a/src/main/java/com/replaymod/core/versions/MCVer.java
+++ b/src/main/java/com/replaymod/core/versions/MCVer.java
@@ -10,7 +10,6 @@ import net.minecraft.client.render.Tessellator;
 import net.minecraft.client.render.entity.EntityRenderDispatcher;
 import net.minecraft.client.model.Box;
 import net.minecraft.client.model.Cuboid;
-import net.minecraft.client.texture.SpriteAtlasTexture;
 import net.minecraft.util.crash.CrashReportSection;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.PlayerEntity;
@@ -68,7 +67,6 @@ import net.minecraft.client.render.BufferBuilder;
 import com.mojang.blaze3d.platform.GlStateManager;
 import net.minecraft.client.render.VertexFormat;
 import net.minecraft.client.render.VertexFormatElement;
-import net.minecraft.world.level.LevelGeneratorType;
 //#else
 //$$ import com.replaymod.core.mixin.ResourcePackRepositoryAccessor;
 //$$ import com.google.common.util.concurrent.Futures;
@@ -209,11 +207,8 @@ public class MCVer {
    //#endif

    public static String readString(PacketByteBuf buffer, int max) {
-        //#if MC>=11102
-        return buffer.readString(max);
-        //#else
        //#if MC>=10800
-        //$$ return buffer.readStringFromBuffer(max);
+        return buffer.readString(max);
        //#else
        //$$ try {
        //$$     return buffer.readStringFromBuffer(max);
@@ -221,7 +216,6 @@ public class MCVer {
        //$$     throw new DecoderException(e);
        //$$ }
        //#endif
-        //#endif
    }

    //#if MC<11400
@@ -234,15 +228,6 @@ public class MCVer {
    //$$ }
    //#endif

-    //#if MC>=10800
-    public static LevelGeneratorType WorldType_DEBUG_ALL_BLOCK_STATES
-            //#if MC>=11200
-            = LevelGeneratorType.DEBUG_ALL_BLOCK_STATES;
-            //#else
-            //$$ = WorldType.DEBUG_WORLD;
-            //#endif
-    //#endif
-
    //#if MC>=10800
    public static Entity getRenderViewEntity(MinecraftClient mc) {
        return mc.getCameraEntity();
@@ -263,13 +248,6 @@ public class MCVer {
    //$$ }
    //#endif

-    public static Identifier LOCATION_BLOCKS_TEXTURE
-            //#if MC>=10904
-            = SpriteAtlasTexture.BLOCK_ATLAS_TEX;
-            //#else
-            //$$ = TextureMap.locationBlocksTexture;
-            //#endif
-
    public static Entity getRiddenEntity(Entity ridden) {
        //#if MC>=10904
        return ridden.getVehicle();
@@ -342,15 +320,8 @@ public class MCVer {
        return getMinecraft().getResourcePackDownloader().loadServerPack(file);
        //#else
        //$$ ResourcePackRepository repo = getMinecraft().getResourcePackRepository();
-        //#if MC>=10809
-        //#if MC>=11200
-        //$$ return repo.setServerResourcePack(file);
-        //#else
-        //$$ return repo.setResourcePackInstance(file);
-        //#endif
-        //#else
        //#if MC>=10800
-        //$$ return repo.func_177319_a(file);
+        //$$ return repo.setServerResourcePack(file);
        //#else
        //$$ ResourcePackRepositoryAccessor acc = (ResourcePackRepositoryAccessor) repo;
        //$$ acc.setActive(false);
@@ -359,7 +330,6 @@ public class MCVer {
        //$$ return Futures.immediateFuture(null);
        //#endif
        //#endif
-        //#endif
    }

    public static <T> void addCallback(
@@ -391,91 +361,70 @@ public class MCVer {
        //#endif
    }

+    //#if MC>=10800
+    public static BufferBuilder Tessellator_getBufferBuilder() {
+        return Tessellator.getInstance().getBufferBuilder();
+    }
+    //#else
+    //$$ public static Tessellator Tessellator_getBufferBuilder() {
+    //$$     return Tessellator.instance;
+    //$$ }
+    //#endif
+
    public static void BufferBuilder_setTranslation(double x, double y, double z) {
-        //#if MC>=10800
-        Tessellator.getInstance().getBufferBuilder().setOffset(x, y, z);
-        //#else
-        //$$ Tessellator.instance.setTranslation(x, y, z);
-        //#endif
+        Tessellator_getBufferBuilder().setOffset(x, y, z);
    }

    public static void BufferBuilder_beginPosCol(int mode) {
-        //#if MC>=10800
-        BufferBuilder bufferBuilder = Tessellator.getInstance().getBufferBuilder();
-        //#if MC>=10809
-        bufferBuilder.begin(mode, VertexFormats.POSITION_COLOR);
-        //#else
-        //$$ bufferBuilder.startDrawing(mode);
-        //#endif
-        //#else
-        //$$ Tessellator.instance.startDrawing(mode);
-        //#endif
+        Tessellator_getBufferBuilder().begin(
+                mode
+                //#if MC>=10809
+                , VertexFormats.POSITION_COLOR
+                //#endif
+        );
    }

    public static void BufferBuilder_addPosCol(double x, double y, double z, int r, int g, int b, int a) {
-        //#if MC>=10800
-        BufferBuilder worldRenderer = Tessellator.getInstance().getBufferBuilder();
-        //#else
-        //$$ Tessellator worldRenderer = Tessellator.instance;
-        //#endif
        //#if MC>=10809
-        worldRenderer.vertex(x, y, z).color(r, g, b, a).next();
+        Tessellator_getBufferBuilder().vertex(x, y, z).color(r, g, b, a).next();
        //#else
-        //$$ worldRenderer.setColorRGBA(r, g, b, a);
-        //$$ worldRenderer.addVertex(x, y, z);
+        //$$ Tessellator_getBufferBuilder().setColorRGBA(r, g, b, a);
+        //$$ Tessellator_getBufferBuilder().addVertex(x, y, z);
        //#endif
    }

    public static void BufferBuilder_beginPosTex(int mode) {
-        //#if MC>=10800
-        BufferBuilder bufferBuilder = Tessellator.getInstance().getBufferBuilder();
-        //#if MC>=10809
-        bufferBuilder.begin(mode, VertexFormats.POSITION_UV);
-        //#else
-        //$$ bufferBuilder.startDrawing(mode);
-        //#endif
-        //#else
-        //$$ Tessellator.instance.startDrawing(mode);
-        //#endif
+        Tessellator_getBufferBuilder().begin(
+                mode
+                //#if MC>=10809
+                , VertexFormats.POSITION_UV
+                //#endif
+        );
    }

    public static void BufferBuilder_addPosTex(double x, double y, double z, double u, double v) {
-        //#if MC>=10800
-        BufferBuilder worldRenderer = Tessellator.getInstance().getBufferBuilder();
-        //#else
-        //$$ Tessellator worldRenderer = Tessellator.instance;
-        //#endif
        //#if MC>=10809
-        worldRenderer.vertex(x, y, z).texture(u, v).next();
+        Tessellator_getBufferBuilder().vertex(x, y, z).texture(u, v).next();
        //#else
-        //$$ worldRenderer.addVertexWithUV(x, y, z, u, v);
+        //$$ Tessellator_getBufferBuilder().addVertexWithUV(x, y, z, u, v);
        //#endif
    }

    public static void BufferBuilder_beginPosTexCol(int mode) {
-        //#if MC>=10800
-        BufferBuilder bufferBuilder = Tessellator.getInstance().getBufferBuilder();
-        //#if MC>=10809
-        bufferBuilder.begin(mode, VertexFormats.POSITION_UV_COLOR);
-        //#else
-        //$$ bufferBuilder.startDrawing(mode);
-        //#endif
-        //#else
-        //$$ Tessellator.instance.startDrawing(mode);
-        //#endif
+        Tessellator_getBufferBuilder().begin(
+                mode
+                //#if MC>=10809
+                , VertexFormats.POSITION_UV_COLOR
+                //#endif
+        );
    }

    public static void BufferBuilder_addPosTexCol(double x, double y, double z, double u, double v, int r, int g, int b, int a) {
-        //#if MC>=10800
-        BufferBuilder worldRenderer = Tessellator.getInstance().getBufferBuilder();
-        //#else
-        //$$ Tessellator worldRenderer = Tessellator.instance;
-        //#endif
        //#if MC>=10809
-        worldRenderer.vertex(x, y, z).texture(u, v).color(r, g, b, a).next();
+        Tessellator_getBufferBuilder().vertex(x, y, z).texture(u, v).color(r, g, b, a).next();
        //#else
-        //$$ worldRenderer.setColorRGBA(r, g, b, a);
-        //$$ worldRenderer.addVertexWithUV(x, y, z, u, v);
+        //$$ Tessellator_getBufferBuilder().setColorRGBA(r, g, b, a);
+        //$$ Tessellator_getBufferBuilder().addVertexWithUV(x, y, z, u, v);
        //#endif
    }

@@ -640,10 +589,8 @@ public class MCVer {
    //#if MC>=11300
    public static void color(float r, float g, float b, float a) { GlStateManager.color4f(r, g, b, a); }
    public static void enableAlpha() { GlStateManager.enableAlphaTest(); }
-    public static void disableAlpha() { GlStateManager.disableAlphaTest(); }
-    public static void tryBlendFuncSeparate(int l, int r, int vl, int vr) { GlStateManager.blendFuncSeparate(l, r, vl, vr); }
-    public static void colorLogicOp(int op) { GlStateManager.logicOp(op); }

+    @SuppressWarnings("unused")
    public static abstract class Keyboard {
        public static final int KEY_LCONTROL = GLFW.GLFW_KEY_LEFT_CONTROL;
        public static final int KEY_LSHIFT = GLFW.GLFW_KEY_LEFT_SHIFT;
--- a/src/main/java/com/replaymod/recording/handler/ConnectionEventHandler.java
+++ b/src/main/java/com/replaymod/recording/handler/ConnectionEventHandler.java
@@ -18,12 +18,12 @@ import net.minecraft.client.MinecraftClient;
 import net.minecraft.network.ClientConnection;
 import org.apache.logging.log4j.Logger;

-//#if MC>=10800
 //#if MC>=11300
 import net.minecraft.world.dimension.DimensionType;
 //#endif

-import static com.replaymod.core.versions.MCVer.WorldType_DEBUG_ALL_BLOCK_STATES;
+//#if MC>=10800
+import net.minecraft.world.level.LevelGeneratorType;
 //#endif

 import java.io.File;
@@ -61,9 +61,9 @@ public class ConnectionEventHandler {
            if (local) {
                //#if MC>=10800
                //#if MC>=11300
-                if (mc.getServer().getWorld(DimensionType.OVERWORLD).getGeneratorType() == WorldType_DEBUG_ALL_BLOCK_STATES) {
+                if (mc.getServer().getWorld(DimensionType.OVERWORLD).getGeneratorType() == LevelGeneratorType.DEBUG_ALL_BLOCK_STATES) {
                //#else
-                //$$ if (mc.getIntegratedServer().getEntityWorld().getWorldType() == WorldType_DEBUG_ALL_BLOCK_STATES) {
+                //$$ if (mc.getIntegratedServer().getEntityWorld().getWorldType() == WorldType.DEBUG_ALL_BLOCK_STATES) {
                //#endif
                    logger.info("Debug World recording is not supported.");
                    return;
--- a/src/main/java/com/replaymod/recording/handler/RecordingEventHandler.java
+++ b/src/main/java/com/replaymod/recording/handler/RecordingEventHandler.java
@@ -178,21 +178,18 @@ public class RecordingEventHandler extends EventRegistrations {
                byte newYaw = (byte) ((int) (player.yaw * 256.0F / 360.0F));
                byte newPitch = (byte) ((int) (player.pitch * 256.0F / 360.0F));

-                //#if MC>=10904
                packet = new EntityS2CPacket.RotateAndMoveRelative(
                        player.getEntityId(),
+                        //#if MC>=10904
                        (short) Math.round(dx * 4096), (short) Math.round(dy * 4096), (short) Math.round(dz * 4096),
-                        newYaw, newPitch, player.onGround
-                );
-                //#else
-                //$$ packet = new S14PacketEntity.S17PacketEntityLookMove(player.getEntityId(),
-                //$$         (byte) Math.round(dx * 32), (byte) Math.round(dy * 32), (byte) Math.round(dz * 32),
-                //$$         newYaw, newPitch
-                        //#if MC>=10800
-                        //$$ , player.onGround
+                        //#else
+                        //$$ (byte) Math.round(dx * 32), (byte) Math.round(dy * 32), (byte) Math.round(dz * 32),
                        //#endif
-                //$$ );
-                //#endif
+                        newYaw, newPitch
+                        //#if MC>=10800
+                        , player.onGround
+                        //#endif
+                );
            }

            packetListener.save(packet);
@@ -339,11 +336,7 @@ public class RecordingEventHandler extends EventRegistrations {
                lastActiveHand = player.getActiveHand();
                DataTracker dataManager = new DataTracker(null);
                int state = (wasHandActive ? 1 : 0) | (lastActiveHand == Hand.OFF_HAND ? 2 : 0);
-                //#if MC>=11300
                dataManager.startTracking(EntityLivingBaseAccessor.getLivingFlags(), (byte) state);
-                //#else
-                //$$ dataManager.register(EntityLivingBaseAccessor.getLivingFlags(), (byte) state);
-                //#endif
                packetListener.save(new EntityTrackerUpdateS2CPacket(player.getEntityId(), dataManager, true));
            }
            //#endif
--- a/src/main/java/com/replaymod/recording/packet/PacketListener.java
+++ b/src/main/java/com/replaymod/recording/packet/PacketListener.java
@@ -19,6 +19,7 @@ import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundHandlerAdapter;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.entity.Entity;
+import net.minecraft.entity.data.DataTracker;
 import net.minecraft.network.NetworkState;
 import net.minecraft.network.Packet;
 import net.minecraft.util.PacketByteBuf;
@@ -29,23 +30,17 @@ import org.apache.logging.log4j.Logger;

 //#if MC>=11300
 import net.minecraft.client.network.packet.LoginSuccessS2CPacket;
+//#else
+//$$ import net.minecraftforge.fml.common.network.internal.FMLProxyPacket;
 //#endif

 //#if MC>=10904
-import net.minecraft.entity.data.DataTracker;
 //#else
-//$$ import net.minecraft.entity.DataWatcher;
-//$$
 //$$ import java.util.List;
 //#endif

 //#if MC>=10800
 import net.minecraft.network.NetworkSide;
-//#if MC<11300
-//$$ import net.minecraftforge.fml.common.network.internal.FMLProxyPacket;
-//#endif
-//#else
-//$$ import cpw.mods.fml.common.network.internal.FMLProxyPacket;
 //#endif

 import java.io.DataOutputStream;
@@ -235,12 +230,7 @@ public class PacketListener extends ChannelInboundHandlerAdapter {
                            ((ItemPickupAnimationS2CPacket) packet).getEntityId() == mc.player.getEntityId()) {
                //#else
                //$$ if(packet instanceof S0DPacketCollectItem) {
-                //$$     if(mc.thePlayer != null ||
-                            //#if MC>=10809
-                            //$$ ((S0DPacketCollectItem) packet).getEntityID() == mc.thePlayer.getEntityId()) {
-                            //#else
-                            //$$ ((S0DPacketCollectItem) packet).func_149353_d() == mc.thePlayer.getEntityId()) {
-                            //#endif
+                //$$     if(mc.thePlayer != null || ((S0DPacketCollectItem) packet).getEntityID() == mc.thePlayer.getEntityId()) {
                //#endif
                        super.channelRead(ctx, msg);
                        return;
--- a/src/main/java/com/replaymod/recording/packet/ResourcePackRecorder.java
+++ b/src/main/java/com/replaymod/recording/packet/ResourcePackRecorder.java
@@ -149,11 +149,7 @@ public class ResourcePackRecorder {
                //$$ //noinspection Convert2Lambda
                //$$ mc.addScheduledTask(() -> mc.displayGuiScreen(new GuiYesNo(new GuiYesNoCallback() {
                //$$     @Override
-                    //#if MC>=11300
-                    //$$ public void confirmResult(boolean result, int id) {
-                    //#else
-                    //$$ public void confirmClicked(boolean result, int id) {
-                    //#endif
+                //$$     public void confirmResult(boolean result, int id) {
                //#endif
                        if (serverData != null) {
                            serverData.setResourcePackState(result ? ServerEntry.ResourcePackState.ENABLED : ServerEntry.ResourcePackState.DISABLED);
--- a/src/main/java/com/replaymod/render/blend/exporters/ChunkExporter.java
+++ b/src/main/java/com/replaymod/render/blend/exporters/ChunkExporter.java
@@ -11,6 +11,7 @@ import com.replaymod.render.blend.mixin.ContainerLocalRenderInformationAccessor;
 import com.replaymod.render.blend.mixin.WorldRendererAccessor;
 import de.johni0702.minecraft.gui.utils.lwjgl.vector.Vector3f;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.texture.SpriteAtlasTexture;
 import net.minecraft.client.util.GlAllocationUtils;
 import com.mojang.blaze3d.platform.GLX;
 import net.minecraft.client.render.chunk.ChunkRenderData;
@@ -37,8 +38,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

-import static com.replaymod.core.versions.MCVer.*;
-
 public class ChunkExporter implements Exporter {
    private final Map<BlockPos, DObject> chunkObjects = new HashMap<>();
    //#if MC>=10904
@@ -165,7 +164,7 @@ public class ChunkExporter implements Exporter {
        GL15.glGetBufferSubData(GLX.GL_ARRAY_BUFFER, 0, byteBuffer);
        vertexBuffer.unbind();

-        MCVer.getMinecraft().getTextureManager().bindTexture(LOCATION_BLOCKS_TEXTURE);
+        MCVer.getMinecraft().getTextureManager().bindTexture(SpriteAtlasTexture.BLOCK_ATLAS_TEX);

        return BlendMeshBuilder.addBufferToMesh(byteBuffer, GL11.GL_QUADS, VertexFormats.POSITION_COLOR_UV_LMAP, null, null);
    }
--- a/src/main/java/com/replaymod/replay/FullReplaySender.java
+++ b/src/main/java/com/replaymod/replay/FullReplaySender.java
@@ -103,8 +103,10 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend
            AdvancementUpdateS2CPacket.class,
            SelectAdvancementTabS2CPacket.class,
            //#endif
-            //#if MC>=10904
-            // TODO Update possibly more?
+            //#if MC>=10800
+            SetCameraEntityS2CPacket.class,
+            TitleS2CPacket.class,
+            //#endif
            HealthUpdateS2CPacket.class,
            GuiOpenS2CPacket.class,
            GuiCloseS2CPacket.class,
@@ -113,24 +115,7 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend
            SignEditorOpenS2CPacket.class,
            StatisticsS2CPacket.class,
            ExperienceBarUpdateS2CPacket.class,
-            SetCameraEntityS2CPacket.class,
-            PlayerAbilitiesS2CPacket.class,
-            TitleS2CPacket.class
-            //#else
-            //#if MC>=10800
-            //$$ S43PacketCamera.class,
-            //$$ S45PacketTitle.class,
-            //#endif
-            //$$ S06PacketUpdateHealth.class,
-            //$$ S2DPacketOpenWindow.class,
-            //$$ S2EPacketCloseWindow.class,
-            //$$ S2FPacketSetSlot.class,
-            //$$ S30PacketWindowItems.class,
-            //$$ S36PacketSignEditorOpen.class,
-            //$$ S37PacketStatistics.class,
-            //$$ S1FPacketSetExperience.class,
-            //$$ S39PacketPlayerAbilities.class
-            //#endif
+            PlayerAbilitiesS2CPacket.class
    );

    private static int TP_DISTANCE_LIMIT = 128;
@@ -342,11 +327,7 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend
            if (mc.world != null) {
                for (PlayerEntity playerEntity : playerEntities(mc.world)) {
                    if (!playerEntity.field_6016 && playerEntity instanceof OtherClientPlayerEntity) {
-                    //#if MC>=11300
-                    playerEntity.tickMovement();
-                    //#else
-                    //$$ playerEntity.onLivingUpdate();
-                    //#endif
+                        playerEntity.tickMovement();
                    }
                }
            }
@@ -644,13 +625,8 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend
            //#endif

            if(cent != null) {
-                //#if MC>=10809
                if(!allowMovement && !((Math.abs(cent.x - ppl.getX()) > TP_DISTANCE_LIMIT) ||
                        (Math.abs(cent.z - ppl.getZ()) > TP_DISTANCE_LIMIT))) {
-                //#else
-                //$$ if(!allowMovement && !((Math.abs(cent.posX - ppl.func_148932_c()) > TP_DISTANCE_LIMIT) ||
-                //$$         (Math.abs(cent.posZ - ppl.func_148933_e()) > TP_DISTANCE_LIMIT))) {
-                //#endif
                    return null;
                } else {
                    allowMovement = false;
@@ -667,11 +643,7 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend
                    }

                    CameraEntity cent = replayHandler.getCameraEntity();
-                    //#if MC>=10809
                    cent.setCameraPosition(ppl.getX(), ppl.getY(), ppl.getZ());
-                    //#else
-                    //$$ cent.setCameraPosition(ppl.func_148932_c(), ppl.func_148928_d(), ppl.func_148933_e());
-                    //#endif
                }
            }.run();
        }
@@ -1025,17 +997,10 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend
            int x = packet.getX();
            int z = packet.getZ();
        //#else
-        //#if MC>=10809
        //$$ if (p instanceof S21PacketChunkData && ((S21PacketChunkData) p).getExtractedSize() == 0) {
        //$$     S21PacketChunkData packet = (S21PacketChunkData) p;
        //$$     int x = packet.getChunkX();
        //$$     int z = packet.getChunkZ();
-        //#else
-        //$$ if (p instanceof S21PacketChunkData && ((S21PacketChunkData) p).func_149276_g() == 0) {
-        //$$     S21PacketChunkData packet = (S21PacketChunkData) p;
-        //$$     int x = packet.func_149273_e();
-        //$$     int z = packet.func_149271_f();
-        //#endif
        //#endif
            // If the chunk is getting unloaded, we will have to forcefully update the position of all entities
            // within. Otherwise, if there wasn't a game tick recently, there may be entities that have moved
--- a/src/main/java/com/replaymod/replay/camera/CameraEntity.java
+++ b/src/main/java/com/replaymod/replay/camera/CameraEntity.java
@@ -19,6 +19,7 @@ import net.minecraft.entity.Entity;
 import net.minecraft.entity.mob.MobEntity;
 import net.minecraft.entity.decoration.ItemFrameEntity;
 import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.stat.StatHandler;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.BoundingBox;

@@ -28,7 +29,6 @@ import com.replaymod.core.events.PreRenderCallback;
 import com.replaymod.core.events.PreRenderHandCallback;
 import com.replaymod.replay.events.RenderSpectatorCrosshairCallback;
 import de.johni0702.minecraft.gui.versions.callbacks.PreTickCallback;
-import net.fabricmc.fabric.api.util.TriState;
 import net.minecraft.client.world.ClientWorld;
 import net.minecraft.fluid.Fluid;
 import net.minecraft.tag.Tag;
@@ -65,10 +65,7 @@ import net.minecraft.client.recipe.book.ClientRecipeBook;
 //$$ import net.minecraft.stats.RecipeBook;
 //#endif
 //#endif
-import net.minecraft.stat.StatHandler;
 import net.minecraft.util.Hand;
-//#else
-//$$ import net.minecraft.stats.StatFileWriter;
 //#endif

 //#if MC>=10800
@@ -120,32 +117,37 @@ public class CameraEntity
     */
    private final EventHandler eventHandler = new EventHandler();

-    //#if MC>=11300
-    //#if MC>=11400
-    public CameraEntity(MinecraftClient mcIn, ClientWorld worldIn, ClientPlayNetworkHandler netHandlerPlayClient, StatHandler statisticsManager, ClientRecipeBook recipeBookClient) {
-    //#else
-    //$$ public CameraEntity(Minecraft mcIn, World worldIn, NetHandlerPlayClient netHandlerPlayClient, StatisticsManager statisticsManager, RecipeBookClient recipeBookClient) {
-    //#endif
-        super(mcIn, worldIn, netHandlerPlayClient, statisticsManager, recipeBookClient);
-    //#else
-    //#if MC>=11200
-    //$$ public CameraEntity(Minecraft mcIn, World worldIn, NetHandlerPlayClient netHandlerPlayClient, StatisticsManager statisticsManager, RecipeBook recipeBook) {
-    //$$     super(mcIn, worldIn, netHandlerPlayClient, statisticsManager, recipeBook);
-    //#else
-    //#if MC>=10904
-    //$$ public CameraEntity(Minecraft mcIn, World worldIn, NetHandlerPlayClient netHandlerPlayClient, StatisticsManager statisticsManager) {
-    //$$     super(mcIn, worldIn, netHandlerPlayClient, statisticsManager);
-    //#else
-    //#if MC>=10800
-    //$$ public CameraEntity(Minecraft mcIn, World worldIn, NetHandlerPlayClient netHandlerPlayClient, StatFileWriter statFileWriter) {
-    //$$     super(mcIn, worldIn, netHandlerPlayClient, statFileWriter);
-    //#else
-    //$$ public CameraEntity(Minecraft mcIn, World worldIn, Session session, NetHandlerPlayClient netHandlerPlayClient, StatFileWriter statFileWriter) {
-    //$$     super(mcIn, worldIn, session, netHandlerPlayClient, statFileWriter);
-    //#endif
-    //#endif
-    //#endif
-    //#endif
+    public CameraEntity(
+            MinecraftClient mcIn,
+            //#if MC>=11400
+            ClientWorld worldIn,
+            //#else
+            //$$ World worldIn,
+            //#endif
+            //#if MC<10800
+            //$$ Session session,
+            //#endif
+            ClientPlayNetworkHandler netHandlerPlayClient,
+            StatHandler statisticsManager
+            //#if MC>=11200
+            //#if MC>=11300
+            , ClientRecipeBook recipeBook
+            //#else
+            //$$ , RecipeBook recipeBook
+            //#endif
+            //#endif
+    ) {
+        super(mcIn,
+                worldIn,
+                //#if MC<10800
+                //$$ session,
+                //#endif
+                netHandlerPlayClient,
+                statisticsManager
+                //#if MC>=11200
+                , recipeBook
+                //#endif
+        );
        eventHandler.register();
        if (ReplayModReplay.instance.getReplayHandler().getSpectatedUUID() == null) {
            cameraController = ReplayModReplay.instance.createCameraController(this);
@@ -231,12 +233,8 @@ public class CameraEntity
        float height = getHeight();
        //#endif
        //#if MC>=10800
-        //#if MC>=11300
        setBoundingBox(new BoundingBox(
        //#else
-        //$$ setEntityBoundingBox(new AxisAlignedBB(
-        //#endif
-        //#else
        //$$ this.boundingBox.setBB(AxisAlignedBB.getBoundingBox(
        //#endif
                this.x - width / 2, this.y, this.z - width / 2,
@@ -244,11 +242,7 @@ public class CameraEntity
    }

    @Override
-    //#if MC>=11300
    public void tick() {
-    //#else
-    //$$ public void onUpdate() {
-    //#endif
        //#if MC>=10800
        Entity view = getRenderViewEntity(this.client);
        //#else
@@ -527,13 +521,8 @@ public class CameraEntity
    //#endif

    @Override
-    //#if MC>=11300
    public void remove() {
        super.remove();
-    //#else
-    //$$ public void setDead() {
-    //$$     super.setDead();
-    //#endif
        eventHandler.unregister();
    }

--- a/src/main/java/com/replaymod/replay/camera/VanillaCameraController.java
+++ b/src/main/java/com/replaymod/replay/camera/VanillaCameraController.java
@@ -2,13 +2,8 @@ package com.replaymod.replay.camera;

 import de.johni0702.minecraft.gui.utils.lwjgl.vector.Vector3f;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.options.KeyBinding;
-
-//#if MC>=11300
 import net.minecraft.client.options.GameOptions;
-//#else
-//$$ import net.minecraft.client.settings.GameSettings;
-//#endif
+import net.minecraft.client.options.KeyBinding;

 /**
 * Camera controller performing vanilla creative-like camera movements.
--- a/versions/1.11.2/mapping.txt
+++ b/versions/1.11.2/mapping.txt
@@ -1,5 +1,7 @@
 net.minecraft.network.PacketBuffer readVarInt() readVarIntFromBuffer()
 net.minecraft.network.PacketBuffer writeVarInt() writeVarIntToBuffer()
+net.minecraft.network.PacketBuffer readString() readStringFromBuffer()
+net.minecraft.network.PacketBuffer writeString() writeStringToBuffer()
 net.minecraft.util.math.MathHelper floor() floor_double()
 net.minecraft.client.Minecraft player thePlayer
 net.minecraft.client.Minecraft world theWorld
--- a/versions/1.12/mapping.txt
+++ b/versions/1.12/mapping.txt
@@ -1,3 +1,4 @@
+net.minecraft.world.WorldType DEBUG_ALL_BLOCK_STATES DEBUG_WORLD
 net.minecraft.client.resources.ResourcePackRepository setServerResourcePack() setResourcePackInstance()
 net.minecraft.client.Minecraft fontRenderer fontRendererObj
 net.minecraft.client.renderer.BufferBuilder net.minecraft.client.renderer.VertexBuffer
--- a/versions/1.13.2/mapping.txt
+++ b/versions/1.13.2/mapping.txt
@@ -1,4 +1,8 @@
+net.minecraft.resources.FolderPack net.minecraft.client.resources.FolderResourcePack
+net.minecraft.resources.AbstractResourcePack getInputStream() getInputStreamByName()
+net.minecraft.client.gui.GuiYesNoCallback confirmResult() confirmClicked()
 net.minecraft.entity.EntityLivingBase LIVING_FLAGS HAND_STATES
+net.minecraft.entity.EntityLivingBase livingTick() onLivingUpdate()
 net.minecraft.client.resources.DownloadingPackFinder net.minecraft.client.resources.ResourcePackRepository
 net.minecraft.client.resources.DownloadingPackFinder func_195741_a() setServerResourcePack()
 net.minecraft.client.renderer.color.ItemColors getColor() getColorFromItemstack()
@@ -20,7 +24,10 @@ net.minecraft.client.Minecraft getInstance() getMinecraft()
 net.minecraft.client.Minecraft getPackFinder() getResourcePackRepository()
 net.minecraft.client.renderer.WorldRenderer net.minecraft.client.renderer.RenderGlobal
 net.minecraft.network.play.server.SPacketEntity.Move net.minecraft.network.play.server.SPacketEntity.S17PacketEntityLookMove
+net.minecraft.entity.Entity setBoundingBox() setEntityBoundingBox()
 net.minecraft.entity.Entity isPassenger() isRiding()
+net.minecraft.entity.Entity tick() onUpdate()
+net.minecraft.entity.Entity remove() setDead()
 net.minecraft.entity.Entity removed isDead
 net.minecraftforge.fml.network.NetworkRegistry net.minecraftforge.fml.common.network.NetworkRegistry
 net.minecraft.client.renderer.ItemRenderer net.minecraft.client.renderer.RenderItem
--- a/versions/1.8.9/mapping.txt
+++ b/versions/1.8.9/mapping.txt
@@ -1,6 +1,14 @@
+net.minecraft.client.renderer.WorldRenderer begin() startDrawing()
 net.minecraft.util.Timer counter field_74285_i
 net.minecraft.client.resources.ResourcePackRepository downloadResourcePack() func_180601_a()
 net.minecraft.client.resources.ResourcePackRepository setResourcePackInstance() func_177319_a()
+net.minecraft.network.play.server.S0DPacketCollectItem getEntityID() func_149353_d()
+net.minecraft.network.play.server.S08PacketPlayerPosLook getX() func_148932_c()
+net.minecraft.network.play.server.S08PacketPlayerPosLook getY() func_148928_d()
+net.minecraft.network.play.server.S08PacketPlayerPosLook getZ() func_148933_e()
+net.minecraft.network.play.server.S21PacketChunkData getExtractedSize() func_149276_g()
+net.minecraft.network.play.server.S21PacketChunkData getChunkX() func_149273_e()
+net.minecraft.network.play.server.S21PacketChunkData getChunkZ() func_149271_f()
 net.minecraft.network.play.server.S38PacketPlayerListItem getAction() func_179768_b()
 net.minecraft.network.play.server.S38PacketPlayerListItem.AddPlayerData getProfile() func_179962_a()
 net.minecraft.network.play.server.S48PacketResourcePackSend getURL() func_179783_a()
--- a/versions/1.8/mapping.txt
+++ b/versions/1.8/mapping.txt
@@ -10,6 +10,7 @@ net.minecraftforge.fml.common.eventhandler.EventPriority cpw.mods.fml.common.eve
 net.minecraftforge.fml.common.eventhandler.Cancelable cpw.mods.fml.common.eventhandler.Cancelable
 net.minecraftforge.fml.common.eventhandler.Event cpw.mods.fml.common.eventhandler.Event
 net.minecraftforge.fml.client.registry.ClientRegistry cpw.mods.fml.client.registry.ClientRegistry
+net.minecraftforge.fml.common.registry.GameData cpw.mods.fml.common.registry.GameData
 net.minecraftforge.fml.common.gameevent.InputEvent cpw.mods.fml.common.gameevent.InputEvent
 net.minecraftforge.fml.common.gameevent.TickEvent cpw.mods.fml.common.gameevent.TickEvent
 net.minecraftforge.fml.relauncher.CoreModManager cpw.mods.fml.relauncher.CoreModManager
@@ -27,6 +28,7 @@ net.minecraftforge.fml.relauncher.Side cpw.mods.fml.relauncher.Side
 net.minecraftforge.fml.common.gameevent.PlayerEvent.ItemPickupEvent cpw.mods.fml.common.gameevent.PlayerEvent.ItemPickupEvent
 net.minecraftforge.fml.common.network.handshake.FMLHandshakeMessage cpw.mods.fml.common.network.handshake.FMLHandshakeMessage
 net.minecraftforge.fml.common.network.handshake.FMLHandshakeMessage.RegistryData cpw.mods.fml.common.network.handshake.FMLHandshakeMessage.ModIdData
+net.minecraftforge.fml.common.network.internal.FMLProxyPacket cpw.mods.fml.common.network.internal.FMLProxyPacket
 net.minecraftforge.fml.common.network.NetworkRegistry cpw.mods.fml.common.network.NetworkRegistry
 net.minecraftforge.fml.common.gameevent.InputEvent cpw.mods.fml.common.gameevent.InputEvent
 net.minecraft.client.renderer.tileentity.TileEntityEndPortalRenderer net.minecraft.client.renderer.tileentity.RenderEndPortal
--- a/versions/1.9.4/mapping.txt
+++ b/versions/1.9.4/mapping.txt
@@ -1,3 +1,5 @@
+net.minecraft.stats.StatisticsManager net.minecraft.stats.StatFileWriter
+net.minecraft.client.renderer.texture.TextureMap LOCATION_BLOCKS_TEXTURE locationBlocksTexture
 net.minecraft.init.MobEffects net.minecraft.potion.Potion
 net.minecraft.init.MobEffects INVISIBILITY invisibility
 net.minecraft.util.text.TextComponentString net.minecraft.util.ChatComponentText
@@ -40,6 +42,7 @@ net.minecraft.network.play.server.SPacketSpawnGlobalEntity net.minecraft.network
 net.minecraft.network.play.server.SPacketSpawnPainting net.minecraft.network.play.server.S10PacketSpawnPainting
 net.minecraft.network.play.server.SPacketSpawnExperienceOrb net.minecraft.network.play.server.S11PacketSpawnExperienceOrb
 net.minecraft.network.play.server.SPacketDestroyEntities net.minecraft.network.play.server.S13PacketDestroyEntities
+net.minecraft.network.play.server.SPacketEntity net.minecraft.network.play.server.S14PacketEntity
 net.minecraft.network.play.server.SPacketEntityTeleport net.minecraft.network.play.server.S18PacketEntityTeleport
 net.minecraft.network.play.server.SPacketEntityHeadLook net.minecraft.network.play.server.S19PacketEntityHeadLook
 net.minecraft.network.play.server.SPacketEntityVelocity net.minecraft.network.play.server.S12PacketEntityVelocity
@@ -52,4 +55,15 @@ net.minecraft.network.play.client.CPacketResourcePackStatus.Action net.minecraft
 net.minecraft.network.play.server.SPacketResourcePackSend net.minecraft.network.play.server.S48PacketResourcePackSend
 net.minecraft.network.play.server.SPacketCustomPayload net.minecraft.network.play.server.S3FPacketCustomPayload
 net.minecraft.network.play.server.SPacketDisconnect net.minecraft.network.play.server.S40PacketDisconnect
+net.minecraft.network.play.server.SPacketUpdateHealth net.minecraft.network.play.server.S06PacketUpdateHealth
+net.minecraft.network.play.server.SPacketSetSlot net.minecraft.network.play.server.S2FPacketSetSlot
+net.minecraft.network.play.server.SPacketSignEditorOpen net.minecraft.network.play.server.S36PacketSignEditorOpen
+net.minecraft.network.play.server.SPacketSetExperience net.minecraft.network.play.server.S1FPacketSetExperience
+net.minecraft.network.play.server.SPacketCamera net.minecraft.network.play.server.S43PacketCamera
+net.minecraft.network.play.server.SPacketTitle net.minecraft.network.play.server.S45PacketTitle
+net.minecraft.network.play.server.SPacketOpenWindow net.minecraft.network.play.server.S2DPacketOpenWindow
+net.minecraft.network.play.server.SPacketCloseWindow net.minecraft.network.play.server.S2EPacketCloseWindow
+net.minecraft.network.play.server.SPacketWindowItems net.minecraft.network.play.server.S30PacketWindowItems
+net.minecraft.network.play.server.SPacketStatistics net.minecraft.network.play.server.S37PacketStatistics
+net.minecraft.network.play.server.SPacketPlayerAbilities net.minecraft.network.play.server.S39PacketPlayerAbilities
 net.minecraft.network.login.server.SPacketLoginSuccess net.minecraft.network.login.server.S02PacketLoginSuccess