Merge branch 'master' into 1.15

# Conflicts:
#	src/main/java/carpet/mixins/PortalForcer_portalCachingMixin.java
#	src/main/resources/carpet.mixins.json

src/main/java/carpet/fakes/TicketInfoInterface.java

@@ -0,0 +1,8 @@
+package carpet.fakes;
+
+import net.minecraft.util.math.BlockPos;
+
+public interface TicketInfoInterface
+{
+    BlockPos getPos();
+}

src/main/java/carpet/mixins/PortalForcerTicketInfo_portalCachingMixin.java

@@ -0,0 +1,19 @@
+package carpet.mixins;
+
+import carpet.fakes.TicketInfoInterface;
+import net.minecraft.util.math.BlockPos;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+
+@Mixin(targets = "net.minecraft.world.PortalForcer$TicketInfo")
+public class PortalForcerTicketInfo_portalCachingMixin implements TicketInfoInterface
+{
+    @Shadow @Final public BlockPos pos;
+
+    @Override
+    public BlockPos getPos()
+    {
+        return pos;
+    }
+}