Switch core to 1.14 (generated via ./gradlew :1.14:setCoreVersion)

This commit is contained in:
Jonas Herzig
2019-05-10 14:09:22 +02:00
parent 7f7d33def8
commit 7cbf7f7c94
183 changed files with 3250 additions and 3250 deletions

View File

@@ -3,22 +3,22 @@ package com.replaymod.compat.shaders;
import com.replaymod.render.hooks.EntityRendererHandler;
import de.johni0702.minecraft.gui.utils.EventRegistrations;
import net.minecraft.client.Minecraft;
import net.minecraft.client.MinecraftClient;
import java.lang.reflect.InvocationTargetException;
import static com.replaymod.core.versions.MCVer.getRenderPartialTicks;
//#if MC>=11400
//$$ import com.replaymod.core.events.PreRenderCallback;
import com.replaymod.core.events.PreRenderCallback;
//#else
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.gameevent.TickEvent;
//$$ import net.minecraftforge.eventbus.api.SubscribeEvent;
//$$ import net.minecraftforge.fml.common.gameevent.TickEvent;
//#endif
public class ShaderBeginRender extends EventRegistrations {
private final Minecraft mc = Minecraft.getInstance();
private final MinecraftClient mc = MinecraftClient.getInstance();
/**
* Invokes Shaders#beginRender when rendering a video,
@@ -26,19 +26,19 @@ public class ShaderBeginRender extends EventRegistrations {
* which we're not calling during rendering.
*/
//#if MC>=11400
//$$ { on(PreRenderCallback.EVENT, this::onRenderTickStart); }
//$$ private void onRenderTickStart() {
{ on(PreRenderCallback.EVENT, this::onRenderTickStart); }
private void onRenderTickStart() {
//#else
@SubscribeEvent
public void onRenderTickStart(TickEvent.RenderTickEvent event) {
if (event.phase != TickEvent.Phase.START) return;
//$$ @SubscribeEvent
//$$ public void onRenderTickStart(TickEvent.RenderTickEvent event) {
//$$ if (event.phase != TickEvent.Phase.START) return;
//#endif
if (ShaderReflection.shaders_beginRender == null) return;
if (ShaderReflection.config_isShaders == null) return;
try {
// check if video is being rendered
if (((EntityRendererHandler.IEntityRenderer) mc.entityRenderer).replayModRender_getHandler() == null)
if (((EntityRendererHandler.IEntityRenderer) mc.gameRenderer).replayModRender_getHandler() == null)
return;
// check if Shaders are enabled