Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,9 @@ jobs:
distribution: temurin
java-version: 25
cache: gradle
- name: Set up Bun
uses: oven-sh/setup-bun@v2
with:
bun-version: latest
- name: Build with Gradle
run: chmod a+x gradlew && ./gradlew build --no-daemon
run: chmod a+x gradlew && ./gradlew build --no-daemon
10 changes: 5 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,7 @@
*.iml
/target/
/src/main/resources/build.properties
/src/main/resources/httpd/assets/textures/
/src/main/resources/httpd/assets/models/
/src/main/resources/httpd/assets/items/
/src/main/resources/httpd/assets/.minecraft-version
/src/main/frontend/node_modules/

# OS
.DS_Store
Expand All @@ -21,4 +18,7 @@ Thumbs.db
/.gradle/

# Decompiled Minecraft sources (downloaded by scripts/download-minecraft-source.ps1)
/minecraft-source/
/minecraft-source/

# Local mirror of the runtime HTTPD Minecraft asset cache
/minecraft-assets/
51 changes: 40 additions & 11 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@ repositories {
}
}

sourceSets {
main {
resources.srcDir(layout.buildDirectory.dir("generated/frontend-resources"))
}
}

dependencies {
implementation("org.projectlombok:lombok:1.18.46")
annotationProcessor("org.projectlombok:lombok:1.18.46")
Expand All @@ -46,17 +52,41 @@ dependencies {
implementation("commons-io:commons-io:2.22.0")
}

val frontendDir = layout.projectDirectory.dir("src/main/frontend")
val frontendOutputDir = layout.buildDirectory.dir("generated/frontend-resources/httpd/app")

tasks.register<Exec>("bunInstallFrontend") {
workingDir = frontendDir.asFile
commandLine("bun", "install", "--frozen-lockfile")
inputs.files(
frontendDir.file("package.json"),
frontendDir.file("bun.lock")
)
outputs.dir(frontendDir.dir("node_modules"))
}

tasks.register<Exec>("buildFrontend") {
workingDir = frontendDir.asFile
commandLine("bun", "run", "build")
dependsOn("bunInstallFrontend")
inputs.dir(frontendDir.dir("src"))
inputs.files(
frontendDir.file("index.html"),
frontendDir.file("vite.config.ts"),
frontendDir.file("svelte.config.js"),
frontendDir.file("tsconfig.json"),
frontendDir.file("tsconfig.node.json"),
frontendDir.file("components.json"),
frontendDir.file("package.json"),
frontendDir.file("bun.lock")
)
outputs.dir(frontendOutputDir)
}

tasks.getByName<Jar>("jar") {
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
archiveBaseName.set("Module-HTTPD")
archiveVersion.set("")
from("src/main/resources") {
exclude("dev/**")
exclude("httpd/assets/textures/**")
exclude("httpd/assets/models/**")
exclude("httpd/assets/items/**")
exclude("httpd/assets/.minecraft-version")
}
}

java {
Expand All @@ -71,11 +101,10 @@ tasks {
options.encoding = Charsets.UTF_8.name()
}
processResources {
dependsOn("buildFrontend")
filteringCharset = Charsets.UTF_8.name()
exclude("httpd/assets/textures/**")
exclude("httpd/assets/models/**")
exclude("httpd/assets/items/**")
exclude("httpd/assets/.minecraft-version")
exclude("dev/**")
exclude("httpd/assets/**")
}
}

Expand Down
14 changes: 9 additions & 5 deletions scripts/download-minecraft-assets.ps1
Original file line number Diff line number Diff line change
@@ -1,18 +1,22 @@
param(
[string]$Version = ""
[string]$Version = "",
[string]$AssetRoot = ""
)

# Downloads the vanilla Minecraft assets used by the HTTPD live inventory view
# into src/main/resources/httpd/assets for local development.
# into the same minecraft-assets cache layout used by the running module.
#
# Usage:
# ./scripts/download-minecraft-assets.ps1 # latest release
# ./scripts/download-minecraft-assets.ps1 1.21.10 # specific version
# ./scripts/download-minecraft-assets.ps1 26.1.2 # specific version
# ./scripts/download-minecraft-assets.ps1 -AssetRoot "plugins/Plex/modules/<HTTPD module>/minecraft-assets"

$ErrorActionPreference = "Stop"

$ProjectRoot = Resolve-Path (Join-Path $PSScriptRoot "..")
$AssetRoot = Join-Path $ProjectRoot "src/main/resources/httpd/assets"
if ([string]::IsNullOrWhiteSpace($AssetRoot)) {
$AssetRoot = if ($env:PLEX_HTTPD_ASSET_ROOT) { $env:PLEX_HTTPD_ASSET_ROOT } else { Join-Path $ProjectRoot "minecraft-assets" }
}
$ManifestUrl = "https://piston-meta.mojang.com/mc/game/version_manifest_v2.json"

$manifest = Invoke-RestMethod -Uri $ManifestUrl -TimeoutSec 30
Expand Down Expand Up @@ -76,7 +80,7 @@ try {
$zip.Dispose()
}

Set-Content -Path (Join-Path $AssetRoot ".minecraft-version") -Value $Version -Encoding UTF8
Set-Content -Path (Join-Path $AssetRoot "version.txt") -Value $Version -Encoding UTF8
Write-Host "Extracted $extracted files to $AssetRoot"
}
finally {
Expand Down
9 changes: 5 additions & 4 deletions scripts/download-minecraft-assets.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,16 @@
set -eu

# Downloads the vanilla Minecraft assets used by the HTTPD live inventory view
# into src/main/resources/httpd/assets for local development.
# into the same minecraft-assets cache layout used by the running module.
#
# Usage:
# ./scripts/download-minecraft-assets.sh # latest release
# ./scripts/download-minecraft-assets.sh 1.21.10 # specific version
# ./scripts/download-minecraft-assets.sh 26.1.2 # specific version
# ./scripts/download-minecraft-assets.sh 26.1.2 "plugins/Plex/modules/<HTTPD module>/minecraft-assets"

VERSION="${1:-}"
PROJECT_ROOT="$(CDPATH= cd -- "$(dirname -- "$0")/.." && pwd)"
ASSET_ROOT="$PROJECT_ROOT/src/main/resources/httpd/assets"
ASSET_ROOT="${2:-${PLEX_HTTPD_ASSET_ROOT:-$PROJECT_ROOT/minecraft-assets}}"

python3 - "$VERSION" "$ASSET_ROOT" <<'PY'
import json
Expand Down Expand Up @@ -71,6 +72,6 @@ with tempfile.TemporaryDirectory() as tmp:
shutil.copyfileobj(source, out)
extracted += 1

(asset_root / ".minecraft-version").write_text(version + "\n", encoding="utf-8")
(asset_root / "version.txt").write_text(version + "\n", encoding="utf-8")
print(f"Extracted {extracted} files to {asset_root}")
PY
4 changes: 2 additions & 2 deletions scripts/download-minecraft-source.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ function Download-IfMissing($Url, $Target) {
Invoke-WebRequest -Uri $Url -OutFile $Target -TimeoutSec 600
}

# Resolve version (explicit > cached > latest)
# Resolve version (explicit > local debug asset cache > latest)
$manifest = Invoke-RestMethod -Uri $ManifestUrl -TimeoutSec 30
if ([string]::IsNullOrWhiteSpace($Version)) {
$cachedFile = Join-Path $ProjectRoot "src/main/resources/httpd/assets/.minecraft-version"
$cachedFile = Join-Path $ProjectRoot "minecraft-assets/version.txt"
if (Test-Path $cachedFile) {
$Version = (Get-Content $cachedFile -Raw).Trim()
} else {
Expand Down
Loading