diff --git a/.github/workflows/integrations.yml b/.github/workflows/integrations.yml index f2616ac..39b66ec 100644 --- a/.github/workflows/integrations.yml +++ b/.github/workflows/integrations.yml @@ -11,7 +11,7 @@ on: inputs: version: type: string - default: '0.1.0' + default: '0.4.0' permissions: contents: read @@ -29,7 +29,7 @@ jobs: - uses: gradle/actions/setup-gradle@v4 with: gradle-version: '8.10.2' - - run: gradle -p integrations :common:test :paper:build -PreleaseVersion="${{ inputs.version || '0.1.0' }}" + - run: gradle -p integrations :common:test :paper:build -PreleaseVersion="${{ inputs.version || '0.4.0' }}" - uses: actions/upload-artifact@v4 with: name: server-paper @@ -63,10 +63,10 @@ jobs: - uses: gradle/actions/setup-gradle@v4 with: gradle-version: ${{ matrix.mc.gradle }} - - run: gradle -p integrations -Ploader=${{ matrix.loader }} -PmcVersion=${{ matrix.mc.version }} -PreleaseVersion="${{ inputs.version || '0.1.0' }}" :${{ matrix.loader }}:build + - run: gradle -p integrations -Ploader=${{ matrix.loader }} -PmcVersion=${{ matrix.mc.version }} -PreleaseVersion="${{ inputs.version || '0.4.0' }}" :${{ matrix.loader }}:build - name: Audit Fabric hooks during server bootstrap (no world startup) if: matrix.loader == 'fabric' - run: gradle -p integrations -Ploader=fabric -PmcVersion=${{ matrix.mc.version }} -PreleaseVersion="${{ inputs.version || '0.1.0' }}" -PverifyMixins=true :fabric:runServer + run: gradle -p integrations -Ploader=fabric -PmcVersion=${{ matrix.mc.version }} -PreleaseVersion="${{ inputs.version || '0.4.0' }}" -PverifyMixins=true :fabric:runServer - uses: actions/upload-artifact@v4 with: name: server-${{ matrix.loader }}-${{ matrix.mc.version }} diff --git a/Cargo.lock b/Cargo.lock index b2bf4b2..50d35ac 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3902,7 +3902,7 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "scopenet-core" -version = "0.1.0" +version = "0.4.0" dependencies = [ "anyhow", "base64 0.22.1", @@ -3924,7 +3924,7 @@ dependencies = [ [[package]] name = "scopenet-launcher" -version = "0.1.0" +version = "0.4.0" dependencies = [ "anyhow", "base64 0.22.1", @@ -3950,7 +3950,7 @@ dependencies = [ [[package]] name = "scopenet-panel" -version = "0.1.0" +version = "0.4.0" dependencies = [ "anyhow", "argon2", @@ -3985,7 +3985,7 @@ dependencies = [ [[package]] name = "scopenet-shared" -version = "0.1.0" +version = "0.4.0" dependencies = [ "md-5", "serde", diff --git a/Cargo.toml b/Cargo.toml index c7a8a40..b8c133c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ resolver = "2" members = ["crates/shared", "crates/core", "panel/server", "launcher/src-tauri"] [workspace.package] -version = "0.1.0" +version = "0.4.0" edition = "2021" repository = "https://github.com/scopeddlol/SCOPENET-MC" diff --git a/integrations/build.gradle b/integrations/build.gradle index 9f83fb1..34ead02 100644 --- a/integrations/build.gradle +++ b/integrations/build.gradle @@ -1,6 +1,6 @@ allprojects { group = 'net.scopenet' - version = providers.gradleProperty('releaseVersion').getOrElse('0.1.0') + version = providers.gradleProperty('releaseVersion').getOrElse('0.4.0') repositories { mavenCentral() } } subprojects { diff --git a/integrations/fabric/build.gradle b/integrations/fabric/build.gradle index 9773cf0..60f5e67 100644 --- a/integrations/fabric/build.gradle +++ b/integrations/fabric/build.gradle @@ -1,6 +1,6 @@ plugins { id 'fabric-loom' version '1.8.13' } -def mc = providers.gradleProperty('mcVersion').getOrElse('1.21.1') -if (!(mc in ['1.20.1', '1.21.1'])) throw new GradleException('Use the modern build for 26.x') +def mc = (providers.gradleProperty('mcVersion').orNull ?: project.findProperty('mcVersion') ?: '1.21.1').toString().trim() +if (!['1.20.1', '1.21.1'].contains(mc)) throw new GradleException("Use the modern build for 26.x (got '${mc}')") def targetJava = mc == '1.20.1' ? 17 : 21 loom { mixin { defaultRefmapName = 'scopenet.refmap.json' } } if (providers.gradleProperty('verifyMixins').isPresent()) { diff --git a/integrations/fabric/modern.gradle b/integrations/fabric/modern.gradle index a4e2315..c3eda31 100644 --- a/integrations/fabric/modern.gradle +++ b/integrations/fabric/modern.gradle @@ -1,5 +1,5 @@ plugins { id 'net.fabricmc.fabric-loom' version '1.17.17' } -def mc = providers.gradleProperty('mcVersion').get() +def mc = (providers.gradleProperty('mcVersion').orNull ?: project.findProperty('mcVersion') ?: '26.1.2').toString().trim() if (providers.gradleProperty('verifyMixins').isPresent()) { loom { runs { server { vmArg '-Dscopenet.verifyMixins=true' } } } } diff --git a/integrations/forge/build.gradle b/integrations/forge/build.gradle index 865a9c6..f48a25d 100644 --- a/integrations/forge/build.gradle +++ b/integrations/forge/build.gradle @@ -17,9 +17,9 @@ repositories { filter { includeGroup 'org.lwjgl' } } } -def mc = providers.gradleProperty('mcVersion').getOrElse('1.21.1') +def mc = (providers.gradleProperty('mcVersion').orNull ?: project.findProperty('mcVersion') ?: '1.21.1').toString().trim() def forgeVersions = ['1.20.1': '47.4.10', '1.21.1': '52.1.0'] -if (!forgeVersions.containsKey(mc)) throw new GradleException('Unsupported Minecraft version') +if (!forgeVersions.containsKey(mc)) throw new GradleException("Unsupported Minecraft version '${mc}'") java.sourceCompatibility = JavaVersion.toVersion(mc == '1.20.1' ? 17 : 21) java.targetCompatibility = java.sourceCompatibility minecraft { mappings channel: 'official', version: mc } diff --git a/integrations/forge/modern.gradle b/integrations/forge/modern.gradle index a42aaf2..d73ef1e 100644 --- a/integrations/forge/modern.gradle +++ b/integrations/forge/modern.gradle @@ -1,5 +1,5 @@ plugins { id 'net.minecraftforge.gradle' version '7.0.17' } -def mc = providers.gradleProperty('mcVersion').get() +def mc = (providers.gradleProperty('mcVersion').orNull ?: project.findProperty('mcVersion') ?: '26.1.2').toString().trim() def forgeVersions = ['26.1.2': '64.1.0', '26.2': '65.1.0', '26.3': '66.0.6'] java.sourceCompatibility = JavaVersion.VERSION_25 java.targetCompatibility = JavaVersion.VERSION_25 diff --git a/integrations/gradle/wrapper/gradle-wrapper.jar b/integrations/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..a4b76b9 Binary files /dev/null and b/integrations/gradle/wrapper/gradle-wrapper.jar differ diff --git a/integrations/gradle/wrapper/gradle-wrapper.properties b/integrations/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..7e7d24f --- /dev/null +++ b/integrations/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.0-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/integrations/gradlew b/integrations/gradlew new file mode 100644 index 0000000..f5feea6 --- /dev/null +++ b/integrations/gradlew @@ -0,0 +1,252 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/integrations/gradlew.bat b/integrations/gradlew.bat new file mode 100644 index 0000000..9d21a21 --- /dev/null +++ b/integrations/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/integrations/settings.gradle b/integrations/settings.gradle index 095ddf2..2bfcc54 100644 --- a/integrations/settings.gradle +++ b/integrations/settings.gradle @@ -10,7 +10,8 @@ include 'common', 'paper' // Build loaders separately: Forge and Loom use different Gradle generations. if (providers.gradleProperty('loader').orNull == 'fabric') include 'fabric' if (providers.gradleProperty('loader').orNull == 'forge') include 'forge' -if (providers.gradleProperty('mcVersion').getOrElse('').startsWith('26.')) { +def mcVer = (providers.gradleProperty('mcVersion').orNull ?: startParameter.projectProperties['mcVersion'] ?: '').toString() +if (mcVer.startsWith('26.') || mcVer == '26.x') { if (findProject(':fabric') != null) project(':fabric').buildFileName = 'modern.gradle' if (findProject(':forge') != null) project(':forge').buildFileName = 'modern.gradle' } diff --git a/launcher/package-lock.json b/launcher/package-lock.json index 95442a3..0f0cfda 100644 --- a/launcher/package-lock.json +++ b/launcher/package-lock.json @@ -1,12 +1,12 @@ { "name": "scopenet-launcher", - "version": "0.1.0", + "version": "0.4.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "scopenet-launcher", - "version": "0.1.0", + "version": "0.4.0", "dependencies": { "@fontsource-variable/inter": "^5.3.0", "@fontsource-variable/jetbrains-mono": "^5.3.0", diff --git a/launcher/package.json b/launcher/package.json index bd79a93..b23e6c6 100644 --- a/launcher/package.json +++ b/launcher/package.json @@ -1,7 +1,7 @@ { "name": "scopenet-launcher", "private": true, - "version": "0.1.0", + "version": "0.4.0", "type": "module", "scripts": { "dev": "vite", diff --git a/launcher/src-tauri/tauri.conf.json b/launcher/src-tauri/tauri.conf.json index 31be86e..4dc5a2f 100644 --- a/launcher/src-tauri/tauri.conf.json +++ b/launcher/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "$schema": "https://schema.tauri.app/config/2", "productName": "SCOPENET Launcher", - "version": "0.1.0", + "version": "0.4.0", "identifier": "net.scopenet.launcher", "build": { "beforeDevCommand": "npm run dev", diff --git a/launcher/src/lib/mock.ts b/launcher/src/lib/mock.ts index 58f0138..c6257b1 100644 --- a/launcher/src/lib/mock.ts +++ b/launcher/src/lib/mock.ts @@ -35,7 +35,7 @@ const settings: Settings = { const manifest: Manifest = { api_version: 1, - panel_version: '0.1.0', + panel_version: '0.4.0', user: null, auth: { panel_accounts: true, registration: 'approval', offline_local: true, yggdrasil_url: 'https://panel.scopenet.gg/api/yggdrasil' }, branding: { diff --git a/panel/web/package-lock.json b/panel/web/package-lock.json index 551f9c3..b37d9b8 100644 --- a/panel/web/package-lock.json +++ b/panel/web/package-lock.json @@ -1,12 +1,12 @@ { "name": "scopenet-panel-web", - "version": "0.1.0", + "version": "0.4.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "scopenet-panel-web", - "version": "0.1.0", + "version": "0.4.0", "devDependencies": { "@fontsource-variable/inter": "^5.3.0", "@fontsource-variable/jetbrains-mono": "^5.3.0", diff --git a/panel/web/package.json b/panel/web/package.json index 107c9a5..2366645 100644 --- a/panel/web/package.json +++ b/panel/web/package.json @@ -1,7 +1,7 @@ { "name": "scopenet-panel-web", "private": true, - "version": "0.1.0", + "version": "0.4.0", "type": "module", "scripts": { "dev": "vite",