Switch core to 1.14 (generated via ./gradlew :1.14:setCoreVersion)
This commit is contained in:
@@ -10,14 +10,14 @@ import de.johni0702.minecraft.gui.element.GuiImage;
|
||||
import de.johni0702.minecraft.gui.element.IGuiImage;
|
||||
import de.johni0702.minecraft.gui.layout.HorizontalLayout;
|
||||
import de.johni0702.minecraft.gui.utils.EventRegistrations;
|
||||
import net.minecraft.client.GameSettings;
|
||||
import net.minecraft.client.options.GameOptions;
|
||||
|
||||
//#if MC>=11400
|
||||
//$$ import com.replaymod.core.events.PreRenderCallback;
|
||||
//$$ import com.replaymod.core.events.PostRenderCallback;
|
||||
import com.replaymod.core.events.PreRenderCallback;
|
||||
import com.replaymod.core.events.PostRenderCallback;
|
||||
//#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 FullBrightness extends EventRegistrations implements Extra {
|
||||
@@ -25,7 +25,7 @@ public class FullBrightness extends EventRegistrations implements Extra {
|
||||
|
||||
private final IGuiImage indicator = new GuiImage().setTexture(ReplayMod.TEXTURE, 90, 20, 19, 13).setSize(19, 13);
|
||||
|
||||
private GameSettings gameSettings;
|
||||
private GameOptions gameSettings;
|
||||
private boolean active;
|
||||
//#if MC>=11300
|
||||
private double originalGamma;
|
||||
@@ -36,7 +36,7 @@ public class FullBrightness extends EventRegistrations implements Extra {
|
||||
@Override
|
||||
public void register(final ReplayMod mod) throws Exception {
|
||||
this.module = ReplayModReplay.instance;
|
||||
this.gameSettings = mod.getMinecraft().gameSettings;
|
||||
this.gameSettings = mod.getMinecraft().options;
|
||||
|
||||
mod.getKeyBindingRegistry().registerKeyBinding("replaymod.input.lighting", Keyboard.KEY_Z, new Runnable() {
|
||||
@Override
|
||||
@@ -44,7 +44,7 @@ public class FullBrightness extends EventRegistrations implements Extra {
|
||||
active = !active;
|
||||
// need to tick once to update lightmap when replay is paused
|
||||
//#if MC>=11300
|
||||
mod.getMinecraft().entityRenderer.tick();
|
||||
mod.getMinecraft().gameRenderer.tick();
|
||||
//#else
|
||||
//$$ mod.getMinecraft().entityRenderer.updateRenderer();
|
||||
//#endif
|
||||
@@ -59,29 +59,29 @@ public class FullBrightness extends EventRegistrations implements Extra {
|
||||
}
|
||||
|
||||
//#if MC>=11400
|
||||
//$$ { on(PreRenderCallback.EVENT, this::preRender); }
|
||||
//$$ private void preRender() {
|
||||
{ on(PreRenderCallback.EVENT, this::preRender); }
|
||||
private void preRender() {
|
||||
//#else
|
||||
@SubscribeEvent
|
||||
public void preRender(TickEvent.RenderTickEvent event) {
|
||||
if (event.phase != TickEvent.Phase.START) return;
|
||||
//$$ @SubscribeEvent
|
||||
//$$ public void preRender(TickEvent.RenderTickEvent event) {
|
||||
//$$ if (event.phase != TickEvent.Phase.START) return;
|
||||
//#endif
|
||||
if (active && module.getReplayHandler() != null) {
|
||||
originalGamma = gameSettings.gammaSetting;
|
||||
gameSettings.gammaSetting = 1000;
|
||||
originalGamma = gameSettings.gamma;
|
||||
gameSettings.gamma = 1000;
|
||||
}
|
||||
}
|
||||
|
||||
//#if MC>=11400
|
||||
//$$ { on(PostRenderCallback.EVENT, this::postRender); }
|
||||
//$$ private void postRender() {
|
||||
{ on(PostRenderCallback.EVENT, this::postRender); }
|
||||
private void postRender() {
|
||||
//#else
|
||||
@SubscribeEvent
|
||||
public void postRender(TickEvent.RenderTickEvent event) {
|
||||
if (event.phase != TickEvent.Phase.END) return;
|
||||
//$$ @SubscribeEvent
|
||||
//$$ public void postRender(TickEvent.RenderTickEvent event) {
|
||||
//$$ if (event.phase != TickEvent.Phase.END) return;
|
||||
//#endif
|
||||
if (active && module.getReplayHandler() != null) {
|
||||
gameSettings.gammaSetting = originalGamma;
|
||||
gameSettings.gamma = originalGamma;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user