Port to MC 1.19-pre3

src/main/java/com/replaymod/render/blend/BlendMeshBuilder.java

@@ -1,4 +1,4 @@
-//#if MC>=10800
+//#if MC>=10800 && MC<11900
 package com.replaymod.render.blend;
 
 import com.replaymod.render.blend.data.DMaterial;

src/main/java/com/replaymod/render/blend/BlendState.java

@@ -2,7 +2,7 @@ package com.replaymod.render.blend;
 
 import com.replaymod.render.blend.data.DScene;
 import com.replaymod.render.blend.data.Serializer;
-//#if MC>=10800
+//#if MC>=10800 && MC<11900
 // FIXME 1.15
 //#if MC<11500
 //$$ import com.replaymod.render.blend.exporters.ChunkExporter;
@@ -53,7 +53,7 @@ public class BlendState implements Exporter {
         this.blenderFile = BlenderFactory.newBlenderFile(file);
         this.factory = new BlenderFactory(blenderFile);
 
-        //#if MC>=10800
+        //#if MC>=10800 && MC<11900
         RenderState renderState = new RenderState(this);
         register(renderState);
         // FIXME 1.15

src/main/java/com/replaymod/render/blend/exporters/EntityExporter.java

@@ -1,4 +1,4 @@
-//#if MC>=10800
+//#if MC>=10800 && MC<11900
 package com.replaymod.render.blend.exporters;
 
 import com.replaymod.core.versions.MCVer;

src/main/java/com/replaymod/render/blend/exporters/ItemExporter.java

@@ -1,4 +1,4 @@
-//#if MC>=10800
+//#if MC>=10800 && MC<11900
 package com.replaymod.render.blend.exporters;
 
 import com.replaymod.render.blend.BlendMeshBuilder;

src/main/java/com/replaymod/render/blend/exporters/ModelRendererExporter.java

@@ -1,4 +1,4 @@
-//#if MC>=10800
+//#if MC>=10800 && MC<11900
 package com.replaymod.render.blend.exporters;
 
 import com.replaymod.render.blend.BlendMeshBuilder;

src/main/java/com/replaymod/render/blend/exporters/ParticlesExporter.java

@@ -1,4 +1,4 @@
-//#if MC>=10800
+//#if MC>=10800 && MC<11900
 package com.replaymod.render.blend.exporters;
 
 import com.replaymod.core.versions.MCVer;

src/main/java/com/replaymod/render/blend/exporters/RenderState.java

@@ -1,4 +1,4 @@
-//#if MC>=10800
+//#if MC>=10800 && MC<11900
 package com.replaymod.render.blend.exporters;
 
 import com.replaymod.render.blend.BlendState;

src/main/java/com/replaymod/render/blend/exporters/TileEntityExporter.java

@@ -1,4 +1,4 @@
-//#if MC>=10800
+//#if MC>=10800 && MC<11900
 package com.replaymod.render.blend.exporters;
 
 import com.replaymod.core.versions.MCVer;

src/main/java/com/replaymod/render/blend/mixin/MixinRenderGlobal.java

@@ -1,4 +1,4 @@
-//#if MC>=10800
+//#if MC>=10800 && MC<11900
 package com.replaymod.render.blend.mixin;
 
 import com.replaymod.render.blend.BlendState;

src/main/java/com/replaymod/render/blend/mixin/MixinRenderItem.java

@@ -1,4 +1,4 @@
-//#if MC>=10800
+//#if MC>=10800 && MC<11900
 package com.replaymod.render.blend.mixin;
 
 import com.replaymod.render.blend.BlendState;

src/main/java/com/replaymod/render/blend/mixin/MixinRenderLivingBase.java

@@ -1,4 +1,4 @@
-//#if MC>=10800
+//#if MC>=10800 && MC<11900
 package com.replaymod.render.blend.mixin;
 
 import com.replaymod.render.blend.BlendState;

src/main/java/com/replaymod/render/blend/mixin/MixinRenderManager.java

@@ -1,4 +1,4 @@
-//#if MC>=10800
+//#if MC>=10800 && MC<11900
 package com.replaymod.render.blend.mixin;
 
 import com.replaymod.render.blend.BlendState;

src/main/java/com/replaymod/render/mixin/MixinParticleManager.java

@@ -3,7 +3,6 @@ package com.replaymod.render.mixin;
 //#if MC>=10904
 import com.replaymod.core.versions.MCVer;
 import com.replaymod.render.blend.BlendState;
-import com.replaymod.render.blend.exporters.ParticlesExporter;
 import com.replaymod.render.hooks.EntityRendererHandler;
 import net.minecraft.client.particle.Particle;
 import net.minecraft.client.particle.ParticleManager;
@@ -12,6 +11,11 @@ import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 
+//#if MC>=11900
+//#else
+import com.replaymod.render.blend.exporters.ParticlesExporter;
+//#endif
+
 //#if MC>=11500
 import net.minecraft.client.render.VertexConsumer;
 import net.minecraft.util.math.Quaternion;
@@ -52,10 +56,12 @@ public abstract class MixinParticleManager {
     }
 
     private void buildGeometry(Particle particle, VertexConsumer vertexConsumer, Camera camera, float partialTicks) {
+        //#if MC<11900
         BlendState blendState = BlendState.getState();
         if (blendState != null) {
             blendState.get(ParticlesExporter.class).onRender(particle, partialTicks);
         }
+        //#endif
         particle.buildGeometry(vertexConsumer, camera, partialTicks);
     }
     //#else