Skip to content

Commit 28d7455

Browse files
nopjmpnopjmp
committed
init commit - copy over Tunity/EmpireCraft repo structure
0 parents  commit 28d7455

23 files changed

+914
-0
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.md

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
---
2+
name: Bug report
3+
about: Create a report detailing a bug
4+
title: ''
5+
labels: bug, unconfirmed
6+
assignees: ''
7+
8+
---
9+
10+
**Describe the bug**
11+
A clear and concise description of what the bug is.
12+
13+
**To Reproduce**
14+
Steps to reproduce. Videos are nice if applicable.
15+
16+
**Plugins**
17+
Show the output of /plugins here.
18+
19+
**Version**
20+
Show the output of /version here.
21+
22+
**Misc**
23+
Anything else helpful not belonging in the categories above.

‎.github/ISSUE_TEMPLATE/feature_request.md

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for this project
4+
title: ''
5+
labels: feature
6+
assignees: ''
7+
8+
---
9+
10+
**Is your feature request related to a problem? Please describe.**
11+
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
12+
13+
**Describe the solution you'd like**
14+
A clear and concise description of what you want to happen.
15+
16+
**Describe alternatives you've considered**
17+
A clear and concise description of any alternative solutions or features you've considered.
18+
19+
**Additional context**
20+
Add any other context or screenshots about the feature request here.

‎.github/workflows/blank.yml

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: Build PR
2+
3+
on: [pull_request]
4+
5+
jobs:
6+
build:
7+
runs-on: ubuntu-latest
8+
9+
steps:
10+
- uses: actions/checkout@v2
11+
12+
- name: Get PR info
13+
run: echo ::set-env name=PR::$(echo $GITHUB_REF | awk 'BEGIN { FS = "/" } ; { print $3 }')
14+
15+
- name: Set up JDK 8
16+
uses: actions/setup-java@v1
17+
with:
18+
java-version: 8
19+
20+
- uses: actions/cache@v2
21+
with:
22+
path: ~/.m2/repository
23+
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
24+
restore-keys: ${{ runner.os }}-maven-
25+
26+
- name: Patch Cauldron
27+
run: |
28+
git config --global user.email "[email protected]"
29+
git config --global user.name "Your Name"
30+
git submodule update --init --recursive
31+
./cauldron jar
32+
33+
- uses: actions/upload-artifact@v2
34+
with:
35+
name: Cauldron-PR${{ env.PR }}-JDK8
36+
path: cauldron-paperclip.jar

‎.github/workflows/maven.yml

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: Build main
2+
3+
on: [push]
4+
5+
jobs:
6+
build:
7+
runs-on: ubuntu-latest
8+
9+
steps:
10+
- uses: actions/checkout@v2
11+
12+
- name: Set up JDK 8
13+
uses: actions/setup-java@v1
14+
with:
15+
java-version: 8
16+
17+
- uses: actions/cache@v2
18+
with:
19+
path: ~/.m2/repository
20+
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
21+
restore-keys: ${{ runner.os }}-maven-
22+
23+
- name: Patch Cauldron
24+
run: |
25+
git config --global user.email "[email protected]"
26+
git config --global user.name "Your Name"
27+
git submodule update --init --recursive
28+
./cauldron jar
29+
30+
- uses: actions/upload-artifact@v2
31+
with:
32+
name: Cauldron-JDK8
33+
path: Cauldron-paperclip.jar

‎.gitignore

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# Concrete
2+
Cauldron-Server
3+
Cauldron-API
4+
mc-dev
5+
.idea
6+
testserver
7+
run
8+
current-paper
9+
10+
# Compiled class file
11+
*.class
12+
13+
# Log file
14+
*.log
15+
16+
# BlueJ files
17+
*.ctxt
18+
19+
# Mobile Tools for Java (J2ME)
20+
.mtj.tmp/
21+
22+
# IntelliJ
23+
*.iml
24+
*.ipr
25+
*.iws
26+
.idea/
27+
out/
28+
29+
# Maven
30+
target/
31+
32+
# Package Files #
33+
*.jar
34+
*.war
35+
*.nar
36+
*.ear
37+
*.zip
38+
*.tar.gz
39+
*.rar
40+
41+
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
42+
hs_err_pid*

