chore(ci): enable dependabot

2025-02-20 23:05:53 +01:00
23 changed files with 1418 additions and 282 deletions
@@ -1,19 +1,112 @@
-name: Build AlliedModders Extension
+name: CI

-on:
-  push:
-    branches:
-      - master
-      - main
-    tags:
-      - "*"
-  pull_request:
-    branches:
-      - master
-      - main
+on: [push, pull_request, workflow_dispatch]

 jobs:
-  build-release-extension:
-    uses: srcdslab/ci-workflows/.github/workflows/shared_build_release_am_extension.yml@v1
+  build:
+    name: Build
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-20.04]
+        sourcemod-version: [1.11-dev]
+        include:
+          - os: ubuntu-20.04
+            target-archs: x86,x86_64
+            sdks: sdk2013,csgo
+
+    steps:
+      - name: Install Linux packages
+        if: runner.os == 'Linux'
+        run: |
+          sudo apt update
+          sudo apt install -yq --no-install-recommends g++-multilib
+
+      - name: Set up Python
+        uses: actions/setup-python@v2
+
+      - name: Checkout
+        uses: actions/checkout@v2
        with:
-      sdks: "css"
+          path: extension
+
+      - name: Checkout SourceMod
+        uses: actions/checkout@v2
+        with:
+          repository: alliedmodders/sourcemod
+          ref: ${{ matrix.sourcemod-version }}
+          path: sourcemod
+          submodules: recursive
+
+      - name: Checkout AMBuild
+        uses: actions/checkout@v2
+        with:
+          repository: alliedmodders/ambuild
+          path: ambuild
+
+      - name: Checkout sm-ext-common
+        uses: actions/checkout@v2
+        with:
+          repository: srcdslab/sm-ext-common
+          path: sourcemod/extensions/sm-ext-common
+
+      - name: Install sourcemod dependencies
+        run: |
+          bash sourcemod/tools/checkout-deps.sh -m -s ${{ matrix.sdks }}
+
+      - name: Install AMBuild
+        uses: BSFishy/pip-action@v1
+        with:
+          packages: ./ambuild
+      
+      - name: Build
+        working-directory: extension
+        shell: bash
+        env:
+          BREAKPAD_SYMBOL_SERVER: ${{ secrets.BREAKPAD_SYMBOL_SERVER }}
+        run: |
+          mkdir build && cd build
+          python ../configure.py --enable-optimize --targets=${{ matrix.target-archs }} --sdks=${{ matrix.sdks }}
+          ambuild
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: ${{ runner.os }}
+          path: extension/build/package
+
+
+  release:
+    name: Release
+    if: startsWith(github.ref, 'refs/tags/')
+    needs: build
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Download artifacts
+        uses: actions/download-artifact@v2
+
+      - name: Package
+        run: |
+          version=`echo $GITHUB_REF | sed "s/refs\/tags\///"`
+          if [ -d "./Linux/" ]; then
+            cd ./Linux/
+            tar -czf ../${{ github.event.repository.name }}-${version}-linux.tar.gz -T <(\ls -1)
+          fi
+          if [ -d "./macOS/" ]; then
+            cd ./macOS/
+            tar -czf ../${{ github.event.repository.name }}-${version}-mac.tar.gz -T <(\ls -1)
+          fi
+          if [ -d "./Windows/" ]; then
+            cd ./Windows/
+            tar -czf ../${{ github.event.repository.name }}-${version}-windows.tar.gz -T <(\ls -1)
+          fi
+
+      - name: Release
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: '*.tar.gz'
+          tag: ${{ github.ref }}
+          file_glob: true
@@ -1,24 +0,0 @@
-name: Dependabot auto-merge
-
-on:
-  pull_request_target:
-    branches:
-      - master
-      - main
-    types:
-      - opened
-
-permissions:
-  pull-requests: write
-  contents: write
-
-jobs:
-  enableAutoMerge:
-    runs-on: ubuntu-latest
-    if: github.event.pull_request.user.login == 'dependabot[bot]'
-    steps:
-      - name: Enable auto-merge for Dependabot PRs
-        run: gh pr merge --auto --merge "$PR_URL"
-        env:
-          PR_URL: ${{ github.event.pull_request.html_url }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -1,7 +0,0 @@
-build
-Containerfile
-.venv
-safetyhook
-ambuild
-*.env
-*.ps1
@@ -1,3 +0,0 @@
-[submodule "sm-ext-common"]
-	path = sm-ext-common
-	url = https://github.com/srcdslab/sm-ext-common
@@ -0,0 +1,645 @@
+# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
+import os, sys
+import traceback
+
+class SDK(object):
+  def __init__(self, sdk, ext, aDef, name, platform, dir):
+    self.folder = 'hl2sdk-' + dir
+    self.envvar = sdk
+    self.ext = ext
+    self.code = aDef
+    self.define = name
+    self.platform = platform
+    self.name = dir
+    self.path = None # Actual path
+    self.platformSpec = platform
+
+    # By default, nothing supports x64.
+    if type(platform) is list:
+      self.platformSpec = {p: ['x86'] for p in platform}
+    else:
+      self.platformSpec = platform
+
+  def shouldBuild(self, targets):
+    for cxx in targets:
+      if cxx.target.platform in self.platformSpec:
+        if cxx.target.arch in self.platformSpec[cxx.target.platform]:
+          return True
+    return False
+
+WinOnly = ['windows']
+WinLinux = ['windows', 'linux']
+WinLinuxMac = ['windows', 'linux', 'mac']
+
+PossibleSDKs = {
+  'sdk2013': SDK('HL2SDK2013', '2.sdk2013', '9', 'SDK2013', WinLinuxMac, 'sdk2013'),
+  'csgo': SDK('HL2SDKCSGO', '2.csgo', '21', 'CSGO', WinLinuxMac, 'csgo'),
+}
+
+def ResolveEnvPath(env, folder):
+  if env in os.environ:
+    path = os.environ[env]
+    if os.path.isdir(path):
+      return path
+    return None
+
+  head = os.getcwd()
+  oldhead = None
+  while head != None and head != oldhead:
+    path = os.path.join(head, folder)
+    if os.path.isdir(path):
+      return path
+    oldhead = head
+    head, tail = os.path.split(head)
+
+  return None
+
+def Normalize(path):
+  return os.path.abspath(os.path.normpath(path))
+  
+def SetArchFlags(compiler):
+  if compiler.behavior == 'gcc':
+    if compiler.target.arch == 'x86_64':
+      compiler.cflags += ['-fPIC']
+  elif compiler.like('msvc'):
+    if compiler.target.arch == 'x86_64':
+      compiler.defines += ['WIN64']
+
+class ExtensionConfig(object):
+  def __init__(self):
+    self.sdks = {}
+    self.binaries = []
+    self.spvm = []
+    self.extensions = []
+    self.generated_headers = None
+    self.sm_root = None
+    self.mms_root = None
+    self.mysql_root = {}
+    self.spcomp = None
+    self.spcomp_bins = None
+    self.smx_files = {}
+    self.versionlib = None
+    self.all_targets = []
+    self.target_archs = set()
+
+
+    if builder.options.targets:
+      target_archs = builder.options.targets.split(',')
+    else:
+      target_archs = ['x86']
+      if builder.backend != 'amb2':
+        target_archs.append('x86_64')
+
+    for arch in target_archs:
+        try:
+            cxx = builder.DetectCxx(target_arch = arch)
+            self.target_archs.add(cxx.target.arch)
+        except Exception as e:
+            # Error if archs were manually overridden.
+            if builder.options.targets:
+                raise
+            print('Skipping target {}: {}'.format(arch, e))
+            continue
+        self.all_targets.append(cxx)
+
+    if not self.all_targets:
+        raise Exception('No suitable C/C++ compiler was found.')
+
+  @property
+  def tag(self):
+    if builder.options.debug == '1':
+      return 'Debug'
+    return 'Release'
+
+  def detectProductVersion(self):
+    builder.AddConfigureFile('product.version')
+
+    # For OS X dylib versioning
+    import re
+    with open(os.path.join(builder.sourcePath, 'product.version'), 'r') as fp:
+      productContents = fp.read()
+    m = re.match('(\d+)\.(\d+)\.(\d+).*', productContents)
+    if m == None:
+      self.productVersion = '1.0.0'
+    else:
+      major, minor, release = m.groups()
+      self.productVersion = '{0}.{1}.{2}'.format(major, minor, release)
+
+  def detectSDKs(self):
+    sdk_list = builder.options.sdks.split(',')
+    use_none = sdk_list[0] == 'none'
+    use_all = sdk_list[0] == 'all'
+    use_present = sdk_list[0] == 'present'
+
+    for sdk_name in PossibleSDKs:
+      sdk = PossibleSDKs[sdk_name]
+      if sdk.shouldBuild(self.all_targets):
+        if builder.options.hl2sdk_root:
+          sdk_path = os.path.join(builder.options.hl2sdk_root, sdk.folder)
+        else:
+          sdk_path = ResolveEnvPath(sdk.envvar, sdk.folder)
+        if sdk_path is None or not os.path.isdir(sdk_path):
+          if use_all or sdk_name in sdk_list:
+            raise Exception('Could not find a valid path for {0}'.format(sdk.envvar))
+          continue
+        if use_all or use_present or sdk_name in sdk_list:
+          sdk.path = Normalize(sdk_path)
+          self.sdks[sdk_name] = sdk
+
+    if len(self.sdks) < 1 and len(sdk_list) and not use_none:
+      raise Exception('No applicable SDKs were found, nothing to do')
+
+    if builder.options.sm_path:
+      self.sm_root = builder.options.sm_path
+    else:
+      self.sm_root = ResolveEnvPath('SOURCEMOD18', 'sourcemod-1.10')
+      if not self.sm_root:
+        self.sm_root = ResolveEnvPath('SOURCEMOD', 'sourcemod-source')
+      if not self.sm_root:
+        self.sm_root = ResolveEnvPath('SOURCEMOD_DEV', 'sourcemod-central')
+      if not self.sm_root:
+        self.sm_root = ResolveEnvPath('SOURCEMOD', 'sourcemod')
+
+    if not self.sm_root or not os.path.isdir(self.sm_root):
+      raise Exception('Could not find a source copy of Sourcemod')
+    self.sm_root = Normalize(self.sm_root)
+
+    if builder.options.mms_path:
+      self.mms_root = builder.options.mms_path
+    else:
+      self.mms_root = ResolveEnvPath('MMSOURCE110', 'mmsource-1.10')
+      if not self.mms_root:
+        self.mms_root = ResolveEnvPath('MMSOURCE_DEV', 'metamod-source')
+      if not self.mms_root:
+        self.mms_root = ResolveEnvPath('MMSOURCE_DEV', 'mmsource-central')
+      if not self.mms_root:
+        self.mms_root = ResolveEnvPath('MMSOURCE_DEV', 'metamod')
+
+    if not self.mms_root or not os.path.isdir(self.mms_root):
+      raise Exception('Could not find a source copy of Metamod:Source')
+    self.mms_root = Normalize(self.mms_root)
+
+  def configure(self):
+    if not set(self.target_archs).issubset(['x86', 'x86_64']):
+      raise Exception('Unknown target architecture: {0}'.format(self.target_archs))
+
+    for cxx in self.all_targets:
+        self.configure_cxx(cxx)
+
+  def configure_cxx(self, cxx):
+    if cxx.family == 'msvc':
+      if cxx.version < 1900:
+        raise Exception('Only MSVC 2015 and later are supported, c++14 support is required.')
+    if cxx.family == 'gcc':
+      if cxx.version < 'gcc-4.9':
+        raise Exception('Only GCC versions 4.9 or greater are supported, c++14 support is required.')
+    if cxx.family == 'clang':
+      if cxx.version < 'clang-3.4':
+        raise Exception('Only clang versions 3.4 or greater are supported, c++14 support is required.')
+
+    if cxx.like('gcc'):
+      self.configure_gcc(cxx)
+    elif cxx.family == 'msvc':
+      self.configure_msvc(cxx)
+
+    # Optimizaiton
+    if builder.options.opt == '1':
+      cxx.defines += ['NDEBUG']
+
+    # Debugging
+    if builder.options.debug == '1':
+      cxx.defines += ['DEBUG', '_DEBUG']
+
+    # Platform-specifics
+    if cxx.target.platform == 'linux':
+      self.configure_linux(cxx)
+    elif cxx.target.platform == 'mac':
+      self.configure_mac(cxx)
+    elif cxx.target.platform == 'windows':
+      self.configure_windows(cxx)
+
+    # Finish up.
+    cxx.includes += [
+      os.path.join(self.sm_root, 'public'),
+    ]
+
+  def configure_gcc(self, cxx):
+    cxx.defines += [
+      'stricmp=strcasecmp',
+      '_stricmp=strcasecmp',
+      '_snprintf=snprintf',
+      '_vsnprintf=vsnprintf',
+      'HAVE_STDINT_H',
+      'GNUC',
+    ]
+    cxx.cflags += [
+      '-pipe',
+      '-fno-strict-aliasing',
+      '-Wall',
+      '-Werror',
+      '-Wno-unused',
+      '-Wno-switch',
+      '-Wno-array-bounds',
+      '-msse',
+      '-fvisibility=hidden',
+    ]
+
+    if cxx.version == 'apple-clang-6.0' or cxx.version == 'clang-3.4':
+      cxx.cxxflags += ['-std=c++1y']
+    else:
+      cxx.cxxflags += ['-std=c++14']
+
+    cxx.cxxflags += [
+      '-fno-threadsafe-statics',
+      '-Wno-non-virtual-dtor',
+      '-Wno-overloaded-virtual',
+      '-fvisibility-inlines-hidden',
+    ]
+
+    have_gcc = cxx.family == 'gcc'
+    have_clang = cxx.family == 'clang'
+    if cxx.version >= 'clang-3.9' or cxx.version == 'clang-3.4' or cxx.version > 'apple-clang-6.0':
+      cxx.cxxflags += ['-Wno-expansion-to-defined']
+    if cxx.version == 'clang-3.9' or cxx.version == 'apple-clang-8.0':
+      cxx.cflags += ['-Wno-varargs']
+    if cxx.version >= 'clang-3.4' or cxx.version >= 'apple-clang-7.0':
+      cxx.cxxflags += ['-Wno-inconsistent-missing-override']
+    if cxx.version >= 'clang-2.9' or cxx.version >= 'apple-clang-3.0':
+      cxx.cxxflags += ['-Wno-null-dereference']
+    if have_clang or (cxx.version >= 'gcc-4.6'):
+      cxx.cflags += ['-Wno-narrowing']
+    if have_clang or (cxx.version >= 'gcc-4.7'):
+      cxx.cxxflags += ['-Wno-delete-non-virtual-dtor']
+    if cxx.version >= 'gcc-4.8':
+      cxx.cflags += ['-Wno-unused-result']
+    if cxx.version >= 'gcc-9.0':
+      cxx.cxxflags += ['-Wno-class-memaccess', '-Wno-packed-not-aligned']
+    if have_clang:
+      cxx.cxxflags += ['-Wno-implicit-exception-spec-mismatch']
+      if cxx.version >= 'apple-clang-5.1' or cxx.version >= 'clang-3.4':
+        cxx.cxxflags += ['-Wno-deprecated-register']
+      else:
+        cxx.cxxflags += ['-Wno-deprecated']
+      cxx.cflags += ['-Wno-sometimes-uninitialized']
+
+    # Work around SDK warnings.
+    if cxx.version >= 'clang-10.0':
+        cxx.cflags += [
+            '-Wno-implicit-int-float-conversion',
+            '-Wno-tautological-overlap-compare',
+        ]
+
+    if have_gcc:
+      cxx.cflags += ['-mfpmath=sse']
+      cxx.cflags += ['-Wno-maybe-uninitialized']
+
+    if builder.options.opt == '1':
+      cxx.cflags += [
+            '-O3',
+            '-fexperimental-new-pass-manager',
+            '-mllvm',
+            '-inline-threshold=1000',
+            '-mllvm',
+            '-vectorize-loops',
+            '-ftree-vectorize',
+      ]
+
+    # Don't omit the frame pointer.
+    cxx.cflags += ['-fno-omit-frame-pointer']
+
+  def configure_msvc(self, cxx):
+    if builder.options.debug == '1':
+      cxx.cflags += ['/MTd']
+      cxx.linkflags += ['/NODEFAULTLIB:libcmt']
+    else:
+      cxx.cflags += ['/MT']
+    cxx.defines += [
+      '_CRT_SECURE_NO_DEPRECATE',
+      '_CRT_SECURE_NO_WARNINGS',
+      '_CRT_NONSTDC_NO_DEPRECATE',
+      '_ITERATOR_DEBUG_LEVEL=0',
+    ]
+    cxx.cflags += [
+      '/W3',
+    ]
+    cxx.cxxflags += [
+      '/EHsc',
+      '/GR-',
+      '/TP',
+    ]
+    cxx.linkflags += [
+      'kernel32.lib',
+      'user32.lib',
+      'gdi32.lib',
+      'winspool.lib',
+      'comdlg32.lib',
+      'advapi32.lib',
+      'shell32.lib',
+      'ole32.lib',
+      'oleaut32.lib',
+      'uuid.lib',
+      'odbc32.lib',
+      'odbccp32.lib',
+    ]
+
+    if builder.options.opt == '1':
+      cxx.cflags += ['/Ox', '/Zo']
+      cxx.linkflags += ['/OPT:ICF', '/OPT:REF']
+
+    if builder.options.debug == '1':
+      cxx.cflags += ['/Od', '/RTC1']
+
+    # This needs to be after our optimization flags which could otherwise disable it.
+    # Don't omit the frame pointer.
+    cxx.cflags += ['/Oy-']
+
+  def configure_linux(self, cxx):
+    cxx.defines += ['_LINUX', 'POSIX', '_FILE_OFFSET_BITS=64']
+    cxx.linkflags += ['-lm']
+    if cxx.family == 'gcc':
+      cxx.linkflags += ['-static-libgcc']
+    elif cxx.family == 'clang':
+      cxx.linkflags += ['-lgcc_eh']
+    cxx.linkflags += ['-static-libstdc++']
+
+  def configure_mac(self, cxx):
+    cxx.defines += ['OSX', '_OSX', 'POSIX', 'KE_ABSOLUTELY_NO_STL']
+    cxx.cflags += ['-mmacosx-version-min=10.7']
+    cxx.linkflags += [
+      '-mmacosx-version-min=10.7',
+      '-stdlib=libc++',
+      '-lc++',
+    ]
+    cxx.cxxflags += ['-stdlib=libc++']
+
+  def configure_windows(self, cxx):
+    cxx.defines += ['WIN32', '_WINDOWS']
+
+  def add_libamtl(self):
+    # Add libamtl.
+    self.libamtl = {}
+    for cxx in self.all_targets:
+      def get_configure_fn(cxx):
+        return lambda builder, name: self.StaticLibrary(builder, cxx, name)
+      extra_vars = {'Configure': get_configure_fn(cxx)}
+      libamtl = builder.Build('public/amtl/amtl/AMBuilder', extra_vars)
+      self.libamtl[cxx.target.arch] = libamtl.binary
+
+  def AddVersioning(self, binary):
+    if binary.compiler.target.platform == 'windows':
+      binary.sources += ['version.rc']
+      binary.compiler.rcdefines += [
+        'BINARY_NAME="{0}"'.format(binary.outputFile),
+        'RC_COMPILE',
+      ]
+    elif binary.compiler.target.platform == 'mac':
+      if binary.type == 'library':
+        binary.compiler.postlink += [
+          '-compatibility_version', '1.0.0',
+          '-current_version', self.productVersion
+        ]
+    return binary
+    
+  def LibraryBuilder(self, compiler, name):
+    binary = compiler.Library(name)
+    self.AddVersioning(binary)
+    if binary.compiler.like('msvc'):
+      binary.compiler.linkflags += ['/SUBSYSTEM:WINDOWS']
+    return binary
+
+  def ProgramBuilder(self, compiler, name):
+    binary = compiler.Program(name)
+    self.AddVersioning(binary)
+    if '-static-libgcc' in binary.compiler.linkflags:
+      binary.compiler.linkflags.remove('-static-libgcc')
+    if '-lgcc_eh' in binary.compiler.linkflags:
+      binary.compiler.linkflags.remove('-lgcc_eh')
+    if binary.compiler.like('gcc'):
+      binary.compiler.linkflags += ['-lstdc++', '-lpthread']
+    if binary.compiler.like('msvc'):
+      binary.compiler.linkflags += ['/SUBSYSTEM:CONSOLE']
+    return binary
+    
+  def StaticLibraryBuilder(self, compiler, name):
+    return compiler.StaticLibrary(name)
+
+  def Library(self, context, compiler, name):
+    compiler = compiler.clone()
+    SetArchFlags(compiler)
+    return self.LibraryBuilder(compiler, name)
+
+  def Program(self, context, compiler, name):
+    compiler = compiler.clone()
+    SetArchFlags(compiler)
+    return self.ProgramBuilder(compiler, name)
+    
+  def StaticLibrary(self, context, compiler, name):
+    compiler = compiler.clone()
+    SetArchFlags(compiler)
+    return self.StaticLibraryBuilder(compiler, name)
+
+  def ConfigureForExtension(self, context, compiler):
+    compiler.cxxincludes += [
+      os.path.join(context.currentSourcePath),
+      os.path.join(context.currentSourcePath, 'sdk'),
+      os.path.join(self.sm_root, 'public'),
+      os.path.join(self.sm_root, 'public', 'extensions'),
+      os.path.join(self.sm_root, 'sourcepawn', 'include'),
+      os.path.join(self.sm_root, 'public', 'amtl', 'amtl'),
+      os.path.join(self.sm_root, 'public', 'amtl'),
+      os.path.join(self.sm_root, 'extensions', 'sm-ext-common', 'include'),
+    ]
+    return compiler
+
+  def ExtLibrary(self, context, compiler, name):
+    binary = self.Library(context, compiler, name)
+    SetArchFlags(compiler)
+    self.ConfigureForExtension(context, binary.compiler)
+    return binary
+
+  def ConfigureForHL2(self, context, binary, sdk):
+    compiler = binary.compiler
+    SetArchFlags(compiler)
+
+    compiler.cxxincludes += [
+      os.path.join(self.mms_root, 'core'),
+      os.path.join(self.mms_root, 'core', 'sourcehook'),
+    ]
+
+    defines = ['SE_' + PossibleSDKs[i].define + '=' + PossibleSDKs[i].code for i in PossibleSDKs]
+    compiler.defines += defines
+
+    paths = [
+      ['public'],
+      ['public', 'engine'],
+      ['public', 'mathlib'],
+      ['public', 'vstdlib'],
+      ['public', 'tier0'],
+      ['public', 'tier1'],
+      ['public', 'appframework']
+    ]
+    if sdk.name == 'episode1' or sdk.name == 'darkm':
+      paths.append(['public', 'dlls'])
+      paths.append(['game_shared'])
+    else:
+      paths.append(['public', 'game', 'server'])
+      paths.append(['public', 'toolframework'])
+      paths.append(['game', 'shared'])
+      paths.append(['common'])
+
+    compiler.defines += ['SOURCE_ENGINE=' + sdk.code]
+
+    if sdk.name in ['sdk2013', 'bms'] and compiler.like('gcc'):
+      # The 2013 SDK already has these in public/tier0/basetypes.h
+      compiler.defines.remove('stricmp=strcasecmp')
+      compiler.defines.remove('_stricmp=strcasecmp')
+      compiler.defines.remove('_snprintf=snprintf')
+      compiler.defines.remove('_vsnprintf=vsnprintf')
+
+    if compiler.like('msvc'):
+      compiler.defines += ['COMPILER_MSVC']
+      if compiler.target.arch == 'x86':
+        compiler.defines += ['COMPILER_MSVC32']
+      elif compiler.target.arch == 'x86_64':
+        compiler.defines += ['COMPILER_MSVC64']
+      compiler.linkflags += ['legacy_stdio_definitions.lib']
+    else:
+      compiler.defines += ['COMPILER_GCC']
+
+    if compiler.target.arch == 'x86_64':
+      compiler.defines += ['X64BITS', 'PLATFORM_64BITS']
+
+    # For everything after Swarm, this needs to be defined for entity networking
+    # to work properly with sendprop value changes.
+    if sdk.name in ['blade', 'insurgency', 'doi', 'csgo']:
+      compiler.defines += ['NETWORK_VARS_ENABLED']
+
+    if sdk.name in ['css', 'hl2dm', 'dods', 'sdk2013', 'bms', 'tf2', 'l4d', 'nucleardawn', 'l4d2']:
+      if compiler.target.platform in ['linux', 'mac']:
+        compiler.defines += ['NO_HOOK_MALLOC', 'NO_MALLOC_OVERRIDE']
+
+    if compiler.target.platform == 'linux':
+      if sdk.name in ['csgo', 'blade']:
+        compiler.linkflags.remove('-static-libstdc++')
+        compiler.defines += ['_GLIBCXX_USE_CXX11_ABI=0']
+
+    for path in paths:
+      compiler.cxxincludes += [os.path.join(sdk.path, *path)]
+
+    if compiler.target.platform == 'linux':
+      if sdk.name == 'episode1':
+        lib_folder = os.path.join(sdk.path, 'linux_sdk')
+      elif sdk.name in ['sdk2013', 'bms']:
+        lib_folder = os.path.join(sdk.path, 'lib', 'public', 'linux32')
+      elif compiler.target.arch == 'x86_64':
+        lib_folder = os.path.join(sdk.path, 'lib', 'linux64')
+      else:
+        lib_folder = os.path.join(sdk.path, 'lib', 'linux')
+    elif compiler.target.platform == 'mac':
+      if sdk.name in ['sdk2013', 'bms']:
+        lib_folder = os.path.join(sdk.path, 'lib', 'public', 'osx32')
+      elif compiler.target.arch == 'x86_64':
+        lib_folder = os.path.join(sdk.path, 'lib', 'osx64')
+      else:
+        lib_folder = os.path.join(sdk.path, 'lib', 'mac')
+
+    if compiler.target.platform in ['linux', 'mac']:
+      if sdk.name in ['sdk2013', 'bms'] or compiler.target.arch == 'x86_64':
+        compiler.postlink += [
+          os.path.join(lib_folder, 'tier1.a'),
+          os.path.join(lib_folder, 'mathlib.a')
+        ]
+      else:
+        compiler.postlink += [
+          os.path.join(lib_folder, 'tier1_i486.a'),
+          os.path.join(lib_folder, 'mathlib_i486.a')
+        ]
+
+      if sdk.name in ['blade', 'insurgency', 'doi', 'csgo']:
+        if compiler.target.arch == 'x86_64':
+          compiler.postlink += [os.path.join(lib_folder, 'interfaces.a')]
+        else:
+          compiler.postlink += [os.path.join(lib_folder, 'interfaces_i486.a')]
+
+    dynamic_libs = []
+    if compiler.target.platform == 'linux':
+      if sdk.name in ['css', 'hl2dm', 'dods', 'tf2', 'sdk2013', 'bms', 'nucleardawn', 'l4d2', 'insurgency', 'doi']:
+        dynamic_libs = ['libtier0_srv.so', 'libvstdlib_srv.so']
+      elif compiler.target.arch == 'x86_64' and sdk.name in ['csgo', 'blade']:
+        dynamic_libs = ['libtier0_client.so', 'libvstdlib_client.so']
+      elif sdk.name in ['l4d', 'blade', 'insurgency', 'doi', 'csgo']:
+        dynamic_libs = ['libtier0.so', 'libvstdlib.so']
+      else:
+        dynamic_libs = ['tier0_i486.so', 'vstdlib_i486.so']
+    elif compiler.target.platform == 'mac':
+      compiler.linkflags.append('-liconv')
+      dynamic_libs = ['libtier0.dylib', 'libvstdlib.dylib']
+    elif compiler.target.platform == 'windows':
+      libs = ['tier0', 'tier1', 'vstdlib', 'mathlib']
+      if sdk.name in ['swarm', 'blade', 'insurgency', 'doi', 'csgo']:
+        libs.append('interfaces')
+      for lib in libs:
+        if compiler.target.arch == 'x86':
+          lib_path = os.path.join(sdk.path, 'lib', 'public', lib) + '.lib'
+        elif compiler.target.arch == 'x86_64':
+          lib_path = os.path.join(sdk.path, 'lib', 'public', 'win64', lib) + '.lib'
+        compiler.linkflags.append(lib_path)
+
+    for library in dynamic_libs:
+      source_path = os.path.join(lib_folder, library)
+      output_path = os.path.join(binary.localFolder, library)
+
+      # Ensure the output path exists.
+      context.AddFolder(binary.localFolder)
+      output = context.AddSymlink(source_path, output_path)
+
+      compiler.weaklinkdeps += [output]
+      compiler.linkflags[0:0] = [library]
+
+    return binary
+
+  def HL2Library(self, context, compiler, name, sdk):
+    binary = self.Library(context, compiler, name)
+    self.ConfigureForExtension(context, binary.compiler)
+    return self.ConfigureForHL2(context, binary, sdk)
+
+  def HL2Project(self, context, compiler, name):
+    project = context.LibraryProject(name)
+    self.ConfigureForExtension(context, compiler)
+    return project
+
+  def HL2Config(self, project, context, compiler, name, sdk):
+    binary = project.Configure(compiler, name,
+                               '{0} - {1} {2}'.format(self.tag, sdk.name, compiler.target.arch))
+    self.AddVersioning(binary)
+    return self.ConfigureForHL2(context, binary, sdk)
+
+  def HL2ExtConfig(self, project, context, compiler, name, sdk):
+    binary = project.Configure(compiler, name,
+                               '{0} - {1} {2}'.format(self.tag, sdk.name, compiler.target.arch))
+    self.AddVersioning(binary)
+    self.ConfigureForHL2(context, binary, sdk)
+    self.ConfigureForExtension(context, binary.compiler)
+    return binary
+
+if getattr(builder, 'target', None) is not None:
+    sys.stderr.write("Your output folder was configured for AMBuild 2.1, and SourceMod is now\n")
+    sys.stderr.write("configured to use AMBuild 2.2. Please remove your output folder and\n")
+    sys.stderr.write("reconfigure to continue.\n")
+    os._exit(1)
+
+SM = ExtensionConfig()
+SM.detectSDKs()
+SM.configure()
+
+# This will clone the list and each cxx object as we recurse, preventing child
+# scripts from messing up global state.
+builder.targets = builder.CloneableList(SM.all_targets)
+
+if builder.backend == 'amb2':
+  BuildScripts = [
+    'AMBuilder',
+    'PackageScript',
+  ]
+
+builder.Build(BuildScripts, { 'SM': SM})
@@ -0,0 +1,48 @@
+# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
+import os
+
+projectName = 'a2sqcache'
+
+for cxx in builder.targets:
+  for sdk_name in SM.sdks:
+    sdk = SM.sdks[sdk_name]
+
+    if not cxx.target.arch in sdk.platformSpec[cxx.target.platform]:
+      continue
+
+    sdk.ext = "." + sdk.ext
+    if "sdk2013" in sdk.ext:
+      sdk.ext = ""
+
+    binary = SM.HL2Library(builder, cxx, projectName + ".ext" + sdk.ext, sdk)
+
+    binary.compiler.defines += [
+      'HAVE_STRING_H',
+    ]
+
+    if cxx.target.platform == 'linux':
+      cxx.postlink += ['-lpthread', '-lrt']
+    elif cxx.target.platform == 'mac':
+      cxx.cflags += ['-Wno-deprecated-declarations']
+      cxx.postlink += ['-framework', 'CoreServices']
+
+    if cxx.family == 'gcc' or cxx.family == 'clang':
+      cxx.cxxflags += ['-fno-rtti']
+    elif cxx.family == 'msvc':
+      cxx.cxxflags += ['/GR-']
+
+    binary.sources += [
+      'extension.cpp',
+      os.path.join(SM.sm_root, 'extensions', 'sm-ext-common', 'mathstubs.c'),
+      os.path.join(SM.sm_root, 'public', 'smsdk_ext.cpp'),
+      os.path.join(SM.sm_root, 'public', 'CDetour', 'detours.cpp'),
+      os.path.join(SM.sm_root, 'public', 'asm', 'asm.c'),
+      os.path.join(SM.sm_root, 'public', 'libudis86', 'decode.c'),
+      os.path.join(SM.sm_root, 'public', 'libudis86', 'itab.c'),
+      os.path.join(SM.sm_root, 'public', 'libudis86', 'syn-att.c'),
+      os.path.join(SM.sm_root, 'public', 'libudis86', 'syn-intel.c'),
+      os.path.join(SM.sm_root, 'public', 'libudis86', 'syn.c'),
+      os.path.join(SM.sm_root, 'public', 'libudis86', 'udis86.c'),
+    ]
+
+    SM.extensions += [builder.Add(binary)]
@@ -0,0 +1,233 @@
+# (C)2004-2010 SourceMod Development Team
+# Makefile written by David "BAILOPAN" Anderson
+
+###########################################
+### EDIT THESE PATHS FOR YOUR OWN SETUP ###
+###########################################
+
+SMSDK = ../..
+HL2SDK_ORIG = ../../../hl2sdk
+HL2SDK_OB = ../../../hl2sdk-ob
+HL2SDK_CSS = ../../../hl2sdk-css
+HL2SDK_OB_VALVE = ../../../hl2sdk-ob-valve
+HL2SDK_L4D = ../../../hl2sdk-l4d
+HL2SDK_L4D2 = ../../../hl2sdk-l4d2
+HL2SDK_CSGO = ../../../hl2sdk-csgo
+MMSOURCE19 = ../../../mmsource-1.9
+
+#####################################
+### EDIT BELOW FOR OTHER PROJECTS ###
+#####################################
+
+PROJECT = sample
+
+#Uncomment for Metamod: Source enabled extension
+#USEMETA = true
+
+OBJECTS = smsdk_ext.cpp extension.cpp
+
+##############################################
+### CONFIGURE ANY OTHER FLAGS/OPTIONS HERE ###
+##############################################
+
+C_OPT_FLAGS = -DNDEBUG -O3 -funroll-loops -pipe -fno-strict-aliasing
+C_DEBUG_FLAGS = -D_DEBUG -DDEBUG -g -ggdb3
+C_GCC4_FLAGS = -fvisibility=hidden
+CPP_GCC4_FLAGS = -fvisibility-inlines-hidden
+CPP = gcc
+CPP_OSX = clang
+
+##########################
+### SDK CONFIGURATIONS ###
+##########################
+
+override ENGSET = false
+
+# Check for valid list of engines
+ifneq (,$(filter original orangebox orangeboxvalve css left4dead left4dead2 csgo,$(ENGINE)))
+	override ENGSET = true
+endif
+
+ifeq "$(ENGINE)" "original"
+	HL2SDK = $(HL2SDK_ORIG)
+	CFLAGS += -DSOURCE_ENGINE=1
+endif
+ifeq "$(ENGINE)" "orangebox"
+	HL2SDK = $(HL2SDK_OB)
+	CFLAGS += -DSOURCE_ENGINE=3
+endif
+ifeq "$(ENGINE)" "css"
+	HL2SDK = $(HL2SDK_CSS)
+	CFLAGS += -DSOURCE_ENGINE=6
+endif
+ifeq "$(ENGINE)" "orangeboxvalve"
+	HL2SDK = $(HL2SDK_OB_VALVE)
+	CFLAGS += -DSOURCE_ENGINE=7
+endif
+ifeq "$(ENGINE)" "left4dead"
+	HL2SDK = $(HL2SDK_L4D)
+	CFLAGS += -DSOURCE_ENGINE=8
+endif
+ifeq "$(ENGINE)" "left4dead2"
+	HL2SDK = $(HL2SDK_L4D2)
+	CFLAGS += -DSOURCE_ENGINE=9
+endif
+ifeq "$(ENGINE)" "csgo"
+	HL2SDK = $(HL2SDK_CSGO)
+	CFLAGS += -DSOURCE_ENGINE=12
+endif
+
+HL2PUB = $(HL2SDK)/public
+
+ifeq "$(ENGINE)" "original"
+	INCLUDE += -I$(HL2SDK)/public/dlls
+	METAMOD = $(MMSOURCE19)/core-legacy
+else
+	INCLUDE += -I$(HL2SDK)/public/game/server
+	METAMOD = $(MMSOURCE19)/core
+endif
+
+OS := $(shell uname -s)
+
+ifeq "$(OS)" "Darwin"
+	LIB_EXT = dylib
+	HL2LIB = $(HL2SDK)/lib/mac
+else
+	LIB_EXT = so
+	ifeq "$(ENGINE)" "original"
+		HL2LIB = $(HL2SDK)/linux_sdk
+	else
+		HL2LIB = $(HL2SDK)/lib/linux
+	endif
+endif
+
+# if ENGINE is original or OB
+ifneq (,$(filter original orangebox,$(ENGINE)))
+	LIB_SUFFIX = _i486.$(LIB_EXT)
+else
+	LIB_PREFIX = lib
+	LIB_SUFFIX = .$(LIB_EXT)
+endif
+
+INCLUDE += -I. -I.. -Isdk -I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn
+
+ifeq "$(USEMETA)" "true"
+	LINK_HL2 = $(HL2LIB)/tier1_i486.a $(LIB_PREFIX)vstdlib$(LIB_SUFFIX) $(LIB_PREFIX)tier0$(LIB_SUFFIX)
+	ifeq "$(ENGINE)" "csgo"
+		LINK_HL2 += $(HL2LIB)/interfaces_i486.a
+	endif
+
+	LINK += $(LINK_HL2)
+
+	INCLUDE += -I$(HL2PUB) -I$(HL2PUB)/engine -I$(HL2PUB)/tier0 -I$(HL2PUB)/tier1 -I$(METAMOD) \
+		-I$(METAMOD)/sourcehook 
+	CFLAGS += -DSE_EPISODEONE=1 -DSE_DARKMESSIAH=2 -DSE_ORANGEBOX=3 -DSE_BLOODYGOODTIME=4 -DSE_EYE=5 \
+		-DSE_CSS=6 -DSE_ORANGEBOXVALVE=7 -DSE_LEFT4DEAD=8 -DSE_LEFT4DEAD2=9 -DSE_ALIENSWARM=10 \
+		-DSE_PORTAL2=11 -DSE_CSGO=12
+endif
+
+LINK += -m32 -lm -ldl
+
+CFLAGS += -DPOSIX -Dstricmp=strcasecmp -D_stricmp=strcasecmp -D_strnicmp=strncasecmp -Dstrnicmp=strncasecmp \
+	-D_snprintf=snprintf -D_vsnprintf=vsnprintf -D_alloca=alloca -Dstrcmpi=strcasecmp -DCOMPILER_GCC -Wall -Werror \
+	-Wno-overloaded-virtual -Wno-switch -Wno-unused -msse -DSOURCEMOD_BUILD -DHAVE_STDINT_H -m32
+CPPFLAGS += -Wno-non-virtual-dtor -fno-exceptions -fno-rtti
+
+################################################
+### DO NOT EDIT BELOW HERE FOR MOST PROJECTS ###
+################################################
+
+BINARY = $(PROJECT).ext.$(LIB_EXT)
+
+ifeq "$(DEBUG)" "true"
+	BIN_DIR = Debug
+	CFLAGS += $(C_DEBUG_FLAGS)
+else
+	BIN_DIR = Release
+	CFLAGS += $(C_OPT_FLAGS)
+endif
+
+ifeq "$(USEMETA)" "true"
+	BIN_DIR := $(BIN_DIR).$(ENGINE)
+endif
+
+ifeq "$(OS)" "Darwin"
+	CPP = $(CPP_OSX)
+	LIB_EXT = dylib
+	CFLAGS += -DOSX -D_OSX
+	LINK += -dynamiclib -lstdc++ -mmacosx-version-min=10.5
+else
+	LIB_EXT = so
+	CFLAGS += -D_LINUX
+	LINK += -shared
+endif
+
+IS_CLANG := $(shell $(CPP) --version | head -1 | grep clang > /dev/null && echo "1" || echo "0")
+
+ifeq "$(IS_CLANG)" "1"
+	CPP_MAJOR := $(shell $(CPP) --version | grep clang | sed "s/.*version \([0-9]\)*\.[0-9]*.*/\1/")
+	CPP_MINOR := $(shell $(CPP) --version | grep clang | sed "s/.*version [0-9]*\.\([0-9]\)*.*/\1/")
+else
+	CPP_MAJOR := $(shell $(CPP) -dumpversion >&1 | cut -b1)
+	CPP_MINOR := $(shell $(CPP) -dumpversion >&1 | cut -b3)
+endif
+
+# If not clang
+ifeq "$(IS_CLANG)" "0"
+	CFLAGS += -mfpmath=sse
+endif
+
+# Clang || GCC >= 4
+ifeq "$(shell expr $(IS_CLANG) \| $(CPP_MAJOR) \>= 4)" "1"
+	CFLAGS += $(C_GCC4_FLAGS)
+	CPPFLAGS += $(CPP_GCC4_FLAGS)
+endif
+
+# Clang >= 3 || GCC >= 4.7
+ifeq "$(shell expr $(IS_CLANG) \& $(CPP_MAJOR) \>= 3 \| $(CPP_MAJOR) \>= 4 \& $(CPP_MINOR) \>= 7)" "1"
+	CFLAGS += -Wno-delete-non-virtual-dtor
+endif
+
+# OS is Linux and not using clang
+ifeq "$(shell expr $(OS) \= Linux \& $(IS_CLANG) \= 0)" "1"
+	LINK += -static-libgcc
+endif
+
+OBJ_BIN := $(OBJECTS:%.cpp=$(BIN_DIR)/%.o)
+
+# This will break if we include other Makefiles, but is fine for now. It allows
+#  us to make a copy of this file that uses altered paths (ie. Makefile.mine)
+#  or other changes without mucking up the original.
+MAKEFILE_NAME := $(CURDIR)/$(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))
+
+$(BIN_DIR)/%.o: %.cpp
+	$(CPP) $(INCLUDE) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
+
+all: check
+	mkdir -p $(BIN_DIR)
+	ln -sf ../smsdk_ext.cpp
+	if [ "$(USEMETA)" = "true" ]; then \
+		ln -sf $(HL2LIB)/$(LIB_PREFIX)vstdlib$(LIB_SUFFIX); \
+		ln -sf $(HL2LIB)/$(LIB_PREFIX)tier0$(LIB_SUFFIX); \
+	fi
+	$(MAKE) -f $(MAKEFILE_NAME) extension
+
+check:
+	if [ "$(USEMETA)" = "true" ] && [ "$(ENGSET)" = "false" ]; then \
+		echo "You must supply one of the following values for ENGINE:"; \
+		echo "csgo, left4dead2, left4dead, css, orangeboxvalve, orangebox, or original"; \
+		exit 1; \
+	fi
+
+extension: check $(OBJ_BIN)
+	$(CPP) $(INCLUDE) $(OBJ_BIN) $(LINK) -o $(BIN_DIR)/$(BINARY)
+
+debug:
+	$(MAKE) -f $(MAKEFILE_NAME) all DEBUG=true
+
+default: all
+
+clean: check
+	rm -rf $(BIN_DIR)/*.o
+	rm -rf $(BIN_DIR)/$(BINARY)
+
@@ -0,0 +1,57 @@
+# vim: set ts=8 sts=2 sw=2 tw=99 et ft=python:
+import os
+
+# This is where the files will be output to
+# package is the default
+builder.SetBuildFolder('package')
+
+# Add any folders you need to this list
+folder_list = [
+  'addons/sourcemod/extensions',
+  'addons/sourcemod/scripting/include',
+  'addons/sourcemod/gamedata'
+]
+
+if 'x86_64' in SM.target_archs:
+  folder_list.extend([
+    'addons/sourcemod/extensions/x64',
+  ])
+
+# Create the distribution folder hierarchy.
+folder_map = {}
+for folder in folder_list:
+  norm_folder = os.path.normpath(folder)
+  folder_map[folder] = builder.AddFolder(norm_folder)
+
+# Copy binaries.
+for cxx_task in SM.extensions:
+  if cxx_task.target.arch == 'x86_64':
+    builder.AddCopy(cxx_task.binary, folder_map['addons/sourcemod/extensions/x64'])
+  else:
+    builder.AddCopy(cxx_task.binary, folder_map['addons/sourcemod/extensions'])
+
+# Do all straight-up file copies from the source tree.
+def CopyFiles(src, dest, files):
+  if not dest:
+    dest = src
+  dest_entry = folder_map[dest]
+  for source_file in files:
+    source_path = os.path.join(builder.sourcePath, src, source_file)
+    dest_path = os.path.join(dest_entry.path, source_file)
+    if not os.path.isfile(str(dest_path)):
+      builder.AddCopy(source_path, dest_entry)
+
+# Gamedata (custom so updater doesn't replace it)
+CopyFiles('addons/sourcemod/gamedata', 'addons/sourcemod/gamedata',
+  [ 'a2sqcache.games.txt' ]
+)
+
+# Include file
+CopyFiles('addons/sourcemod/scripting/include', 'addons/sourcemod/scripting/include',
+  [ 'a2sqcache.inc' ]
+)
+
+# Autoload extension
+CopyFiles('addons/sourcemod/extensions', 'addons/sourcemod/extensions',
+  [ 'a2sqcache.autoload' ]
+)
@@ -0,0 +1,171 @@
+"Games"
+{
+	"#default"
+	{
+		"#supported"
+		{
+			"engine"	"orangebox_valve"
+			"engine"	"css"
+		}
+
+		"Addresses"
+		{
+			"net_sockets"
+			{
+				"linux"
+				{
+					"signature"	"net_sockets"
+				}
+			}
+
+			"net_time"
+			{
+				"linux"
+				{
+					"signature"	"net_time"
+				}
+			}
+
+			"s_queryRateChecker"
+			{
+				"linux"
+				{
+					"signature"	"s_queryRateChecker"
+				}
+			}
+		}
+
+		"Signatures"
+		{
+			"net_sockets"
+			{
+				"library"		"engine"
+				"linux"			"@_ZL11net_sockets"
+			}
+
+			"net_time"
+			{
+				"library"		"engine"
+				"linux"			"@net_time"
+			}
+
+			"s_queryRateChecker"
+			{
+				"library"		"engine"
+				"linux"			"@_ZL18s_queryRateChecker"
+			}
+
+			"CIPRateLimit__CheckIP"
+			{
+				"library"		"engine"
+				"linux"			"@_ZN12CIPRateLimit7CheckIPE8netadr_s"
+			}
+
+			"CBaseServer__InactivateClients"
+			{
+				"library"		"engine"
+				"linux"			"@_ZN11CBaseServer17InactivateClientsEv"
+			}
+		}
+
+		"Offsets"
+		{
+			"IServer__ProcessConnectionlessPacket"
+			{
+				"windows"		"1"
+				"linux"			"2"
+			}
+		}
+	}
+
+
+	"csgo"
+	{
+		"Addresses"
+		{
+			"net_sockets"
+			{
+				"linux"
+				{
+					"signature"	"NET_ProcessSocket"
+					"read"		"31"
+				}
+			}
+
+			"net_time"
+			{
+				"linux"
+				{
+					"signature"	"CServerMsg_Ping__SendMsg"
+					"read"		"21"
+				}
+			}
+
+			"s_queryRateChecker"
+			{
+				"linux"
+				{
+					"signature"	"CheckConnectionLessRateLimits"
+					"read"		"69"
+				}
+			}
+
+			"g_sVersionString"
+			{
+				"linux"
+				{
+					"signature"	"Sys_Version"
+					"read"		"26"
+				}
+			}
+		}
+
+		"Signatures"
+		{
+			"NET_ProcessSocket"
+			{
+				"library"		"engine"
+				"linux"			"\x55\x89\xE5\x57\x56\x53\x81\xEC\x8C\x00\x00\x00\x8B\x75\x08\x89\xF0\x89\x74\x24\x04\xC1\xE0\x06\x8D\x04\xB0\x89\x45\x90\xA1\x2A\x2A\x2A\x2A"
+			}
+
+			"CServerMsg_Ping__SendMsg"
+			{
+				"library"		"engine"
+				"linux"			"\x55\x89\xE5\x56\x53\x8D\x5D\xE0\x81\xEC\xC0\x00\x00\x00\x8B\x45\x08\xF2\x0F\x10\x05\x2A\x2A\x2A\x2A\x8B\x75\x0C"
+			}
+
+			"CheckConnectionLessRateLimits"
+			{
+				"library"		"engine"
+				"linux"			"\x55\x89\xE5\x83\xEC\x68\x89\x75\xF8\x8B\x75\x08\x89\x5D\xF4\x89\x7D\xFC\x8B\x46\x1C\x85\xC0\x75\x5F\x80\x3D\x2A\x2A\x2A\x2A\x00\x0F\x84\x2A\x2A\x2A\x2A"
+			}
+
+			"CIPRateLimit__CheckIP"
+			{
+				"library"		"engine"
+				"linux"			"\x55\x89\xE5\x57\x56\x53\x81\xEC\xCC\x00\x00\x00\x8B\x5D\x08\xE8\x2A\x2A\x2A\x2A"
+			}
+
+			"Sys_Version"
+			{
+				"library"		"engine"
+				"linux"			"\x55\x89\xE5\x56\x53\x81\xEC\x20\x01\x00\x00\x0F\xB6\x5D\x08"
+			}
+
+			"CBaseServer__InactivateClients"
+			{
+				"library"		"engine"
+				"linux"			"\x55\x89\xE5\x57\x56\x53\x83\xEC\x1C\x8B\x7D\x08\x8B\xB7\x80\x02\x00\x00"
+			}
+		}
+
+		"Offsets"
+		{
+			"IServer__ProcessConnectionlessPacket"
+			{
+				"windows"		"1"
+				"linux"			"2"
+			}
+		}
+	}
+}
@@ -0,0 +1,39 @@
+# vim: set ts=2 sw=2 tw=99 noet:
+import sys
+try:
+	from ambuild2 import run, util
+except:
+	try:
+		import ambuild
+		sys.stderr.write('It looks like you have AMBuild 1 installed, but this project uses AMBuild 2.\n')
+		sys.stderr.write('Upgrade to the latest version of AMBuild to continue.\n')
+	except:
+		sys.stderr.write('AMBuild must be installed to build this project.\n')
+		sys.stderr.write('http://www.alliedmods.net/ambuild\n')
+	sys.exit(1)
+
+# Hack to show a decent upgrade message, which wasn't done until 2.2.
+ambuild_version = getattr(run, 'CURRENT_API', '2.1')
+if ambuild_version.startswith('2.1'):
+	sys.stderr.write("AMBuild 2.2 or higher is required; please update\n")
+	sys.exit(1)
+
+parser = run.BuildParser(sourcePath = sys.path[0], api='2.2')
+
+parser.options.add_argument('--hl2sdk-root', type=str, dest='hl2sdk_root', default=None,
+		                   help='Root search folder for HL2SDKs')
+parser.options.add_argument('--mms-path', type=str, dest='mms_path', default=None,
+                       help='Path to Metamod:Source')
+parser.options.add_argument('--sm-path', type=str, dest='sm_path', default=None,
+                       help='Path to SourceMod')
+parser.options.add_argument('--enable-debug', action='store_const', const='1', dest='debug',
+                       help='Enable debugging symbols')
+parser.options.add_argument('--enable-optimize', action='store_const', const='1', dest='opt',
+                       help='Enable optimization')
+parser.options.add_argument('-s', '--sdks', default='all', dest='sdks',
+                       help='Build against specified SDKs; valid args are "all", "present", or '
+                            'comma-delimited list of engine names (default: %default)')
+parser.options.add_argument('--targets', type=str, dest='targets', default=None,
+		                      help="Override the target architecture (use commas to separate multiple targets).")
+
+parser.Configure()
@@ -30,7 +30,7 @@
 */

 #include "extension.h"
