DIvan2000/ReplayModCinematic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup 1.15.2 → 1.14.4 remapping

Browse Source
This commit is contained in:
Jonas Herzig
2020-03-31 16:03:25 +02:00
parent 9e7dc61d20
commit 5315c66943
9 changed files with 70 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/replaymod/render/blend/exporters/ModelRendererExporter.java
View File

@@ -8,7 +8,11 @@ import com.replaymod.render.blend.data.DObject;
import org.lwjgl.opengl.GL11;
//#if MC>=11400
//#if MC>=11500
//$$ import net.minecraft.client.model.ModelPart.Cuboid;
//#else
import net.minecraft.client.model.Box;
//#endif
import net.minecraft.client.model.ModelPart;
//#else
//$$ import net.minecraft.client.model.ModelBox;
@@ -81,13 +85,15 @@ public class ModelRendererExporter implements Exporter {
private static DMesh generateMesh(ModelPart model, float scale) {
DMesh mesh = new DMesh();
BlendMeshBuilder builder = new BlendMeshBuilder(mesh);
//#if MC>=11500
//$$ for (Cuboid box : cubeList(model)) {
//$$ // FIXME 1.15
//$$ }
//#else
for (Box box : cubeList(model)) {
//#if MC>=11500
//$$ // FIXME 1.15
//#else
box.render(builder, scale);
//#endif
}
//#endif
builder.maybeFinishDrawing();
return mesh;
}

10
src/main/java/com/replaymod/render/blend/mixin/ContainerLocalRenderInformationAccessor.java
View File

@@ -1,21 +1,27 @@
//#if MC>=10800
package com.replaymod.render.blend.mixin;
import net.minecraft.client.render.chunk.ChunkRenderer;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
//#if MC>=11500
//$$ import net.minecraft.client.render.chunk.ChunkBuilder.BuiltChunk;
//#else
import net.minecraft.client.render.chunk.ChunkRenderer;
//#endif
@Mixin(targets = "net.minecraft.client.render.WorldRenderer$ChunkInfo")
public interface ContainerLocalRenderInformationAccessor {
//#if MC>=11500
//$$ @Accessor("chunk")
//$$ BuiltChunk getRenderChunk();
//#else
//#if MC>=11400
@Accessor("renderer")
//#else
//$$ @Accessor
//#endif
//#endif
ChunkRenderer getRenderChunk();
//#endif
}
//#endif

12
src/main/java/com/replaymod/render/hooks/EntityRendererHandler.java
View File

@@ -63,13 +63,11 @@ public class EntityRendererHandler implements WorldRenderer {
//#endif
if (mc.world != null && mc.player != null) {
mc.gameRenderer.renderWorld(
partialTicks,
finishTimeNano
//#if MC>=11500
//$$ , new MatrixStack()
//#endif
);
//#if MC>=11500
//$$ mc.gameRenderer.renderWorld(partialTicks, finishTimeNano, new MatrixStack());
//#else
mc.gameRenderer.renderWorld(partialTicks, finishTimeNano);
//#endif
}
//#if MC>=11400

9
src/main/java/com/replaymod/render/mixin/WorldRendererAccessor.java
View File

@@ -8,8 +8,13 @@ import java.util.Set;
//#if MC>=10800
import net.minecraft.client.render.chunk.ChunkBuilder;
//#if MC>=11500
//$$ import net.minecraft.client.render.chunk.ChunkBuilder.BuiltChunk;
//#else
import net.minecraft.client.render.chunk.ChunkRenderer;
//#endif
//#endif
@Mixin(WorldRenderer.class)
public interface WorldRendererAccessor {
@@ -25,7 +30,11 @@ public interface WorldRendererAccessor {
void setDisplayListEntitiesDirty(boolean value);
@Accessor("chunksToRebuild")
//#if MC>=11500
//$$ Set<BuiltChunk> getChunksToUpdate();
//#else
Set<ChunkRenderer> getChunksToUpdate();
//#endif
//#endif
//#endif
}