Skip to content

Commit cf0c4e7

Browse files
committed
Merge branch 'feat-commands' of https://github.com/CSC207-2022F-UofT/mcpm
2 parents 23ce729 + b5e6c18 commit cf0c4e7

File tree

187 files changed

+2330
-1255
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

187 files changed

+2330
-1255
lines changed

CONTRIBUTE.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Then, you can run your class with:
4242

4343
For example, you can test the progress bar with:
4444

45-
`java19 -cp "$cp" org.hydev.mcpm.client.interaction.ProgressBar`
45+
`java19 -cp "$cp" org.hydev.mcpm.client.display.progress.ProgressBar`
4646

4747
</details>
4848

@@ -60,17 +60,17 @@ The downloadable Spigot plugins and their meta info are stored on our server, ho
6060

6161
**Europe** 🇪🇺
6262

63-
| Mirror URL (HTTPS) | Hosted By | Provider | Location | Speed | Update |
64-
|----------------------|-----------|------------|-----------------|----------|-------|
65-
| mcprs-lux.hydev.org | HyDEV | GCore Labs | 🇱🇺 Luxembourg | 200 Mbps | 1 day |
63+
| Mirror URL (HTTPS) | Hosted By | Provider | Location | Speed | Update |
64+
|---------------------|-----------|------------|-----------------|----------|--------|
65+
| mcprs-lux.hydev.org | HyDEV | GCore Labs | 🇱🇺 Luxembourg | 200 Mbps | 1 day |
6666

6767
**Asia**
6868

6969
| Mirror URL (HTTPS) | Hosted By | Provider | Location | Speed | Update |
7070
|-----------------------|-----------|----------|------------|----------|--------|
7171
| mcprs-tokyo.hydev.org | HyDEV | Vultr | 🇯🇵 Tokyo | 200 Mbps | 1 day |
7272

73-
If you want to contribute your network traffic by setting up a mirror, feel free to check out [How to setup a mirror](#how-to-set-up-a-mirror)
73+
If you want to contribute your network traffic by setting up a mirror, feel free to check out [How to set up a mirror](#How to set up a mirror)
7474

7575
### How to set up a mirror
7676

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ mcpm search JedCore # Look for plugins named JedCore
3333
mcpm install JedCore # Install it to our local directory!
3434
```
3535

36-
On a windows machine, I recommend executing the shortcut via a bash emulator (Git Bash),
36+
On a Windows machine, I recommend executing the shortcut via a bash emulator (Git Bash),
3737
launching the app yourself using `java`, or investigating the scripts in the /tools folder (run.py).
3838

3939
The In-Game environment is more involved and requires a server with our MCPM plugin.
@@ -126,7 +126,7 @@ don't need to worry about accidentally breaking your plugin installs.
126126

127127
You can easily uninstall a plugin by name using the `uninstall` subcommand.
128128

129-
The uninstall command will automatically get rid of all dependencies if possible.
129+
The `uninstall` command will automatically get rid of all dependencies if possible.
130130

131131
If you are attempting to get rid of a plugin that's required for another
132132
plugin to work, then MCPM will ask you to uninstall the other plugin first.

bin/main/plugin.yml

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,25 @@
11
main: org.hydev.mcpm.SpigotEntry
22
name: MCPM
3-
version: @version@
3+
version: '@version@'
44
description: Minecraft Package Manager for Bukkit/Spiget Servers
55
api-version: 1.18
6-
authors: [Hykilpikonna, 1whatleytay, MstrPikachu, kchprog, jerryzhu509, thudoan1706, aanushkasharma]
6+
authors: [Hykilpikonna, 1whatleytay, MstrPikachu, kchprog, jerryzhu509, thudoan1706,
7+
aanushkasharma]
78
website: https://github.com/CSC207-2022F-UofT/mcpm
89
commands:
910
mcpm:
1011
description: Minecraft package manager
11-
usage: "View help: /mcpm -h"
12+
usage: 'View help: /mcpm -h'
1213
permission: mcpm.use
14+
libraries:
15+
- net.sourceforge.argparse4j:argparse4j:0.9.0
16+
- org.apache.httpcomponents.client5:httpclient5-fluent:5.2-beta1
17+
- com.fasterxml.jackson.core:jackson-core:2.14.0
18+
- com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.14.0
19+
- com.google.guava:guava:31.1-jre
20+
- org.jetbrains:annotations:23.0.0
21+
- org.fusesource.jansi:jansi:2.4.0
22+
- org.apache.commons:commons-lang3:3.12.0
23+
- com.opencsv:opencsv:5.7.1
24+
- com.github.luben:zstd-jni:1.5.2-5
25+
- io.airlift:aircompressor:0.21

bin/test/db.zst

3.55 MB
Binary file not shown.

images/closed_issue.png

-49.6 KB
Binary file not shown.

images/closed_project.png

-85.4 KB
Binary file not shown.

images/create_branch.png

-67.4 KB
Binary file not shown.

images/create_pr.png

-37.3 KB
Binary file not shown.

images/create_project.png

-230 KB
Binary file not shown.

images/link_branch.png

-41.4 KB
Binary file not shown.

0 commit comments

Comments
 (0)