Move repo to cc-tweaked org

Let's see how this goes. - Update references to the new repo - Use rrsync on the server, meaning make-doc.sh uploads relative to the website root. - Bump Gradle wrapper to 7.2. Not related to this change, but possibly fixes running under Java 16. Possibly.
2024-12-14 20:20:30 +00:00 · 2021-10-17 18:14:22 +01:00 · 2021-10-17 18:14:22 +01:00 · ab6b861cd6
commit ab6b861cd6
parent 72e8fc03d3
16 changed files with 32 additions and 32 deletions
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@ -4,5 +4,5 @@ contact_links:
  url: https://discord.computercraft.cc
  about: Get help on the ComputerCraft Discord.
 - name: GitHub Discussions
-  url: https://github.com/SquidDev-CC/CC-Tweaked/discussions
+  url: https://github.com/cc-tweaked/CC-Tweaked/discussions
  about: Or ask questions on GitHub Discussions.
--- a/.github/workflows/make-doc.sh
+++ b/.github/workflows/make-doc.sh
@ -13,7 +13,7 @@ chmod 600 "$HOME/.ssh/key"
 # And upload
 rsync -avc -e "ssh -i $HOME/.ssh/key -o StrictHostKeyChecking=no -p $SSH_PORT" \
      "$GITHUB_WORKSPACE/build/docs/lua/" \
-      "$SSH_USER@$SSH_HOST:/var/www/tweaked.cc/$DEST"
+      "$SSH_USER@$SSH_HOST:/$DEST"
 rsync -avc -e "ssh -i $HOME/.ssh/key -o StrictHostKeyChecking=no -p $SSH_PORT" \
      "$GITHUB_WORKSPACE/build/docs/javadoc/" \
-      "$SSH_USER@$SSH_HOST:/var/www/tweaked.cc/$DEST/javadoc"
+      "$SSH_USER@$SSH_HOST:/$DEST/javadoc"
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -16,11 +16,11 @@ automatically with GitHub, so please don't submit PRs adding/changing translatio
 In order to develop CC: Tweaked, you'll need to download the source code and then run it. This is a pretty simple
 process. When building on Windows, Use `gradlew.bat` instead of `./gradlew`.

- - **Clone the repository:** `git clone https://github.com/SquidDev-CC/CC-Tweaked.git && cd CC-Tweaked`
+ - **Clone the repository:** `git clone https://github.com/cc-tweaked/CC-Tweaked.git && cd CC-Tweaked`
 - **Setup Forge:** `./gradlew build`
 - **Run Minecraft:** `./gradlew runClient` (or run the `GradleStart` class from your IDE).
 - **Optionally:** For small PRs (especially those only touching Lua code), it may be easier to use GitPod, which
