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

Get rid of all the ATs in favor of Mixins

Browse Source
This commit is contained in:
Jonas Herzig
2019-05-06 16:53:39 +02:00
parent 2094c518a0
commit bd91d0d3bd
41 changed files with 302 additions and 778 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,20 +17,21 @@ import net.minecraftforge.client.model.pipeline.LightUtil;
//#endif
//#if MC>=11300
import com.replaymod.render.blend.mixin.ItemRendererAccessor;
import net.minecraft.client.renderer.model.BakedQuad;
import net.minecraft.client.renderer.model.IBakedModel;
//#else
//$$ import net.minecraft.client.renderer.block.model.BakedQuad;
//#if MC>=10904
//$$ import net.minecraft.client.renderer.RenderItem;
//$$ import net.minecraft.client.renderer.block.model.IBakedModel;
//#else
//$$ import net.minecraft.client.renderer.entity.RenderItem;
//$$ import net.minecraft.client.resources.model.IBakedModel;
//#endif
//#endif
//#if MC>=10904
import com.replaymod.render.blend.mixin.ItemRendererAccessor;
//#endif
import java.util.List;
import java.util.Random;
@@ -117,15 +118,11 @@ public class ItemExporter implements Exporter {
private static void renderQuads(Object renderItem, BlendMeshBuilder buffer, List<BakedQuad> quads, ItemStack stack) {
for (BakedQuad quad : quads) {
int color = stack != null && quad.hasTintIndex()
//#if MC>=11300
//#if MC>=10904
? ((ItemRendererAccessor) renderItem).getItemColors().getColor(stack, quad.getTintIndex()) | 0xff000000
//#else
//#if MC>=10904
//$$ ? ((RenderItem) renderItem).itemColors.getColorFromItemstack(stack, quad.getTintIndex()) | 0xff000000
//#else
//$$ ? stack.getItem().getColorFromItemStack(stack, quad.getTintIndex()) | 0xff000000
//#endif
//#endif
: 0xffffffff;
//#if MC>=11400
//$$ buffer.putVertexData(quad.getVertexData());

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

@@ -1,4 +1,4 @@
//#if MC>=11300
//#if MC>=10904
package com.replaymod.render.blend.mixin;
import net.minecraft.client.renderer.ItemRenderer;

2
src/main/java/com/replaymod/render/hooks/ChunkLoadingRenderGlobal.java
View File

@@ -70,7 +70,7 @@ public class ChunkLoadingRenderGlobal {
//#if MC>=10904
PriorityBlockingQueue<ChunkRenderTask> queueChunkUpdates = renderDispatcherAcc.getQueueChunkUpdates();
//#else
//$$ BlockingQueue<ChunkCompileTaskGenerator> queueChunkUpdates = renderDispatcher.queueChunkUpdates;
//$$ BlockingQueue<ChunkCompileTaskGenerator> queueChunkUpdates = renderDispatcherAcc.getQueueChunkUpdates();
//#endif
workerJailingQueue = new JailingQueue<>(queueChunkUpdates);
renderDispatcherAcc.setQueueChunkUpdates(workerJailingQueue);

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

@@ -9,17 +9,11 @@ import lombok.Getter;
import net.minecraft.client.Minecraft;
//#if MC<11400
//#if MC>=10800
//#if MC>=11300
import net.minecraftforge.fml.hooks.BasicEventHooks;
//#else
//$$ import net.minecraft.client.renderer.GlStateManager;
//$$ import net.minecraftforge.fml.common.FMLCommonHandler;
//#endif
//#else
//$$ import com.replaymod.core.versions.MCVer.GlStateManager;
//$$ import cpw.mods.fml.common.FMLCommonHandler;
//#endif
//#endif
import java.io.IOException;
@@ -59,21 +53,7 @@ public class EntityRendererHandler implements WorldRenderer {
//#endif
//#endif
//#if MC>=11300
mc.entityRenderer.renderWorld(partialTicks, finishTimeNano);
//#else
//$$ mc.entityRenderer.updateLightmap(partialTicks);
//$$
//$$ GlStateManager.enableDepth();
//$$ GlStateManager.enableAlpha();
//$$ GlStateManager.alphaFunc(516, 0.5F);
//$$
//#if MC>=10800
//$$ mc.entityRenderer.renderWorldPass(2, partialTicks, finishTimeNano);
//#else
//$$ mc.entityRenderer.renderWorld(partialTicks, finishTimeNano);
//#endif
//#endif
//#if MC<11400
//#if MC>=11300

2
src/main/java/com/replaymod/render/rendering/Pipeline.java
View File

@@ -60,7 +60,7 @@ public class Pipeline<R extends Frame, P extends Frame> implements Runnable {
//#if MC>=11300
if (GLFW.glfwWindowShouldClose(mc.mainWindow.getHandle()) || ((MinecraftAccessor) mc).hasCrashed()) {
//#else
//$$ if (Display.isCloseRequested() || mc.hasCrashed) {
//$$ if (Display.isCloseRequested() || ((MinecraftAccessor) mc).hasCrashed()) {
//#endif
Thread.currentThread().interrupt();
return;

28
src/main/java/com/replaymod/render/rendering/VideoRenderer.java
View File

@@ -74,11 +74,7 @@ public class VideoRenderer implements RenderInfo {
private int fps;
private boolean mouseWasGrabbed;
private boolean debugInfoWasShown;
//#if MC>=10904
private Map<SoundCategory, Float> originalSoundLevels;
//#else
//$$ private Map originalSoundLevels;
//#endif
private TimelinePlayer timelinePlayer;
private Future<Void> timelinePlayerFuture;
@@ -266,7 +262,6 @@ public class VideoRenderer implements RenderInfo {
//#endif
// Mute all sounds except GUI sounds (buttons, etc.)
//#if MC>=11300
originalSoundLevels = new EnumMap<>(SoundCategory.class);
for (SoundCategory category : SoundCategory.values()) {
if (category != SoundCategory.MASTER) {
@@ -274,21 +269,6 @@ public class VideoRenderer implements RenderInfo {
mc.gameSettings.setSoundLevel(category, 0);
}
}
//#else
//$$ Map<SoundCategory, Float> mutedSounds = new EnumMap<>(SoundCategory.class);
//$$ for (SoundCategory category : SoundCategory.values()) {
//$$ mutedSounds.put(category, 0f);
//$$ }
//#if MC>=10904
//$$ originalSoundLevels = mc.gameSettings.soundLevels;
//$$ mutedSounds.put(SoundCategory.MASTER, originalSoundLevels.get(SoundCategory.MASTER));
//$$ mc.gameSettings.soundLevels = mutedSounds;
//#else
//$$ originalSoundLevels = mc.gameSettings.mapSoundLevels;
//$$ mutedSounds.put(SoundCategory.MASTER, (Float) originalSoundLevels.get(SoundCategory.MASTER));
//$$ mc.gameSettings.mapSoundLevels = mutedSounds;
//#endif
//#endif
fps = settings.getFramesPerSecond();
@@ -348,17 +328,9 @@ public class VideoRenderer implements RenderInfo {
//$$ mc.mouseHelper.grabMouseCursor();
//#endif
}
//#if MC>=10904
//#if MC>=11300
for (Map.Entry<SoundCategory, Float> entry : originalSoundLevels.entrySet()) {
mc.gameSettings.setSoundLevel(entry.getKey(), entry.getValue());
}
//#else
//$$ mc.gameSettings.soundLevels = originalSoundLevels;
//#endif
//#else
//$$ mc.gameSettings.mapSoundLevels = originalSoundLevels;
//#endif
mc.displayGuiScreen(null);
//#if MC>=10800
if (chunkLoadingRenderGlobal != null) {