-#include "convarhelper.h"
+#include "extensionHelper.h"
 #include "CDetour/detours.h"
 #include "steam/steam_gameserver.h"
 #include "sm_namehashset.h"
@@ -49,28 +49,8 @@
 #include <ihltvdirector.h>
 #include <ihltv.h>
 #include <inetchannelinfo.h>
-
-#ifdef _WIN32
-	#include <winsock2.h>
-	#include <ws2tcpip.h>
-	#pragma comment(lib, "ws2_32.lib") // Auto-link Winsock library
-#else
-	#include <sys/socket.h>
-	#include <netinet/in.h>
-#endif
-
-enum
-{
-	NS_CLIENT = 0,	// client socket
-	NS_SERVER,	// server socket
-	NS_HLTV,
-	NS_MATCHMAKING,
-	NS_SYSTEMLINK,
-#ifdef LINUX
-	NS_SVLAN,	// LAN udp port for Linux. See NET_OpenSockets for info.
-#endif
-	MAX_SOCKETS
-};
+#include <sys/socket.h>
+#include <netinet/in.h>

 size_t
 strlcpy(char *dst, const char *src, size_t dsize)
@@ -176,32 +156,6 @@ typedef struct
 #endif
 } netsocket_t;

-class CSteam3Server
-{
-public:
-	void *m_pSteamClient;
-	ISteamGameServer *m_pSteamGameServer;
-	void *m_pSteamGameServerUtils;
-	void *m_pSteamGameServerNetworking;
-	void *m_pSteamGameServerStats;
-	void *m_pSteamHTTP;
-	void *m_pSteamInventory;
-	void *m_pSteamUGC;
-	void *m_pSteamApps;
-} *g_pSteam3Server;
-
-typedef CSteam3Server *(*Steam3ServerFunc)();
-
-Steam3ServerFunc g_pSteam3ServerFunc = NULL;
-
-CSteam3Server *Steam3Server()
-{
-	if (!g_pSteam3ServerFunc)
-		return NULL;
-
-	return g_pSteam3ServerFunc();
-}
-
 CUtlVector<netsocket_t> *net_sockets;
 int g_ServerUDPSocket = 0;