-   provides a pre-configured environment: [![Gitpod ready-to-code](https://img.shields.io/badge/Gitpod-ready--to--code-2b2b2b?logo=gitpod)](https://gitpod.io/#https://github.com/SquidDev-CC/CC-Tweaked/)
+   provides a pre-configured environment: [![Gitpod ready-to-code](https://img.shields.io/badge/Gitpod-ready--to--code-2b2b2b?logo=gitpod)](https://gitpod.io/#https://github.com/cc-tweaked/CC-Tweaked/)

   Do note you will need to download the mod after compiling to test.

@ -103,7 +103,7 @@ tests go inside `describe` blocks, and a single test goes inside `it`.
 Assertions are generally written using `expect` (inspired by Hamcrest and the like). For instance, `expect(foo):eq("bar")`
 asserts that your variable `foo` is equal to the expected value `"bar"`.

-[new-issue]: https://github.com/SquidDev-CC/CC-Tweaked/issues/new/choose "Create a new issue"
+[new-issue]: https://github.com/cc-tweaked/CC-Tweaked/issues/new/choose "Create a new issue"
 [community]: README.md#Community "Get in touch with the community."
 [checkstyle]: https://checkstyle.org/
 [illuaminate]: https://github.com/SquidDev/illuaminate/ "Illuaminate on GitHub"
--- a/README.md
+++ b/README.md
@ -1,5 +1,5 @@
 # ![CC: Tweaked](doc/logo.png)
-[![Current build status](https://github.com/SquidDev-CC/CC-Tweaked/workflows/Build/badge.svg)](https://github.com/SquidDev-CC/CC-Tweaked/actions "Current build status") [![Download CC: Tweaked on CurseForge](http://cf.way2muchnoise.eu/title/cc-tweaked.svg)][CurseForge]
+[![Current build status](https://github.com/cc-tweaked/CC-Tweaked/workflows/Build/badge.svg)](https://github.com/cc-tweaked/CC-Tweaked/actions "Current build status") [![Download CC: Tweaked on CurseForge](http://cf.way2muchnoise.eu/title/cc-tweaked.svg)][CurseForge]

 CC: Tweaked is a mod for Minecraft which adds programmable computers, turtles and more to the game. A fork of the
 much-beloved [ComputerCraft], it continues its legacy with better performance, stability, and a wealth of new features.
--- a/build.gradle
+++ b/build.gradle
@ -463,7 +463,7 @@ curseforge {
    project {
        id = '282001'
        releaseType = 'release'
-        changelog = "Release notes can be found on the GitHub repository (https://github.com/SquidDev-CC/CC-Tweaked/releases/tag/v${mc_version}-${mod_version})."
+        changelog = "Release notes can be found on the GitHub repository (https://github.com/cc-tweaked/CC-Tweaked/releases/tag/v${mc_version}-${mod_version})."

        addGameVersion "${mc_version}"
    }
@ -481,7 +481,7 @@ tasks.register('publishModrinth', TaskModrinthUpload.class).configure {
    versionNumber = "${project.mc_version}-${project.mod_version}"
    uploadFile = jar
    addGameVersion(project.mc_version)
-    changelog = "Release notes can be found on the [GitHub repository](https://github.com/SquidDev-CC/CC-Tweaked/releases/tag/v${mc_version}-${mod_version})."
+    changelog = "Release notes can be found on the [GitHub repository](https://github.com/cc-tweaked/CC-Tweaked/releases/tag/v${mc_version}-${mod_version})."
    addLoader('forge')
 }

@ -498,21 +498,21 @@ publishing {
            pom {
                name = 'CC: Tweaked'
                description = 'CC: Tweaked is a fork of ComputerCraft, adding programmable computers, turtles and more to Minecraft.'
-                url = 'https://github.com/SquidDev-CC/CC-Tweaked'
+                url = 'https://github.com/cc-tweaked/CC-Tweaked'

                scm {
-                    url = 'https://github.com/SquidDev-CC/CC-Tweaked.git'
+                    url = 'https://github.com/cc-tweaked/CC-Tweaked.git'
                }

                issueManagement {
                    system = 'github'
-                    url = 'https://github.com/SquidDev-CC/CC-Tweaked/issues'
+                    url = 'https://github.com/cc-tweaked/CC-Tweaked/issues'
                }

                licenses {
                    license {
                        name = 'ComputerCraft Public License, Version 1.0'
-                        url = 'https://github.com/SquidDev-CC/CC-Tweaked/blob/mc-1.15.x/LICENSE'
+                        url = 'https://github.com/cc-tweaked/CC-Tweaked/blob/mc-1.15.x/LICENSE'
                    }
                }

@ -537,7 +537,7 @@ publishing {

 githubRelease {
    token project.hasProperty('githubApiKey') ? project.githubApiKey : ''
-    owner 'SquidDev-CC'
+    owner 'cc-tweaked'
    repo 'CC-Tweaked'
    targetCommitish.set(project.provider({
        try {
--- a/doc/index.md
+++ b/doc/index.md
@ -43,8 +43,8 @@ If you get stuck, do pop in to the [Minecraft Computer Mod Discord guild][discor
 ## Get Involved
 CC: Tweaked lives on [GitHub]. If you've got any ideas, feedback or bugs please do [create an issue][bug].

-[github]: https://github.com/SquidDev-CC/CC-Tweaked/ "CC: Tweaked on GitHub"
-[bug]: https://github.com/SquidDev-CC/CC-Tweaked/issues/new/choose
+[github]: https://github.com/cc-tweaked/CC-Tweaked/ "CC: Tweaked on GitHub"
+[bug]: https://github.com/cc-tweaked/CC-Tweaked/issues/new/choose
 [computercraft]: https://github.com/dan200/ComputerCraft "ComputerCraft on GitHub"
 [curseforge]: https://minecraft.curseforge.com/projects/cc-tweaked "Download CC: Tweaked from CurseForge"
 [modrinth]: https://modrinth.com/mod/gu7yAYhd "Download CC: Tweaked from Modrinth"
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
--- a/2
+++ b/2
@ -72,7 +72,7 @@ case "`uname`" in
  Darwin* )
    darwin=true
    ;;
-  MINGW* )
+  MSYS* | MINGW* )
    msys=true
    ;;
  NONSTOP* )
--- a/illuaminate.sexp
+++ b/illuaminate.sexp
@ -18,7 +18,7 @@
    (title "CC: Tweaked")
    (logo src/main/resources/pack.png)
    (url https://tweaked.cc/)
-    (source-link https://github.com/SquidDev-CC/CC-Tweaked/blob/${commit}/${path}#L${line})
+    (source-link https://github.com/cc-tweaked/CC-Tweaked/blob/${commit}/${path}#L${line})

    (styles src/web/styles.css)
    (scripts build/rollup/index.js)
--- a/src/main/resources/META-INF/mods.toml
+++ b/src/main/resources/META-INF/mods.toml
@ -1,8 +1,8 @@
 modLoader="javafml"
 loaderVersion="[36,37)"

-issueTrackerURL="https://github.com/SquidDev-CC/CC-Tweaked/issues"
-displayURL="https://github.com/SquidDev-CC/CC-Tweaked"
+issueTrackerURL="https://github.com/cc-tweaked/CC-Tweaked/issues"
+displayURL="https://github.com/cc-tweaked/CC-Tweaked"
 logoFile="pack.png"

 credits="Created by Daniel Ratcliffe (@DanTwoHundred)"
--- a/src/main/resources/data/computercraft/lua/rom/motd.txt
+++ b/src/main/resources/data/computercraft/lua/rom/motd.txt
@ -1,4 +1,4 @@
-Please report bugs at https://github.com/SquidDev-CC/CC-Tweaked. Thanks!
+Please report bugs at https://github.com/cc-tweaked/CC-Tweaked. Thanks!
 View the documentation at https://tweaked.cc
 Show off your programs or ask for help at our forum: https://forums.computercraft.cc
 You can disable these messages by running "set motd.enable false".
--- a/src/testMod/java/dan200/computercraft/ingame/ComputerTest.kt
+++ b/src/testMod/java/dan200/computercraft/ingame/ComputerTest.kt
@ -9,7 +9,7 @@ class Computer_Test {
    /**
     * Ensures redstone signals do not travel through computers.
     *
-     * @see [#548](https://github.com/SquidDev-CC/CC-Tweaked/issues/548)
+     * @see [#548](https://github.com/cc-tweaked/CC-Tweaked/issues/548)
     */
    @GameTest
    fun No_through_signal(context: GameTestHelper) = context.sequence {
--- a/src/testMod/java/dan200/computercraft/ingame/DiskDriveTest.kt
+++ b/src/testMod/java/dan200/computercraft/ingame/DiskDriveTest.kt
@ -8,7 +8,7 @@ class Disk_Drive_Test {
    /**
     * Ensure audio disks exist and we can play them.
     *
-     * @see [#688](https://github.com/SquidDev-CC/CC-Tweaked/issues/688)
+     * @see [#688](https://github.com/cc-tweaked/CC-Tweaked/issues/688)
     */
    @GameTest
    fun Audio_disk(helper: GameTestHelper) = helper.sequence { thenComputerOk() }
--- a/src/testMod/java/dan200/computercraft/ingame/TurtleTest.kt
+++ b/src/testMod/java/dan200/computercraft/ingame/TurtleTest.kt
@ -13,7 +13,7 @@ class Turtle_Test {
    /**
     * Checks turtles can sheer sheep (and drop items)
     *
-     * @see [#537](https://github.com/SquidDev-CC/CC-Tweaked/issues/537)
+     * @see [#537](https://github.com/cc-tweaked/CC-Tweaked/issues/537)
     */
    @GameTest(timeoutTicks = COMPUTER_TIMEOUT)
    fun Shears_sheep(helper: GameTestHelper) = helper.sequence { thenComputerOk() }
@ -21,7 +21,7 @@ class Turtle_Test {
    /**
     * Checks turtles can place lava.
     *
-     * @see [#518](https://github.com/SquidDev-CC/CC-Tweaked/issues/518)
+     * @see [#518](https://github.com/cc-tweaked/CC-Tweaked/issues/518)
     */
    @GameTest(timeoutTicks = COMPUTER_TIMEOUT)
    fun Place_lava(helper: GameTestHelper) = helper.sequence { thenComputerOk() }
@ -29,7 +29,7 @@ class Turtle_Test {
    /**
     * Checks turtles can place when waterlogged.
     *
-     * @see [#385](https://github.com/SquidDev-CC/CC-Tweaked/issues/385)
+     * @see [#385](https://github.com/cc-tweaked/CC-Tweaked/issues/385)
     */
    @GameTest(timeoutTicks = COMPUTER_TIMEOUT)
    fun Place_waterlogged(helper: GameTestHelper) = helper.sequence { thenComputerOk() }
@ -37,7 +37,7 @@ class Turtle_Test {
    /**
     * Checks turtles can pick up lava
     *
-     * @see [#297](https://github.com/SquidDev-CC/CC-Tweaked/issues/297)
+     * @see [#297](https://github.com/cc-tweaked/CC-Tweaked/issues/297)
     */
    @GameTest(timeoutTicks = COMPUTER_TIMEOUT)
    fun Gather_lava(helper: GameTestHelper) = helper.sequence { thenComputerOk() }
@ -45,7 +45,7 @@ class Turtle_Test {
    /**
     * Checks turtles can hoe dirt.
     *
-     * @see [#258](https://github.com/SquidDev-CC/CC-Tweaked/issues/258)
+     * @see [#258](https://github.com/cc-tweaked/CC-Tweaked/issues/258)
     */
    @GameTest(timeoutTicks = COMPUTER_TIMEOUT)
    fun Hoe_dirt(helper: GameTestHelper) = helper.sequence { thenComputerOk() }
@ -53,7 +53,7 @@ class Turtle_Test {
    /**
     * Checks turtles can place monitors
     *
-     * @see [#691](https://github.com/SquidDev-CC/CC-Tweaked/issues/691)
+     * @see [#691](https://github.com/cc-tweaked/CC-Tweaked/issues/691)
     */
    @GameTest(timeoutTicks = COMPUTER_TIMEOUT)
    fun Place_monitor(helper: GameTestHelper) = helper.sequence { thenComputerOk() }
--- a/src/testMod/resources/META-INF/mods.toml
+++ b/src/testMod/resources/META-INF/mods.toml
@ -1,8 +1,8 @@
 modLoader="javafml"
 loaderVersion="[30,)"

-issueTrackerURL="https://github.com/SquidDev-CC/CC-Tweaked/issues"
-displayURL="https://github.com/SquidDev-CC/CC-Tweaked"
+issueTrackerURL="https://github.com/cc-tweaked/CC-Tweaked/issues"
+displayURL="https://github.com/cc-tweaked/CC-Tweaked"
 logoFile="pack.png"

 credits="Created by Daniel Ratcliffe (@DanTwoHundred)"