From 87b55e187c50a755dbf64bdbe66c676901e8182d Mon Sep 17 00:00:00 2001
From: Jonas Herzig <me@johni0702.de>
Date: Tue, 23 Feb 2021 01:32:29 +0100
Subject: [PATCH] Replace a few //#if statements with mapping file entries

---
 .../java/com/replaymod/render/RenderSettings.java     | 11 +----------
 .../replaymod/replay/mixin/MixinParticleManager.java  | 11 ++---------
 versions/1.14.4-forge/mapping.txt                     |  2 ++
 versions/1.8/mapping.txt                              |  1 +
 4 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/replaymod/render/RenderSettings.java b/src/main/java/com/replaymod/render/RenderSettings.java
index 511ef027..4117389d 100644
--- a/src/main/java/com/replaymod/render/RenderSettings.java
+++ b/src/main/java/com/replaymod/render/RenderSettings.java
@@ -5,6 +5,7 @@ import com.replaymod.core.versions.MCVer;
 import de.johni0702.minecraft.gui.utils.lwjgl.ReadableColor;
 import net.minecraft.client.resource.language.I18n;
 import net.minecraft.util.Util;
+import org.apache.maven.artifact.versioning.ComparableVersion;
 
 import java.io.File;
 import java.io.IOException;
@@ -19,16 +20,6 @@ import java.util.Optional;
 
 import static com.replaymod.render.ReplayModRender.LOGGER;
 
-//#if MC>=11400
-import org.apache.maven.artifact.versioning.ComparableVersion;
-//#else
-//#if MC>=10800
-//$$ import net.minecraftforge.fml.common.versioning.ComparableVersion;
-//#else
-//$$ import cpw.mods.fml.common.versioning.ComparableVersion;
-//#endif
-//#endif
-
 public class RenderSettings {
     public enum RenderMethod {
         DEFAULT, STEREOSCOPIC, CUBIC, EQUIRECTANGULAR, ODS, BLEND;
diff --git a/src/main/java/com/replaymod/replay/mixin/MixinParticleManager.java b/src/main/java/com/replaymod/replay/mixin/MixinParticleManager.java
index 4ce7a6e5..6e9b8649 100644
--- a/src/main/java/com/replaymod/replay/mixin/MixinParticleManager.java
+++ b/src/main/java/com/replaymod/replay/mixin/MixinParticleManager.java
@@ -3,6 +3,7 @@ package com.replaymod.replay.mixin;
 //#if MC>=10904
 import net.minecraft.client.particle.Particle;
 import net.minecraft.client.particle.ParticleManager;
+import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
@@ -19,12 +20,8 @@ import java.util.Queue;
 
 @Mixin(ParticleManager.class)
 public abstract class MixinParticleManager {
-    @Shadow
-    //#if MC>=11400
+    @Final @Shadow
     private Queue<Particle> newParticles;
-    //#else
-    //$$ private Queue<Particle> queueEntityFX;
-    //#endif
 
     /**
      * This method additionally clears the queue of particles to be added when the world is changed.
@@ -42,11 +39,7 @@ public abstract class MixinParticleManager {
             //$$ World world,
             //#endif
             CallbackInfo ci) {
-        //#if MC>=11400
         this.newParticles.clear();
-        //#else
-        //$$ this.queueEntityFX.clear();
-        //#endif
     }
 }
 //#endif
diff --git a/versions/1.14.4-forge/mapping.txt b/versions/1.14.4-forge/mapping.txt
index 029bf807..09a126b7 100644
--- a/versions/1.14.4-forge/mapping.txt
+++ b/versions/1.14.4-forge/mapping.txt
@@ -12,6 +12,8 @@ net.minecraft.crash.ReportedException net.minecraft.util.ReportedException
 net.minecraftforge.eventbus.api.IEventBus net.minecraftforge.fml.common.eventhandler.EventBus
 net.minecraft.network.play.server.SPacketEntity.Move net.minecraft.network.play.server.SPacketEntity.S17PacketEntityLookMove
 net.minecraftforge.fml.network.NetworkRegistry net.minecraftforge.fml.common.network.NetworkRegistry
+net.minecraft.client.particle.ParticleManager queue queueEntityFX
+org.apache.maven.artifact.versioning.ComparableVersion net.minecraftforge.fml.common.versioning.ComparableVersion
 
 net.minecraft.resources.FolderPack getInputStream() getInputStreamByName()
 net.minecraft.client.gui.GuiYesNoCallback confirmResult() confirmClicked()
diff --git a/versions/1.8/mapping.txt b/versions/1.8/mapping.txt
index 3712d8e0..c5cece6f 100644
--- a/versions/1.8/mapping.txt
+++ b/versions/1.8/mapping.txt
@@ -31,6 +31,7 @@ net.minecraftforge.fml.common.network.handshake.FMLHandshakeMessage.RegistryData
 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.minecraftforge.fml.common.versioning.ComparableVersion cpw.mods.fml.common.versioning.ComparableVersion
 net.minecraft.client.renderer.tileentity.TileEntityEndPortalRenderer net.minecraft.client.renderer.tileentity.RenderEndPortal
 net.minecraft.network.play.server.S3FPacketCustomPayload getChannelName() func_149169_c()
 net.minecraft.network.play.server.S01PacketJoinGame getEntityId() func_149197_c()