diff --git a/.gitpod.yml b/.gitpod.yml deleted file mode 100644 index 2940034a6..000000000 --- a/.gitpod.yml +++ /dev/null @@ -1,26 +0,0 @@ -# SPDX-FileCopyrightText: 2021 The CC: Tweaked Developers -# -# SPDX-License-Identifier: MPL-2.0 - -image: - file: config/gitpod/Dockerfile - -ports: - - port: 25565 - onOpen: notify - -vscode: - extensions: - - eamodio.gitlens - - github.vscode-pull-request-github - - ms-azuretools.vscode-docker - - redhat.java - - richardwillis.vscode-gradle - - vscjava.vscode-java-debug - - vscode.github - -tasks: - - name: Setup pre-commit hool - init: pre-commit install --allow-missing-config - - name: Install npm packages - init: npm ci diff --git a/build.gradle.kts b/build.gradle.kts index 2baba69d6..d56e6968f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,9 +5,8 @@ import cc.tweaked.gradle.JUnitExt import net.fabricmc.loom.api.LoomGradleExtensionAPI import net.fabricmc.loom.util.gradle.SourceSetHelper -import org.jetbrains.gradle.ext.compiler -import org.jetbrains.gradle.ext.runConfigurations -import org.jetbrains.gradle.ext.settings +import org.jetbrains.gradle.ext.* +import org.jetbrains.gradle.ext.Application plugins { publishing @@ -86,6 +85,19 @@ idea.project.settings.runConfigurations { moduleName = "${idea.project.name}.forge.test" packageName = "" } + + register("Standalone") { + moduleName = "${idea.project.name}.standalone.main" + mainClass = "cc.tweaked.standalone.Main" + programParameters = "--resources=projects/core/src/main/resources --term=80x30 --allow-local-domains" + } +} + +// Build with the IntelliJ, rather than through Gradle. This may require setting the "Compiler Output" option in +// "Project Structure". +idea.project.settings.delegateActions { + delegateBuildRunToGradle = false + testRunner = ActionDelegationConfig.TestRunner.PLATFORM } idea.project.settings.compiler.javac { diff --git a/config/gitpod/Dockerfile b/config/gitpod/Dockerfile deleted file mode 100644 index 78e922ea4..000000000 --- a/config/gitpod/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -# SPDX-FileCopyrightText: 2021 The CC: Tweaked Developers -# -# SPDX-License-Identifier: MPL-2.0 - -FROM gitpod/workspace-base - -USER gitpod - -RUN sudo apt-get -q update \ - && sudo apt-get install -yq openjdk-16-jdk python3-pip npm \ - && sudo pip3 install pre-commit \ - && sudo update-java-alternatives --set java-1.16.0-openjdk-amd64 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 44067aab9..fd7a87ec9 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -60,7 +60,7 @@ curseForgeGradle = "1.0.14" errorProne-core = "2.23.0" errorProne-plugin = "3.1.0" fabric-loom = "1.6.7" -forgeGradle = "6.0.20" +forgeGradle = "6.0.21" githubRelease = "2.5.2" gradleVersions = "0.50.0" ideaExt = "1.1.7" @@ -72,7 +72,7 @@ nullAway = "0.10.25" spotless = "6.23.3" taskTree = "2.1.1" teavm = "0.10.0-SQUID.4" -vanillaExtract = "0.1.2" +vanillaExtract = "0.1.3" versionCatalogUpdate = "0.8.1" [libraries] diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index d64cd4917..e6441136f 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a80b22ce5..b82aa23a4 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/projects/core/src/main/resources/data/computercraft/lua/rom/apis/settings.lua b/projects/core/src/main/resources/data/computercraft/lua/rom/apis/settings.lua index 91af31c11..43f0e4667 100644 --- a/projects/core/src/main/resources/data/computercraft/lua/rom/apis/settings.lua +++ b/projects/core/src/main/resources/data/computercraft/lua/rom/apis/settings.lua @@ -183,7 +183,7 @@ function unset(name) end --- Resets the value of all settings. Equivalent to calling [`settings.unset`] ---- on every setting. +-- on every setting. -- -- @see settings.unset function clear()