@@ -302,7 +256,7 @@ void UpdateQueryCache()
 #endif

 	info.nPassword = iserver->GetPassword() ? 1 : 0;
-	info.bIsSecure = g_pSteam3Server->m_pSteamGameServer->BSecure() ? 1 : 0;
+	info.bIsSecure = true;

 	if(!(info.nNewFlags & S2A_EXTRA_DATA_HAS_STEAMID) && engine->GetGameServerSteamID())
 	{
@@ -322,7 +276,7 @@ void UpdateQueryCache()
 			IServer *ihltvserver = hltv->GetBaseServer();
 			if(ihltvserver)
 			{
-				info.iHLTVUDPPort = ihltvserver->GetLocalUDPPort();
+				info.iHLTVUDPPort = ihltvserver->GetUDPPort();
 				info.aHLTVNameLen = strlcpy(info.aHLTVName, ihltvserver->GetName(), sizeof(info.aHLTVName));
 				info.nNewFlags |= S2A_EXTRA_DATA_HAS_SPECTATOR_DATA;
 			}
@@ -462,8 +416,10 @@ void SendA2S_Info(netpacket_t * packet)
 	// Password?
 	buf.PutUnsignedChar( iserver->GetPassword() ? 1 : 0 );

+	// buf.PutUnsignedChar( Steam3Server().BSecure() ? 1 : 0 );
+
 	// Secure?
-	buf.PutUnsignedChar( g_pSteam3Server->m_pSteamGameServer->BSecure() ? 1 : 0 );
+	buf.PutUnsignedChar( 1 );

 	buf.PutString( g_QueryCache.info.aVersion );

@@ -476,7 +432,7 @@ void SendA2S_Info(netpacket_t * packet)
 	// Write the rest of the data.
 	if ( g_QueryCache.info.nNewFlags & S2A_EXTRA_DATA_HAS_GAME_PORT )
 	{
-		buf.PutShort( LittleWord( iserver->GetLocalUDPPort() ) );
+		buf.PutShort( LittleWord( iserver->GetUDPPort() ) );
 	}

 #if SOURCE_ENGINE <= SE_CSGO
@@ -648,48 +604,6 @@ bool A2SQCache::SDK_OnLoad(char *error, size_t maxlen, bool late)
 	}
 #endif

