Replace a few //#if statements with mapping file entries

This commit is contained in:
Jonas Herzig
2021-02-23 01:32:29 +01:00
parent 026bc1fdcb
commit 87b55e187c
4 changed files with 6 additions and 19 deletions

View File

@@ -5,6 +5,7 @@ import com.replaymod.core.versions.MCVer;
import de.johni0702.minecraft.gui.utils.lwjgl.ReadableColor; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableColor;
import net.minecraft.client.resource.language.I18n; import net.minecraft.client.resource.language.I18n;
import net.minecraft.util.Util; import net.minecraft.util.Util;
import org.apache.maven.artifact.versioning.ComparableVersion;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
@@ -19,16 +20,6 @@ import java.util.Optional;
import static com.replaymod.render.ReplayModRender.LOGGER; 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 class RenderSettings {
public enum RenderMethod { public enum RenderMethod {
DEFAULT, STEREOSCOPIC, CUBIC, EQUIRECTANGULAR, ODS, BLEND; DEFAULT, STEREOSCOPIC, CUBIC, EQUIRECTANGULAR, ODS, BLEND;

View File

@@ -3,6 +3,7 @@ package com.replaymod.replay.mixin;
//#if MC>=10904 //#if MC>=10904
import net.minecraft.client.particle.Particle; import net.minecraft.client.particle.Particle;
import net.minecraft.client.particle.ParticleManager; import net.minecraft.client.particle.ParticleManager;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
@@ -19,12 +20,8 @@ import java.util.Queue;
@Mixin(ParticleManager.class) @Mixin(ParticleManager.class)
public abstract class MixinParticleManager { public abstract class MixinParticleManager {
@Shadow @Final @Shadow
//#if MC>=11400
private Queue<Particle> newParticles; 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. * 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, //$$ World world,
//#endif //#endif
CallbackInfo ci) { CallbackInfo ci) {
//#if MC>=11400
this.newParticles.clear(); this.newParticles.clear();
//#else
//$$ this.queueEntityFX.clear();
//#endif
} }
} }
//#endif //#endif

View File

@@ -12,6 +12,8 @@ net.minecraft.crash.ReportedException net.minecraft.util.ReportedException
net.minecraftforge.eventbus.api.IEventBus net.minecraftforge.fml.common.eventhandler.EventBus 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.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.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.resources.FolderPack getInputStream() getInputStreamByName()
net.minecraft.client.gui.GuiYesNoCallback confirmResult() confirmClicked() net.minecraft.client.gui.GuiYesNoCallback confirmResult() confirmClicked()

View File

@@ -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.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.network.NetworkRegistry cpw.mods.fml.common.network.NetworkRegistry
net.minecraftforge.fml.common.gameevent.InputEvent cpw.mods.fml.common.gameevent.InputEvent 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.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.S3FPacketCustomPayload getChannelName() func_149169_c()
net.minecraft.network.play.server.S01PacketJoinGame getEntityId() func_149197_c() net.minecraft.network.play.server.S01PacketJoinGame getEntityId() func_149197_c()