diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile new file mode 100644 index 000000000..a42c8bdb1 --- /dev/null +++ b/.gitpod.Dockerfile @@ -0,0 +1,19 @@ +FROM gitpod/workspace-base + +USER gitpod + +# Install custom tools, runtime, etc. using apt-get +# For example, the command below would install "bastet" - a command line tetris clone: +# +# RUN sudo apt-get -q update && \ +# sudo apt-get install -yq bastet && \ +# sudo rm -rf /var/lib/apt/lists/* +# +# More information: https://www.gitpod.io/docs/config-docker/ + +# Install Java 8 and 16 +RUN sudo apt-get -q update && \ + sudo apt install -yq openjdk-8-jdk openjdk-16-jdk + +# This is so that you can use java 8 until such a time as you switch to java 16 +RUN sudo update-java-alternatives --set java-1.8.0-openjdk-amd64 \ No newline at end of file diff --git a/.gitpod.yml b/.gitpod.yml new file mode 100644 index 000000000..0e926b2a1 --- /dev/null +++ b/.gitpod.yml @@ -0,0 +1,18 @@ +image: + file: .gitpod.Dockerfile + +ports: + - port: 25565 + onOpen: notify + +vscode: + extensions: + - ms-azuretools.vscode-docker + - redhat.java + - richardwillis.vscode-gradle + - vscjava.vscode-java-debug + - vscode.github + + +tasks: + - init: ./gradlew \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index de2a843a9..f1a1f60c9 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,3 +1,15 @@ { + "files.exclude": { + // Default Java Dev + "**/.classpath": true, + "**/.project": true, + "**/.settings": true, + "**/.factorypath": true, + + // Custom Hidden Files + "**/.bin": true, + "**/.editorconfig": true, + }, + "java.configuration.updateBuildConfiguration": "automatic" } \ No newline at end of file diff --git a/README.md b/README.md index ca4235257..d13e01b6a 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,14 @@ -# CC:Restitched Patchwork +# CC:Restitched # CC:R Version VS CC:T Version -CC:R Strives to maintaim perfect pairity with CC:T, however in some cases this is not possible, or atleast, not yet, so just because you might be on CC:R 1.96.6, doesnt mean you are on CC:T 1.96.6. +CC:R Strives to maintain perfect pairity with CC:T, however in some cases this is not possible, so CC:R might have a "newer" version than what CC:T has, these newer versions will be primarily bugfixes and the like because fabric is "weird" when porting a forge mod CC: Restitched -*it works and runs-ish* - [![Current build status](https://github.com/Merith-TK/cc-restitched/workflows/Build/badge.svg)](https://github.com/Merith-TK/cc-restitched/actions "Current build status") [![Download CC: Restitched on CurseForge](http://cf.way2muchnoise.eu/title/cc-restitched.svg)](https://www.curseforge.com/minecraft/mc-mods/cc-restitched-updated "Download CC: Restitched on CurseForge") -## What? +[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/Merith-TK/cc-restitched/) + +## What is CC: Restiched This is an fork of [Zundrel/cc-tweaked-fabric](https://github.com/Zundrel/cc-tweaked-fabric) who's goal was to port [SquidDev-CC/CC-Tweaked](https://github.com/SquidDev-CC/CC-Tweaked) to the [Fabric](https://fabricmc.net/) modloader. I picked up maintaining the mod because the team working on Zundrel's fork, admitted they had gotten lethargic so I picked it up to make it equal with CC:T ## Resource Packs @@ -19,11 +19,9 @@ We also have a second resourcepack made by [3prm3](https://github.com/3prm3), it ## Major Tasks Planned * Rewrite the config system - * **Planned for 1.96.0 release** + * **Planned for 1.96.3 release** * it currently sets the values that would normally be read from `config/computercraft.json` to the default values, because it does not read the file at all -* Fixing `/computercraft` commands, - * No clue why they broken, they just are - + ## Contributing Any contribution is welcome, be that using the mod, reporting bugs or contributing code. In order to start helping develop CC:R there are a few rules 1) Any updates that port commits from CC:T, ***MUST*** follow the format defined in [patchwork.md](patchwork.md) otherwise they will not be accepted,