‎.gitmodules

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[submodule "Paper"]
2+
path = Paper
3+
url = https://github.com/PaperMC/Paper
4+
branch = ver/1.12.2

‎CONTRIBUTING.md

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Contributing to Cauldron
2+
TODO

‎PATCHES-LICENSE

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
Copyright 2021 Kayla Thompson
2+
3+
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
4+
documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
5+
rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit
6+
persons to whom the Software is furnished to do so, subject to the following conditions:
7+
8+
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
9+
10+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
11+
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
12+
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
13+
IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

‎Paper

Submodule Paper added at 77cce82

‎README.md

+85
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
# Cauldron
2+
3+
Fork of 1.12.2 [Paper](https://github.com/PaperMC/Paper) aimed at improving server performance for anarchy servers.
4+
5+
## Contact
6+
7+
TBD
8+
9+
## How To (Server Admins)
10+
11+
Cauldron uses the same paperclip jar system that Paper uses.
12+
13+
You can download the latest build of Cauldron by going here: TBD
14+
15+
You can also [build it yourself](https://github.com/nopjmp/Cauldron#building)
16+
17+
## How To (Plugin developers)
18+
19+
In order to use Cauldron as a dependency you must [build it yourself](https://github.com/nopjmp/Cauldron#building).
20+
Each time you want to update your dependency you must re-build cauldron.
21+
22+
Cauldron-API maven dependency:
23+
24+
```xml
25+
<dependency>
26+
<groupId>dev.pomf.cauldron</groupId>
27+
<artifactId>cauldron-api</artifactId>
28+
<version>1.12.2-R0.1-SNAPSHOT</version>
29+
<scope>provided</scope>
30+
</dependency>
31+
```
32+
33+
Cauldron-Server maven dependency:
34+
35+
```xml
36+
<dependency>
37+
<groupId>dev.pomf.cauldron</groupId>
38+
<artifactId>cauldron</artifactId>
39+
<version>1.12.2-R0.1-SNAPSHOT</version>
40+
<scope>provided</scope>
41+
</dependency>
42+
```
43+
44+
There is no repository required since the artifacts should be locally installed
45+
via building cauldron.
46+
47+
## Building
48+
49+
Requirements:
50+
51+
- You need `git` installed, with a configured user name and email.
52+
On windows you need to run from git bash.
53+
- You need `maven` installed
54+
- You need `jdk` 8+ installed to compile (and `jre` 8+ to run)
55+
- Anything else that `paper` requires to build
56+
57+
If all you want is a paperclip server jar, just run `./cauldron jar`
58+
59+
Otherwise, to setup the `Cauldron-API` and `Cauldron-Server` repo, just run the following command
60+
in your project root `./cauldron patch` additionally, after you run `./cauldron patch` you can run `./cauldron build` to build the
61+
respective api and server jars.
62+
63+
`./cauldron patch` should initialize the repo such that you can now start modifying and creating
64+
patches. The folder `Cauldron-API` is the api repo and the `Cauldron-Server` folder
65+
is the server repo and will contain the source files you will modify.
66+
67+
#### Creating a patch
68+
69+
Patches are effectively just commits in either `Cauldron-API` or `Cauldron-Server`.
70+
To create one, just add a commit to either repo and run `./cauldron rb`, and a
71+
patch will be placed in the patches folder. Modifying commits will also modify its
72+
corresponding patch file.
73+
74+
## License
75+
76+
The PATCHES-LICENSE file describes the license for api & server patches,
77+
found in `./patches` and its subdirectories except when noted otherwise.
78+
79+
Everything else is licensed under the MIT license, except when note otherwise.
80+
See https://github.com/starlis/empirecraft and https://github.com/electronicboy/byof
81+
for the license of material used/modified by this project.
82+
83+
### Note
84+
85+
The fork is based off of aikar's EMC framework found [here](https://github.com/starlis/empirecraft)

0 commit comments

Comments
 (0)