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

Update to MC 1.14.1

Browse Source 
The ReplayStudio update also fixes an issue with reading the
PlayerListEntryPacket leading to NPEs during Quick Mode.
This commit is contained in:
Jonas Herzig
2019-05-20 13:38:38 +02:00
parent 0e086d91a6
commit e5ee6a3d94
49 changed files with 198 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/replaymod/render/blend/BlendMeshBuilder.java
View File

@@ -172,7 +172,7 @@ public class BlendMeshBuilder
posOffset = offset;
break;
case COLOR:
if (element.getFormat() != VertexFormatElement.Format.UNSIGNED_BYTE) {
if (element.getFormat() != VertexFormatElement.Format.UBYTE) {
throw new UnsupportedOperationException("Only unsigned byte is supported for color elements!");
}
colorOffset = offset;

2
src/main/java/com/replaymod/render/blend/exporters/ChunkExporter.java
View File

@@ -71,7 +71,7 @@ public class ChunkExporter implements Exporter {
List<ContainerLocalRenderInformationAccessor> renderInfos = ((WorldRendererAccessor) mc.worldRenderer).getRenderInfos();
for (ContainerLocalRenderInformationAccessor renderInfo : renderInfos) {
ChunkRenderer renderChunk = renderInfo.getRenderChunk();
ChunkRenderData compiledChunk = renderChunk.getChunkRenderData();
ChunkRenderData compiledChunk = renderChunk.getData();
if (!compiledChunk.isEmpty()) {
addChunkUpdate(renderChunk, null);
}

2
src/main/java/com/replaymod/render/blend/exporters/ItemExporter.java
View File

@@ -119,7 +119,7 @@ public class ItemExporter implements Exporter {
for (BakedQuad quad : quads) {
int color = stack != null && quad.hasColor()
//#if MC>=10904
? ((ItemRendererAccessor) renderItem).getItemColors().getRenderColor(stack, quad.getColorIndex()) | 0xff000000
? ((ItemRendererAccessor) renderItem).getItemColors().getColorMultiplier(stack, quad.getColorIndex()) | 0xff000000
//#else
//$$ ? stack.getItem().getColorFromItemStack(stack, quad.getTintIndex()) | 0xff000000
//#endif

4
src/main/java/com/replaymod/render/blend/mixin/ItemRendererAccessor.java
View File

@@ -2,13 +2,13 @@
package com.replaymod.render.blend.mixin;
import net.minecraft.client.render.item.ItemRenderer;
import net.minecraft.client.render.item.ItemColorMap;
import net.minecraft.client.color.item.ItemColors;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
@Mixin(ItemRenderer.class)
public interface ItemRendererAccessor {
@Accessor("colorMap")
ItemColorMap getItemColors();
ItemColors getItemColors();
}
//#endif