supastishn
diff --git a/‎.github/workflows/generate-definitions.yml‎
Lines changed: 59 additions & 0 deletions b/‎.github/workflows/generate-definitions.yml‎
Lines changed: 59 additions & 0 deletions
diff --git a/‎.github/workflows/sync-theme-repo.yml‎
Lines changed: 114 additions & 0 deletions b/‎.github/workflows/sync-theme-repo.yml‎
Lines changed: 114 additions & 0 deletions
diff --git a/‎build.gradle.kts‎
Lines changed: 5 additions & 0 deletions b/‎build.gradle.kts‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎src-theme/.github/workflows/build.yml‎
Lines changed: 77 additions & 0 deletions b/‎src-theme/.github/workflows/build.yml‎
Lines changed: 77 additions & 0 deletions
diff --git a/‎src-theme/public/backgrounds/background.frag‎
Lines changed: 97 additions & 0 deletions b/‎src-theme/public/backgrounds/background.frag‎
Lines changed: 97 additions & 0 deletions
diff --git a/‎src-theme/public/backgrounds/background.png‎
483 KB b/‎src-theme/public/backgrounds/background.png‎
483 KB
diff --git a/‎src-theme/public/components/armoritems.json‎
Lines changed: 11 additions & 0 deletions b/‎src-theme/public/components/armoritems.json‎
Lines changed: 11 additions & 0 deletions
diff --git a/‎src-theme/public/components/arraylist.json‎
Lines changed: 11 additions & 0 deletions b/‎src-theme/public/components/arraylist.json‎
Lines changed: 11 additions & 0 deletions
diff --git a/‎src-theme/public/components/blockcounter.json‎
Lines changed: 11 additions & 0 deletions b/‎src-theme/public/components/blockcounter.json‎
Lines changed: 11 additions & 0 deletions
@@ -0,0 +1,59 @@
+name: Generate TypeScript Definitions
+
+on:
+  workflow_dispatch:
+  release:
+    types: [published]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+
+      - name: Set up JDK
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '21'
+
+      - name: Create Mods Directory
+        run: mkdir -p run/mods
+
+      - name: Download ts-generator
+        run: |
+          mkdir -p run/LiquidBounce/scripts
+          LATEST_RELEASE_URL=$(curl -s https://api.github.com/repos/CCBlueX/ts-generator/releases/latest | jq -r '.assets[] | select(.name | endswith(".zip")) | .browser_download_url')
+          curl -L $LATEST_RELEASE_URL -o run/LiquidBounce/scripts/ts-generator.zip
+          unzip run/LiquidBounce/scripts/ts-generator.zip -d run/LiquidBounce/scripts/
+          # Look specifically for the main jar file (excluding source jars)
+          find run/LiquidBounce/scripts/ -name "*.jar" -not -name "*-sources.jar" -not -name "*-src.jar" -exec mv {} run/LiquidBounce/scripts/ts-generator.jar \; || echo "Main JAR file not found in the zip, check contents"
+
+      - name: Copy ts-defgen.js to LiquidBounce scripts
+        run: |
+          cp ts-defgen.js run/LiquidBounce/scripts/
+
+      - name: Install Xvfb
+        run: sudo apt-get install -y xvfb
+
+      - name: Run LiquidBounce with Gradle
+        env:
+          SCRIPT_TYPEGEN_BUILD: "true"  # Set the CI_BUILD flag to auto-execute ts-defgen
+          SKIP_BROWSER: "true"
+        run: |
+          chmod +x ./gradlew
+          timeout 60m xvfb-run --auto-servernum --server-args="-screen 0 1280x720x24" ./gradlew runClient -Dfabric.headless=true || exit 0
+
+      - name: Upload TypeScript Definitions
+        uses: actions/upload-artifact@v4
+        with:
+          name: 'liquidbounce-script-api'
+          path: run/LiquidBounce/scripts/@ccbluex/liquidbounce-script-api/
+
+      - name: Publish to NPM
+        uses: JS-DevTools/npm-publish@v3
+        with:
+          token: ${{ secrets.NPM_TOKEN }}
+          package: run/LiquidBounce/scripts/@ccbluex/liquidbounce-script-api/package.json
+          access: public
@@ -0,0 +1,114 @@
+name: Sync LiquidBounce Theme Repository
+
+on:
+  push:
+    branches:
+      - nextgen
+    paths:
+      - 'src-theme/**'
+  workflow_dispatch:
+
+jobs:
+  sync-theme:
+    runs-on: ubuntu-latest
+    
+    steps:
+    - name: Checkout main repository
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+        token: ${{ secrets.LIQUIDBOUNCE_PAT }}
+
+    - name: Check if src-theme directory exists
+      run: |
+        if [ ! -d "src-theme" ]; then
+          echo "Error: src-theme directory not found"
+          exit 1
+        fi
+
+    - name: Setup theme repository
+      run: |
+        # Try to clone the existing repository, or create a new one
+        if git clone https://x-access-token:${{ secrets.LIQUIDBOUNCE_PAT }}@github.com/${{ github.repository_owner }}/liquidbounce-theme.git theme-repo 2>/dev/null; then
+          echo "Existing repository cloned successfully"
+          cd theme-repo
+          
+          # Ensure we're on main branch (handle master -> main migration)
+          if git branch -r | grep -q "origin/main"; then
+            git checkout main 2>/dev/null || git checkout -b main
+          elif git branch -r | grep -q "origin/master"; then
+            git checkout master
+            git checkout -b main
+            git push -u origin main
+          else
+            git checkout -b main
+          fi
+        else
+          echo "Repository doesn't exist or is empty, creating new structure"
+          mkdir theme-repo
+          cd theme-repo
+          git init
+          git checkout -b main
+          
+          # Set up remote
+          git remote add origin https://x-access-token:${{ secrets.LIQUIDBOUNCE_PAT }}@github.com/${{ github.repository_owner }}/liquidbounce-theme.git
+        fi
+
+    - name: Copy theme files
+      run: |
+        cd theme-repo
+        
+        # Remove all existing files (except .git)
+        find . -mindepth 1 -maxdepth 1 ! -name '.git' -exec rm -rf {} +
+        
+        # Copy new files
+        cp -r ../src-theme/* .
+        
+        # Copy hidden files if they exist
+        if ls ../src-theme/.[!.]* 1> /dev/null 2>&1; then
+          cp -r ../src-theme/.[!.]* .
+        fi
+
+    - name: Configure Git
+      run: |
+        cd theme-repo
+        git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
+        git config --local user.name "github-actions[bot]"
+
+    - name: Commit and push changes
+      run: |
+        cd theme-repo
+        
+        # Get the main repository commit info
+        MAIN_COMMIT_SHA="${{ github.sha }}"
+        MAIN_COMMIT_SHORT_SHA=$(echo "$MAIN_COMMIT_SHA" | cut -c1-7)
+        MAIN_COMMIT_MSG=$(git -C ../ log -1 --pretty=format:"%s" $MAIN_COMMIT_SHA)
+        MAIN_REPO_NAME="${{ github.repository }}"
+        MAIN_REPO_URL="https://github.com/${{ github.repository }}"
+        
+        # Create commit message with recognizable header
+        COMMIT_MSG="sync: ${MAIN_REPO_NAME}@${MAIN_COMMIT_SHORT_SHA}
+        
+        Source commit: ${MAIN_COMMIT_SHA}
+        Source repository: ${MAIN_REPO_URL}
+        Original commit message: ${MAIN_COMMIT_MSG}
+        
+        Auto-synced on $(date -u '+%Y-%m-%d %H:%M:%S UTC')"
+        
+        git add .
+        
+        # Only commit and push if there are changes or if this is the first commit
+        if ! git diff --staged --quiet || [ ! -f .git/refs/heads/main ]; then
+          git commit -m "$COMMIT_MSG"
+          git push -u origin main
+          echo "Changes committed and pushed"
+        else
+          echo "No changes detected, skipping commit"
+        fi
+
+    - name: Create summary
+      run: |
+        echo "Theme repository sync completed!" >> $GITHUB_STEP_SUMMARY
+        echo "- Source commit: ${{ github.sha }}" >> $GITHUB_STEP_SUMMARY
+        echo "- Files synced from: src-theme/" >> $GITHUB_STEP_SUMMARY
+        echo "- Target repository: ${{ github.repository_owner }}/liquidbounce-theme" >> $GITHUB_STEP_SUMMARY
@@ -396,6 +396,11 @@ kotlin {
     compilerOptions {
         suppressWarnings = true
         jvmToolchain(21)
+        freeCompilerArgs.addAll(listOf(
+            "-opt-in=kotlin.ExperimentalStdlibApi",
+            "-opt-in=kotlin.contracts.ExperimentalContracts",
+            "-Xexplicit-backing-fields"
+        ))
     }
 }
 
 
@@ -0,0 +1,77 @@
+name: Build
+on:
+  push:
+    branches:
+      - main
+
+permissions:
+  contents: write
+
+env:
+  ZIP_NAME: theme            # Name for the distribution archive
+  MARKETPLACE_ITEM_ID: 12345        # Replace with your actual marketplace item ID
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '18'
+          cache: 'npm'
+
+      - name: Install dependencies
+        run: npm install
+
+      - name: Build project
+        run: npm run build
+
+      - name: Create dist archive
+        run: zip -r ${{ env.ZIP_NAME }}.zip dist/
+
+      - name: Upload build artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ env.ZIP_NAME }}
+          path: ${{ env.ZIP_NAME }}.zip
+
+      - name: Generate version tag
+        id: version_tag
+        run: |
+          COMMIT_HASH=$(git rev-parse --short HEAD)
+          TAG="build-$COMMIT_HASH-$(date +'%Y%m%d%H%M%S')"
+          echo "version=$TAG" >> $GITHUB_OUTPUT
+
+      # Uncomment the sections below to enable GitHub releases and marketplace publishing
+      #
+      # - name: Create and push Git tag
+      #   run: |
+      #     git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
+      #     git config --local user.name "github-actions[bot]"
+      #     git tag ${{ steps.version_tag.outputs.version }}
+      #     git push origin ${{ steps.version_tag.outputs.version }}
+      #
+      # - name: Upload to GitHub Release
+      #   uses: softprops/action-gh-release@v1
+      #   with:
+      #     files: ${{ env.ZIP_NAME }}.zip
+      #     tag_name: ${{ steps.version_tag.outputs.version }}
+      #     prerelease: true
+      #     name: "Build Release ${{ steps.version_tag.outputs.version }}"
+      #
+      # - name: Upload to LiquidBounce Marketplace
+      #   run: |
+      #     curl -X POST \
+      #       "https://api.liquidbounce.net/api/v3/marketplace/${{ env.MARKETPLACE_ITEM_ID }}/revisions" \
+      #       -H "Authorization: Bearer ${{ secrets.API_TOKEN }}" \
+      #       -F "file=@${{ env.ZIP_NAME }}.zip" \
+      #       -F "version=${{ steps.version_tag.outputs.version }}" \
+      #       -F "changelog=Automated build from commit ${{ github.sha }}" \
+      #       -F "channel=alpha" \
+      #       --fail-with-body
@@ -0,0 +1,97 @@
+#version 330
+
+// Uniforms
+uniform float time;
+uniform vec2 resolution;
+
+// Output color
+out vec4 fragColor;
+
+// Simple hash function
+float hash(float n) {
+    return fract(sin(n) * 43758.5453);
+}
+
+// 2D noise function
+float noise(vec2 p) {
+    vec2 i = floor(p);
+    vec2 f = fract(p);
+    vec2 u = f * f * (3.0 - 2.0 * f);
+    return mix(
+    mix(hash(i.x + hash(i.y)), hash(i.x + 1.0 + hash(i.y)), u.x),
+    mix(hash(i.x + hash(i.y + 1.0)), hash(i.x + 1.0 + hash(i.y + 1.0)), u.x),
+    u.y
+    );
+}
+
+// Mountain range function
+float mountainRange(vec2 uv) {
+    float mountainHeight = 0.0;
+    float frequency = 2.0;
+    float amplitude = 0.5;
+    for (int i = 0; i < 5; i++) {
+        mountainHeight += noise(uv * frequency) * amplitude;
+        frequency *= 2.0;
+        amplitude *= 0.5;
+    }
+    return mountainHeight;
+}
+
+// Aurora layer function
+vec3 auroraLayer(vec2 uv, float speed, float intensity, vec3 color) {
+    float t = time * speed;
+    vec2 scaleXY = vec2(2.0, 2.0);
+    vec2 movement = vec2(2.0, -2.0);
+    vec2 p = uv * scaleXY + t * movement;
+    float n = noise(p + noise(color.xy + p + t));
+
+    float topEdgeSharpness = 0.0; // The smaller this value, the crisper the edge
+    float bottomFadeOut = 0.3;   // The higher this value, the more solid the aurora appears
+    float aurora = smoothstep(0.0, topEdgeSharpness, n - uv.y) * (1.0 - smoothstep(0.0, bottomFadeOut, n - uv.y));
+
+    aurora = (n - uv.y * 0.6);
+
+    return aurora * intensity * color * 0.5;
+}
+
+// Main image function
+void mainImage(out vec4 fragColor, in vec2 fragCoord) {
+    vec2 uv = fragCoord / resolution.xy;
+    uv.x *= resolution.x / resolution.y;
+
+    // Create multiple aurora layers with varying colors, speeds, and intensities
+    vec3 color = vec3(0.0);
+    color += auroraLayer(uv, 0.05, 0.3, vec3(0.0, 1.0, 0.3));
+    color += auroraLayer(uv, 0.1, 0.4, vec3(0.1, 0.5, 0.9));
+    color += auroraLayer(uv, 0.15, 0.3, vec3(0.4, 0.1, 0.8));
+    color += auroraLayer(uv, 0.07, 0.2, vec3(0.8, 0.1, 0.6));
+
+    vec3 skyColor1 = vec3(0.2, 0.0, 0.4);
+    vec3 skyColor2 = vec3(0.15, 0.2, 0.35);
+    // Add a gradient to simulate the night sky
+    color += skyColor2 * (1.0 - smoothstep(1.0, 1.0, uv.y));
+    color += skyColor1 * (1.0 - smoothstep(0.0, 0.5, uv.y));
+
+    int numLayers = 5;
+    for (int i = 0; i < numLayers; i++) {
+        // Calculate the height of the mountain range
+        float height = float(numLayers - i) * 0.1 *
+        smoothstep(1.0, 0.0,
+        mountainRange(
+        vec2(time * 0.03 * (float(i) + 1.0) + float(i) * 4.0, 0.0)
+        + uv * vec2(1.0 + float(numLayers - i) * 0.05, 0.23)
+        ));
+
+        // Create the black silhouette of the mountain range
+        float mountain = smoothstep(0.0, 0.0, height - uv.y);
+
+        // Combine the mountain range and sky
+        color = mix(color, skyColor2 * float(numLayers - i) / 4.0, mountain);
+    }
+
+    fragColor = vec4(color, 1.0);
+}
+
+void main() {
+    mainImage(fragColor, gl_FragCoord.xy);
+}
@@ -0,0 +1,11 @@
+{
+  "name": "ArmorItems",
+  "enabled": false,
+  "singleton": true,
+  "alignment": {
+    "horizontalAlignment": "CenterTranslated",
+    "horizontalOffset": 225,
+    "verticalAlignment": "Bottom",
+    "verticalOffset": 15
+  }
+}
@@ -0,0 +1,11 @@
+{
+  "name": "ArrayList",
+  "enabled": true,
+  "singleton": true,
+  "alignment": {
+    "horizontalAlignment": "Right",
+    "horizontalOffset": 0,
+    "verticalAlignment": "Top",
+    "verticalOffset": 0
+  }
+}
@@ -0,0 +1,11 @@
+{
+  "name": "BlockCounter",
+  "enabled": true,
+  "singleton": true,
+  "alignment": {
+    "horizontalAlignment": "Center",
+    "horizontalOffset": -20,
+    "verticalAlignment": "CenterTranslated",
+    "verticalOffset": 0
+  }
+}
Original file line number	Diff line number	Diff line change
`@@ -396,6 +396,11 @@ kotlin {`
`396`	`396`	`compilerOptions {`
`397`	`397`	`suppressWarnings = true`
`398`	`398`	`jvmToolchain(21)`
	`399`	`+ freeCompilerArgs.addAll(listOf(`
	`400`	`+ "-opt-in=kotlin.ExperimentalStdlibApi",`
	`401`	`+ "-opt-in=kotlin.contracts.ExperimentalContracts",`
	`402`	`+ "-Xexplicit-backing-fields"`
	`403`	`+ ))`
`399`	`404`	`}`
`400`	`405`	`}`
`401`	`406`