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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Migrate to Svelte for frontend by Telesphoreo · Pull Request #13 · plexusorg/Module-HTTPD · GitHub
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Migrate to Svelte for frontend by Telesphoreo · Pull Request #13 · plexusorg/Module-HTTPD · GitHub
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Migrate to Svelte for frontend by Telesphoreo · Pull Request #13 · plexusorg/Module-HTTPD · GitHub
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' Migrate to Svelte for frontend by Telesphoreo · Pull Request #13 · plexusorg/Module-HTTPD · GitHub
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Migrate to Svelte for frontend by Telesphoreo · Pull Request #13 · plexusorg/Module-HTTPD · GitHub
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); })(); Migrate to Svelte for frontend by Telesphoreo · Pull Request #13 · plexusorg/Module-HTTPD · GitHub
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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