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 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;

View File

@@ -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