Sync upstream changes from GregHib/void as of 2025-05-30

[Tyluur]

Automation script:

import datetime
import sys

def run(cmd, check=True):
    print(f"> {cmd}")
    subprocess.run(cmd, shell=True, check=check)

def branch_exists(branch_name):
    result = subprocess.run(
        f"git rev-parse --verify {branch_name}", shell=True, capture_output=True
    )
    return result.returncode == 0

def main():
    date_str = datetime.datetime.now().strftime("%Y-%m-%d")
    sync_branch = f"sync/void-{date_str}"

    try:
        # Step 1: Ensure we're in a git repo
        run("git status")

        # Step 2: Add upstream if not already added
        result = subprocess.run("git remote get-url upstream", shell=True)
        if result.returncode != 0:
            run("git remote add upstream https://github.com/GregHib/void.git")

        # Step 3: Fetch upstream changes
        run("git fetch upstream")

        # Step 4: Create a new sync branch
        if branch_exists(sync_branch):
            print(f"Branch {sync_branch} already exists. Please delete or use another name.")
            sys.exit(1)

        run(f"git checkout -b {sync_branch}")

        # Step 5: Merge upstream/main into the new branch
        print(f"🔄 Merging upstream/main into {sync_branch}...")
        merge_result = subprocess.run("git merge upstream/main", shell=True)
        if merge_result.returncode != 0:
            print("⚠️ Merge conflict detected. Please resolve it manually, then run:")
            print("   git add . && git commit")
        else:
            print("✅ Merge successful.")

        # Step 6: Final reminder
        print(f"\n✅ Branch `{sync_branch}` created and synced with upstream/main.")
        print("➡️  Next: test the server locally, then push and open a PR.")
        print(f"   git push origin {sync_branch}")

    except subprocess.CalledProcessError as e:
        print(f"❌ Error during execution: {e}")
        sys.exit(1)

if __name__ == "__main__":
    main()

[Tyluur]

✅ upstream sync success — GregHib/void → 2011Scape

🚢 ship teles
🐉 brimhaven dungeon (metal + leather dragons, vine, saniboch)
🔥 fire giant data (anims, drops, sounds, npcs)
🐺 expanded animal definitions (dog, rat, wolf, monkey)
🧌 demon + dragon family overhaul (drops, anims, sounds)
🛠️ new charter ship system (scripts, teles, prices, ifaces)
🧪 additional test coverage (e.g. CharterShipTest.kt)
🧾 drop table refactor (DropTables.kt)
📜 ~2.5K insertions across 139 files

All changes verified to cleanly merge using the ort strategy. No merge conflicts.
Branch: sync/void-2025-05-30
Merge Date: May 30, 2025
Script used: sync_from_upstream.py