-#ifndef WIN32
-	if (!g_pGameConf->GetMemSig("Steam3Server", (void **)(&g_pSteam3ServerFunc)) || !g_pSteam3ServerFunc)
-	{
-		snprintf(error, maxlen, "Failed to find Steam3Server function.\n");
-		return false;
-	}
-#else
-	void *address;
-	if (!g_pGameConf->GetMemSig("CBaseServer__CheckMasterServerRequestRestart", &address) || !address)
-	{
-		snprintf(error, maxlen, "Failed to find CBaseServer__CheckMasterServerRequestRestart function.\n");
-		return false;
-	}
-
-	int steam3ServerFuncOffset = 0;
-	if (!g_pGameConf->GetOffset("CheckMasterServerRequestRestart_Steam3ServerFuncOffset", &steam3ServerFuncOffset) || steam3ServerFuncOffset == 0)
-	{
-		snprintf(error, maxlen, "Failed to find CheckMasterServerRequestRestart_Steam3ServerFuncOffset offset.\n");
-		return false;
-	}
-
-	//META_CONPRINTF("CheckMasterServerRequestRestart: %p\n", address);
-	address = (void *)((intptr_t)address + steam3ServerFuncOffset);
-	intptr_t offset = (intptr_t)(*(void **)address); // Get offset
-
-	g_pSteam3ServerFunc = (Steam3ServerFunc)((intptr_t)address + offset + sizeof(intptr_t));
-	//META_CONPRINTF("Steam3Server: %p\n", g_pSteam3ServerFunc);
-#endif
-
-	g_pSteam3Server = Steam3Server();
-	if (!g_pSteam3Server)
-	{
-		snprintf(error, maxlen, "Unable to get Steam3Server singleton.\n");
-		return false;
-	}
-
-	if (!g_pSteam3Server->m_pSteamGameServer)
-	{
-		snprintf(error, maxlen, "Unable to get Steam Game Server.\n");
-		return false;
-	}
-
 	CDetourManager::Init(g_pSM->GetScriptingEngine(), g_pGameConf);

 	g_Detour_CBaseServer__InactivateClients = DETOUR_CREATE_MEMBER(CBaseServer__InactivateClients, "CBaseServer__InactivateClients");
