From c48187e784c46dac475d73e5caca96cb4ed10f17 Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Mon, 11 Jun 2018 00:27:45 +0200 Subject: [PATCH] Disable .blend export for 1.7.10 --- .../java/com/replaymod/core/versions/MCVer.java | 6 ++++-- .../replaymod/render/blend/BlendMeshBuilder.java | 2 ++ .../com/replaymod/render/blend/BlendState.java | 4 ++++ .../com/replaymod/render/blend/data/DMesh.java | 14 ++++---------- .../render/blend/exporters/ChunkExporter.java | 2 ++ .../render/blend/exporters/EntityExporter.java | 2 ++ .../render/blend/exporters/ItemExporter.java | 2 ++ .../blend/exporters/ModelRendererExporter.java | 2 ++ .../render/blend/exporters/ParticlesExporter.java | 2 ++ .../render/blend/exporters/RenderState.java | 2 ++ .../render/blend/exporters/TileEntityExporter.java | 2 ++ .../render/blend/mixin/MixinChunkRenderWorker.java | 2 ++ .../render/blend/mixin/MixinEffectRenderer.java | 2 ++ .../render/blend/mixin/MixinModelRenderer.java | 2 ++ .../render/blend/mixin/MixinRenderGlobal.java | 2 ++ .../render/blend/mixin/MixinRenderItem.java | 2 ++ .../render/blend/mixin/MixinRenderManager.java | 2 ++ .../mixin/MixinTileEntityRendererDispatcher.java | 2 ++ .../replaymod/render/gui/GuiRenderSettings.java | 5 +++++ .../render/mixin/MixinEffectRenderer.java | 12 +++++++----- .../resources/mixins.render.blend.replaymod.json | 2 ++ 21 files changed, 56 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/replaymod/core/versions/MCVer.java b/src/main/java/com/replaymod/core/versions/MCVer.java index 32fd7c85..d5b05e7f 100644 --- a/src/main/java/com/replaymod/core/versions/MCVer.java +++ b/src/main/java/com/replaymod/core/versions/MCVer.java @@ -16,8 +16,6 @@ import net.minecraft.client.network.NetHandlerPlayClient; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.client.renderer.vertex.VertexFormat; -import net.minecraft.client.renderer.vertex.VertexFormatElement; import net.minecraft.client.resources.ResourcePackRepository; import net.minecraft.client.settings.KeyBinding; import net.minecraft.crash.CrashReportCategory; @@ -62,6 +60,8 @@ import net.minecraft.client.renderer.vertex.DefaultVertexFormats; //#if MC>=10800 import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.GlStateManager.BooleanState; +import net.minecraft.client.renderer.vertex.VertexFormat; +import net.minecraft.client.renderer.vertex.VertexFormatElement; import net.minecraft.world.WorldType; import net.minecraftforge.fml.common.eventhandler.EventBus; //#else @@ -533,6 +533,7 @@ public class MCVer { //#endif } + //#if MC>=10800 //#if MC>=10904 //#if MC>=11200 public static BufferBuilder getBuffer(Tessellator tessellator) { @@ -553,6 +554,7 @@ public class MCVer { public static List getElements(VertexFormat vertexFormat) { return vertexFormat.getElements(); } + //#endif public static Tessellator Tessellator_getInstance() { //#if MC>=10800 diff --git a/src/main/java/com/replaymod/render/blend/BlendMeshBuilder.java b/src/main/java/com/replaymod/render/blend/BlendMeshBuilder.java index 1a91e697..48fdd148 100644 --- a/src/main/java/com/replaymod/render/blend/BlendMeshBuilder.java +++ b/src/main/java/com/replaymod/render/blend/BlendMeshBuilder.java @@ -1,3 +1,4 @@ +//#if MC>=10800 package com.replaymod.render.blend; import com.replaymod.render.blend.data.DMaterial; @@ -263,3 +264,4 @@ public class BlendMeshBuilder return mesh; } } +//#endif diff --git a/src/main/java/com/replaymod/render/blend/BlendState.java b/src/main/java/com/replaymod/render/blend/BlendState.java index e84ab3ff..19133842 100644 --- a/src/main/java/com/replaymod/render/blend/BlendState.java +++ b/src/main/java/com/replaymod/render/blend/BlendState.java @@ -2,12 +2,14 @@ package com.replaymod.render.blend; import com.replaymod.render.blend.data.DScene; import com.replaymod.render.blend.data.Serializer; +//#if MC>=10800 import com.replaymod.render.blend.exporters.ChunkExporter; import com.replaymod.render.blend.exporters.EntityExporter; import com.replaymod.render.blend.exporters.ItemExporter; import com.replaymod.render.blend.exporters.ParticlesExporter; import com.replaymod.render.blend.exporters.RenderState; import com.replaymod.render.blend.exporters.TileEntityExporter; +//#endif import net.minecraft.crash.CrashReport; import net.minecraft.crash.CrashReportCategory; import net.minecraft.util.ReportedException; @@ -48,6 +50,7 @@ public class BlendState implements Exporter { this.blenderFile = BlenderFactory.newBlenderFile(file); this.factory = new BlenderFactory(blenderFile); + //#if MC>=10800 RenderState renderState = new RenderState(this); register(renderState); register(new ChunkExporter()); @@ -55,6 +58,7 @@ public class BlendState implements Exporter { register(new TileEntityExporter(renderState)); register(new ParticlesExporter(renderState)); register(new ItemExporter(renderState)); + //#endif } public void register(Exporter exporter) { diff --git a/src/main/java/com/replaymod/render/blend/data/DMesh.java b/src/main/java/com/replaymod/render/blend/data/DMesh.java index 18d6366c..e9f29879 100644 --- a/src/main/java/com/replaymod/render/blend/data/DMesh.java +++ b/src/main/java/com/replaymod/render/blend/data/DMesh.java @@ -19,12 +19,6 @@ import org.cakelab.blender.nio.CPointer; import org.lwjgl.util.vector.Vector2f; import org.lwjgl.util.vector.Vector3f; -//#if MC>=10904 -import net.minecraft.util.math.Vec3i; -//#else -//$$ import net.minecraft.util.Vec3i; -//#endif - import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -197,7 +191,7 @@ public class DMesh { public static class Vertex { public Vector3f pos; - public Vec3i norm = Vec3i.NULL_VECTOR; + public short normX, normY, normZ; public Vertex(float x, float y, float z) { this.pos = new Vector3f(x, y, z); @@ -209,9 +203,9 @@ public class DMesh { pos.set(1, this.pos.y); pos.set(2, this.pos.z); CArrayFacade norm = mVert.getNo(); - norm.set(0, (short) this.norm.getX()); - norm.set(1, (short) this.norm.getY()); - norm.set(2, (short) this.norm.getZ()); + norm.set(0, this.normX); + norm.set(1, this.normY); + norm.set(2, this.normZ); } } diff --git a/src/main/java/com/replaymod/render/blend/exporters/ChunkExporter.java b/src/main/java/com/replaymod/render/blend/exporters/ChunkExporter.java index a523fe0a..2f7a5d18 100644 --- a/src/main/java/com/replaymod/render/blend/exporters/ChunkExporter.java +++ b/src/main/java/com/replaymod/render/blend/exporters/ChunkExporter.java @@ -1,3 +1,4 @@ +//#if MC>=10800 package com.replaymod.render.blend.exporters; import com.replaymod.render.blend.BlendMeshBuilder; @@ -173,3 +174,4 @@ public class ChunkExporter implements Exporter { private static final int STRIDE = 28; } +//#endif diff --git a/src/main/java/com/replaymod/render/blend/exporters/EntityExporter.java b/src/main/java/com/replaymod/render/blend/exporters/EntityExporter.java index 1fa342e8..4d32339a 100644 --- a/src/main/java/com/replaymod/render/blend/exporters/EntityExporter.java +++ b/src/main/java/com/replaymod/render/blend/exporters/EntityExporter.java @@ -1,3 +1,4 @@ +//#if MC>=10800 package com.replaymod.render.blend.exporters; import com.replaymod.render.blend.BlendState; @@ -81,3 +82,4 @@ public class EntityExporter implements Exporter { renderState.pop(); } } +//#endif diff --git a/src/main/java/com/replaymod/render/blend/exporters/ItemExporter.java b/src/main/java/com/replaymod/render/blend/exporters/ItemExporter.java index 7ad96a85..8493b78c 100644 --- a/src/main/java/com/replaymod/render/blend/exporters/ItemExporter.java +++ b/src/main/java/com/replaymod/render/blend/exporters/ItemExporter.java @@ -1,3 +1,4 @@ +//#if MC>=10800 package com.replaymod.render.blend.exporters; import com.replaymod.render.blend.BlendMeshBuilder; @@ -133,3 +134,4 @@ public class ItemExporter implements Exporter { } } } +//#endif diff --git a/src/main/java/com/replaymod/render/blend/exporters/ModelRendererExporter.java b/src/main/java/com/replaymod/render/blend/exporters/ModelRendererExporter.java index 5f6cfcd2..601e8de3 100644 --- a/src/main/java/com/replaymod/render/blend/exporters/ModelRendererExporter.java +++ b/src/main/java/com/replaymod/render/blend/exporters/ModelRendererExporter.java @@ -1,3 +1,4 @@ +//#if MC>=10800 package com.replaymod.render.blend.exporters; import com.replaymod.render.blend.BlendMeshBuilder; @@ -104,3 +105,4 @@ public class ModelRendererExporter implements Exporter { } } } +//#endif diff --git a/src/main/java/com/replaymod/render/blend/exporters/ParticlesExporter.java b/src/main/java/com/replaymod/render/blend/exporters/ParticlesExporter.java index b4a129aa..565e63f7 100644 --- a/src/main/java/com/replaymod/render/blend/exporters/ParticlesExporter.java +++ b/src/main/java/com/replaymod/render/blend/exporters/ParticlesExporter.java @@ -1,3 +1,4 @@ +//#if MC>=10800 package com.replaymod.render.blend.exporters; import com.replaymod.render.blend.BlendMeshBuilder; @@ -168,3 +169,4 @@ public class ParticlesExporter implements Exporter { particleObjectsSeen = new IdentityHashMap<>(); } } +//#endif diff --git a/src/main/java/com/replaymod/render/blend/exporters/RenderState.java b/src/main/java/com/replaymod/render/blend/exporters/RenderState.java index 4604cb58..fbf4ab9b 100644 --- a/src/main/java/com/replaymod/render/blend/exporters/RenderState.java +++ b/src/main/java/com/replaymod/render/blend/exporters/RenderState.java @@ -1,3 +1,4 @@ +//#if MC>=10800 package com.replaymod.render.blend.exporters; import com.replaymod.render.blend.BlendState; @@ -141,3 +142,4 @@ public class RenderState implements Exporter { } } +//#endif diff --git a/src/main/java/com/replaymod/render/blend/exporters/TileEntityExporter.java b/src/main/java/com/replaymod/render/blend/exporters/TileEntityExporter.java index 180b3364..7f77f858 100644 --- a/src/main/java/com/replaymod/render/blend/exporters/TileEntityExporter.java +++ b/src/main/java/com/replaymod/render/blend/exporters/TileEntityExporter.java @@ -1,3 +1,4 @@ +//#if MC>=10800 package com.replaymod.render.blend.exporters; import com.replaymod.render.blend.BlendState; @@ -106,3 +107,4 @@ public class TileEntityExporter implements Exporter { tileEntityObjectsSeen = new IdentityHashMap<>(); } } +//#endif diff --git a/src/main/java/com/replaymod/render/blend/mixin/MixinChunkRenderWorker.java b/src/main/java/com/replaymod/render/blend/mixin/MixinChunkRenderWorker.java index 85fc7c50..4c59e6cd 100644 --- a/src/main/java/com/replaymod/render/blend/mixin/MixinChunkRenderWorker.java +++ b/src/main/java/com/replaymod/render/blend/mixin/MixinChunkRenderWorker.java @@ -1,3 +1,4 @@ +//#if MC>=10800 package com.replaymod.render.blend.mixin; import com.replaymod.render.blend.BlendState; @@ -29,3 +30,4 @@ public abstract class MixinChunkRenderWorker { } } } +//#endif diff --git a/src/main/java/com/replaymod/render/blend/mixin/MixinEffectRenderer.java b/src/main/java/com/replaymod/render/blend/mixin/MixinEffectRenderer.java index 1270525e..2a78b54c 100644 --- a/src/main/java/com/replaymod/render/blend/mixin/MixinEffectRenderer.java +++ b/src/main/java/com/replaymod/render/blend/mixin/MixinEffectRenderer.java @@ -1,3 +1,4 @@ +//#if MC>=10800 package com.replaymod.render.blend.mixin; import com.replaymod.render.blend.BlendState; @@ -53,3 +54,4 @@ public abstract class MixinEffectRenderer { } } } +//#endif diff --git a/src/main/java/com/replaymod/render/blend/mixin/MixinModelRenderer.java b/src/main/java/com/replaymod/render/blend/mixin/MixinModelRenderer.java index f470ba4f..9a540bad 100644 --- a/src/main/java/com/replaymod/render/blend/mixin/MixinModelRenderer.java +++ b/src/main/java/com/replaymod/render/blend/mixin/MixinModelRenderer.java @@ -1,3 +1,4 @@ +//#if MC>=10800 package com.replaymod.render.blend.mixin; import com.replaymod.render.blend.BlendState; @@ -63,3 +64,4 @@ public abstract class MixinModelRenderer { } } } +//#endif diff --git a/src/main/java/com/replaymod/render/blend/mixin/MixinRenderGlobal.java b/src/main/java/com/replaymod/render/blend/mixin/MixinRenderGlobal.java index 93832e02..44256e49 100644 --- a/src/main/java/com/replaymod/render/blend/mixin/MixinRenderGlobal.java +++ b/src/main/java/com/replaymod/render/blend/mixin/MixinRenderGlobal.java @@ -1,3 +1,4 @@ +//#if MC>=10800 package com.replaymod.render.blend.mixin; import com.replaymod.render.blend.BlendState; @@ -66,3 +67,4 @@ public abstract class MixinRenderGlobal { } } } +//#endif diff --git a/src/main/java/com/replaymod/render/blend/mixin/MixinRenderItem.java b/src/main/java/com/replaymod/render/blend/mixin/MixinRenderItem.java index 07959a3e..09f38a1d 100644 --- a/src/main/java/com/replaymod/render/blend/mixin/MixinRenderItem.java +++ b/src/main/java/com/replaymod/render/blend/mixin/MixinRenderItem.java @@ -1,3 +1,4 @@ +//#if MC>=10800 package com.replaymod.render.blend.mixin; import com.replaymod.render.blend.BlendState; @@ -32,3 +33,4 @@ public abstract class MixinRenderItem { } } } +//#endif diff --git a/src/main/java/com/replaymod/render/blend/mixin/MixinRenderManager.java b/src/main/java/com/replaymod/render/blend/mixin/MixinRenderManager.java index e2867302..ca777c2b 100644 --- a/src/main/java/com/replaymod/render/blend/mixin/MixinRenderManager.java +++ b/src/main/java/com/replaymod/render/blend/mixin/MixinRenderManager.java @@ -1,3 +1,4 @@ +//#if MC>=10800 package com.replaymod.render.blend.mixin; import com.replaymod.render.blend.BlendState; @@ -48,3 +49,4 @@ public abstract class MixinRenderManager { } } } +//#endif diff --git a/src/main/java/com/replaymod/render/blend/mixin/MixinTileEntityRendererDispatcher.java b/src/main/java/com/replaymod/render/blend/mixin/MixinTileEntityRendererDispatcher.java index abe563b9..65d95761 100644 --- a/src/main/java/com/replaymod/render/blend/mixin/MixinTileEntityRendererDispatcher.java +++ b/src/main/java/com/replaymod/render/blend/mixin/MixinTileEntityRendererDispatcher.java @@ -1,3 +1,4 @@ +//#if MC>=10800 package com.replaymod.render.blend.mixin; import com.replaymod.render.blend.BlendState; @@ -43,3 +44,4 @@ public abstract class MixinTileEntityRendererDispatcher { } } } +//#endif diff --git a/src/main/java/com/replaymod/render/gui/GuiRenderSettings.java b/src/main/java/com/replaymod/render/gui/GuiRenderSettings.java index a07f801e..028f7198 100644 --- a/src/main/java/com/replaymod/render/gui/GuiRenderSettings.java +++ b/src/main/java/com/replaymod/render/gui/GuiRenderSettings.java @@ -359,6 +359,11 @@ public class GuiRenderSettings extends GuiScreen implements Closeable { && videoWidth != videoHeight) { return "replaymod.gui.rendersettings.customresolution.warning.ods"; } + //#if MC<10800 + //$$ if (method == RenderSettings.RenderMethod.BLEND) { + //$$ return "replaymod.gui.rendersettings.no_blend_on_1_7_10"; + //$$ } + //#endif return null; } diff --git a/src/main/java/com/replaymod/render/mixin/MixinEffectRenderer.java b/src/main/java/com/replaymod/render/mixin/MixinEffectRenderer.java index e542e409..9a9269f8 100644 --- a/src/main/java/com/replaymod/render/mixin/MixinEffectRenderer.java +++ b/src/main/java/com/replaymod/render/mixin/MixinEffectRenderer.java @@ -2,7 +2,6 @@ package com.replaymod.render.mixin; //#if MC<10904 //$$ import com.replaymod.render.blend.BlendState; -//$$ import com.replaymod.render.blend.exporters.ParticlesExporter; //$$ import com.replaymod.render.hooks.EntityRendererHandler; //$$ import net.minecraft.client.Minecraft; //$$ import net.minecraft.client.particle.EffectRenderer; @@ -13,6 +12,7 @@ package com.replaymod.render.mixin; //$$ import org.spongepowered.asm.mixin.injection.Redirect; //$$ //#if MC>=10800 +//$$ import com.replaymod.render.blend.exporters.ParticlesExporter; //$$ import net.minecraft.client.renderer.WorldRenderer; //#else //$$ import net.minecraft.client.renderer.Tessellator; @@ -83,10 +83,12 @@ package com.replaymod.render.mixin; //$$ rotYZ = (float) (-rotZ * Math.sin(pitch)); //$$ rotXY = (float) (rotX * Math.sin(pitch)); //$$ } -//$$ BlendState blendState = BlendState.getState(); -//$$ if (blendState != null) { -//$$ blendState.get(ParticlesExporter.class).onRender(fx, partialTicks); -//$$ } + //#if MC>=10800 + //$$ BlendState blendState = BlendState.getState(); + //$$ if (blendState != null) { + //$$ blendState.get(ParticlesExporter.class).onRender(fx, partialTicks); + //$$ } + //#endif //#if MC>=10809 //$$ fx.renderParticle(worldRenderer, view, partialTicks, rotX, rotXZ, rotZ, rotYZ, rotXY); //#else diff --git a/src/main/resources/mixins.render.blend.replaymod.json b/src/main/resources/mixins.render.blend.replaymod.json index 3dcc3306..acc97473 100644 --- a/src/main/resources/mixins.render.blend.replaymod.json +++ b/src/main/resources/mixins.render.blend.replaymod.json @@ -4,6 +4,7 @@ "mixins": [], "server": [], "client": [ + //#if MC>=10800 "MixinChunkRenderWorker", "MixinEffectRenderer", "MixinModelRenderer", @@ -11,6 +12,7 @@ "MixinRenderItem", "MixinRenderManager", "MixinTileEntityRendererDispatcher" + //#endif ], "compatibilityLevel": "JAVA_8", "minVersion": "0.6.11",