Port to MC 1.18-rc4

src/main/java/com/replaymod/core/mixin/MinecraftAccessor.java

@@ -10,6 +10,10 @@ import org.spongepowered.asm.mixin.gen.Accessor;
 
 import java.util.Queue;
 
+//#if MC>=11800
+//$$ import java.util.function.Supplier;
+//#endif
+
 //#if MC>=11400
 import java.util.concurrent.CompletableFuture;
 //#endif
@@ -49,7 +53,11 @@ public interface MinecraftAccessor {
     //#endif
 
     @Accessor("crashReport")
+    //#if MC>=11800
+    //$$ Supplier<CrashReport> getCrashReporter();
+    //#else
     CrashReport getCrashReporter();
+    //#endif
 
     //#if MC<11400
     //$$ @Accessor

src/main/java/com/replaymod/core/versions/Patterns.java

@@ -3,6 +3,7 @@ package com.replaymod.core.versions;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.replaymod.core.mixin.MinecraftAccessor;
 import com.replaymod.gradle.remap.Pattern;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.options.KeyBinding;
@@ -13,6 +14,8 @@ import net.minecraft.client.render.Tessellator;
 import net.minecraft.client.render.entity.EntityRenderDispatcher;
 import net.minecraft.client.sound.PositionedSoundInstance;
 import net.minecraft.entity.player.PlayerInventory;
+import net.minecraft.util.crash.CrashException;
+import net.minecraft.util.crash.CrashReport;
 import net.minecraft.util.crash.CrashReportSection;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.PlayerEntity;
@@ -542,4 +545,22 @@ class Patterns {
         Futures.addCallback(future, callback);
         //#endif
     }
+
+    @Pattern
+    private static void setCrashReport(MinecraftClient mc, CrashReport report) {
+        //#if MC>=11800
+        //$$ mc.setCrashReportSupplier(() -> report);
+        //#else
+        mc.setCrashReport(report);
+        //#endif
+    }
+
+    @Pattern
+    private static CrashException crashReportToException(MinecraftClient mc) {
+        //#if MC>=11800
+        //$$ return new CrashException(((MinecraftAccessor) mc).getCrashReporter().get());
+        //#else
+        return new CrashException(((MinecraftAccessor) mc).getCrashReporter());
+        //#endif
+    }
 }

src/main/java/com/replaymod/extras/playeroverview/PlayerOverview.java

@@ -1,6 +1,5 @@
 package com.replaymod.extras.playeroverview;
 
-import com.google.common.base.Optional;
 import com.replaymod.core.ReplayMod;
 import com.replaymod.core.events.PreRenderHandCallback;
 import com.replaymod.core.utils.Utils;
@@ -10,6 +9,7 @@ import com.replaymod.replay.ReplayModReplay;
 import com.replaymod.replay.camera.CameraEntity;
 import com.replaymod.replay.events.ReplayClosedCallback;
 import com.replaymod.replay.events.ReplayOpenedCallback;
+import com.replaymod.replaystudio.lib.guava.base.Optional;
 import de.johni0702.minecraft.gui.utils.EventRegistrations;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.PlayerEntity;

src/main/java/com/replaymod/render/utils/RenderJob.java

@@ -1,12 +1,12 @@
 package com.replaymod.render.utils;
 
-import com.google.common.base.Optional;
 import com.google.gson.GsonBuilder;
 import com.google.gson.TypeAdapter;
 import com.google.gson.reflect.TypeToken;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import com.replaymod.render.RenderSettings;
+import com.replaymod.replaystudio.lib.guava.base.Optional;
 import com.replaymod.replaystudio.pathing.PathingRegistry;
 import com.replaymod.replaystudio.pathing.path.Timeline;
 import com.replaymod.replaystudio.pathing.serialize.TimelineSerialization;