Port to MC 1.18-pre1

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

@@ -1,5 +1,8 @@
 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.gradle.remap.Pattern;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.options.KeyBinding;
@@ -23,6 +26,12 @@ import net.minecraft.world.chunk.WorldChunk;
 import org.lwjgl.opengl.GL11;
 //#endif
 
+//#if MC>=11600
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.util.math.Matrix4f;
+//#else
+//#endif
+
 //#if MC>=11400
 import net.minecraft.client.gui.widget.AbstractButtonWidget;
 import net.minecraft.client.util.Window;
@@ -509,4 +518,26 @@ class Patterns {
         GL11.glRotatef(angle, x, y, z);
         //#endif
     }
+
+    // FIXME preprocessor bug: there are mappings for this, not sure why it doesn't remap by itself
+    //#if MC>=11600
+    @Pattern
+    private static Matrix4f getPositionMatrix(MatrixStack.Entry stack) {
+        //#if MC>=11800
+        //$$ return stack.getPositionMatrix();
+        //#else
+        return stack.getModel();
+        //#endif
+    }
+    //#endif
+
+    @SuppressWarnings("rawtypes") // preprocessor bug: doesn't work with generics
+    @Pattern
+    private static void Futures_addCallback(ListenableFuture future, FutureCallback callback) {
+        //#if MC>=11800
+        //$$ Futures.addCallback(future, callback, Runnable::run);
+        //#else
+        Futures.addCallback(future, callback);
+        //#endif
+    }
 }