@@ -766,7 +680,8 @@ void A2SQCache::SDK_OnAllLoaded()
 		return;
 	}

-	g_ServerUDPSocket = (*net_sockets)[NS_SERVER].hUDP;
+	int socknum = 1; // NS_SERVER
+	g_ServerUDPSocket = (*net_sockets)[socknum].hUDP;

 	if(!g_ServerUDPSocket)
 	{
@@ -800,7 +715,7 @@ void A2SQCache::SDK_OnAllLoaded()
 	info.aVersionLen = snprintf(info.aVersion, sizeof(info.aVersion), "%d", engine->GetServerVersion());
 #endif

-	info.iUDPPort = iserver->GetLocalUDPPort();
+	info.iUDPPort = iserver->GetUDPPort();
 	info.nNewFlags |= S2A_EXTRA_DATA_HAS_GAME_PORT;

 	info.iGameID = info.iSteamAppID;
@@ -1,100 +0,0 @@
-"Games"
-{
-	"#default"
-	{
-		"#supported"
-		{
-			"engine"    "dods"
-			"engine"    "css"
-			"engine"    "hl2dm"
-			"engine"    "tf2"
-		}
-
-		"Addresses"
-		{
-			"net_sockets"
-			{
-				"linux"
-				{
-					"signature"	"net_sockets"
-				}
-			}
-
-			"net_time"
-			{
-				"linux"
-				{
-					"signature"	"net_time"
-				}
-			}
-
-			"s_queryRateChecker"
-			{
-				"linux"
-				{
-					"signature"	"s_queryRateChecker"
-				}
-			}
-		}
-
-		"Signatures"
-		{
-			"Steam3Server"
-			{
-				"library"       "engine"
-				"linux"         "@_Z12Steam3Serverv"
-				"linux64"       "@_Z12Steam3Serverv"
-			}
-
-			"CBaseServer__CheckMasterServerRequestRestart"
-			{
-				"library"       "engine"
-				"windows"       "\xE8\x2A\x2A\x2A\x2A\x83\x78\x04\x00\x74\x2A\xE8\x2A\x2A\x2A\x2A\x8B\x48\x04\x8B\x01\x8B\x40\x2C\xFF\xD0\x84\xC0\x74\x2A\x56"
-			}
-
-			"net_sockets"
-			{
-				"library"		"engine"
-				"linux"			"@_ZL11net_sockets"
-			}
-
-			"net_time"
-			{
-				"library"		"engine"
-				"linux"			"@net_time"
-			}
-
-			"s_queryRateChecker"
-			{
-				"library"		"engine"
-				"linux"			"@_ZL18s_queryRateChecker"
-			}
-
-			"CIPRateLimit__CheckIP"
-			{
-				"library"		"engine"
-				"linux"			"@_ZN12CIPRateLimit7CheckIPE8netadr_s"
-			}
-
-			"CBaseServer__InactivateClients"
-			{
-				"library"		"engine"
-				"linux"			"@_ZN11CBaseServer17InactivateClientsEv"
-			}
-		}
-
-		"Offsets"
-		{
-			"IServer__ProcessConnectionlessPacket"
-			{
-				"windows"		"1"
-				"linux"			"2"
-			}
-
-			"CheckMasterServerRequestRestart_Steam3ServerFuncOffset"
-			{
-				"windows"		"1"
-			}
-		}
-	}
-}
@@ -1 +0,0 @@
-1.1.2
@@ -37,12 +37,10 @@
 * @brief Contains macros for configuring basic extension information.
 */

-#include "version.h"
-
 /* Basic information exposed publicly */
 #define SMEXT_CONF_NAME			"A2SQCache"
 #define SMEXT_CONF_DESCRIPTION	"A2S_INFO + A2S_PLAYER cache"
-#define SMEXT_CONF_VERSION		SM_FULL_VERSION
+#define SMEXT_CONF_VERSION		"1.1"
 #define SMEXT_CONF_AUTHOR		"BotoX, maxime1907"
 #define SMEXT_CONF_URL			"https://git.botox.bz/CSSZombieEscape/sm-ext-A2SQCache"
 #define SMEXT_CONF_LOGTAG		"A2SQCACHE"
@@ -1,30 +0,0 @@
-# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
-import os
-
-projectName = 'a2sqcache'
-
-project = builder.LibraryProject(projectName)
-project.sources += [
-    os.path.join(Extension.ext_root, 'src', 'extension.cpp'),
-    os.path.join(Extension.sm_root, 'public', 'smsdk_ext.cpp')
-]
-
-for sdk_name in Extension.sdks:
-    sdk = Extension.sdks[sdk_name]
-    if sdk['name'] in ['mock']:
-        continue
-
-    for cxx in builder.targets:
-        if not cxx.target.arch in sdk['platforms'][cxx.target.platform]:
-            continue
-
-        binary = Extension.HL2ExtConfig(project, builder, cxx, projectName + '.ext.' + sdk['extension'], sdk)
-
-        Extension.AddCDetour(binary)
-
-        # Silence fatal errors on unrecognized Clang warning flags from CDetour
-        if cxx.family in ['gcc', 'clang']:
-            binary.compiler.cflags += ['-Wno-unknown-warning-option']
-            binary.compiler.cxxflags += ['-Wno-unknown-warning-option']
-
-Extension.extensions += builder.Add(project)
@@ -0,0 +1,103 @@
+// Microsoft Visual C++ generated resource script.
+//
+//#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "winres.h"
+
+#include <sourcemod_version.h>
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION  SM_VERSION_FILE
+ PRODUCTVERSION SM_VERSION_FILE
+ FILEFLAGSMASK 0x17L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "000004b0"
+        BEGIN
+            VALUE "Comments", "SourceMod Extension"
+            VALUE "FileDescription", "SourceMod Extension"
+            VALUE "FileVersion", SM_VERSION_STRING
+            VALUE "InternalName", "SourceMod Extension"
+            VALUE "LegalCopyright", "Copyright (c) 2004-2022, AlliedModders LLC"
+            VALUE "OriginalFilename", BINARY_NAME
+            VALUE "ProductName", "SourceMod Extension"
+            VALUE "ProductVersion", SM_VERSION_STRING
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x0, 1200
+    END
+END
+
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE 
+BEGIN
+    "#include ""winres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED