Skip to content

Commit b52386c

Browse files
committed
Merge remote-tracking branch 'origin/1.16.x' into 1.16.x
2 parents 74299e6 + 9c13819 commit b52386c

File tree

4 files changed

+61
-38
lines changed

4 files changed

+61
-38
lines changed

.github/workflows/ci-tests.yml

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
name: Gradle Tests (CI)
2+
3+
on: push
4+
5+
jobs:
6+
vars:
7+
name: Get Variables
8+
runs-on: ubuntu-latest
9+
outputs:
10+
release_type: ${{steps.cf_release_type.outputs.value }}
11+
mod_version: ${{steps.mod_version.outputs.value }}
12+
steps:
13+
- name: Checkout
14+
uses: actions/checkout@v2
15+
16+
- name: Release Type
17+
id: cf_release_type
18+
uses: christian-draeger/[email protected]
19+
with:
20+
path: './gradle.properties'
21+
property: 'cf_release_type'
22+
23+
- name: Mod Version
24+
id: mod_version
25+
uses: christian-draeger/[email protected]
26+
with:
27+
path: './gradle.properties'
28+
property: 'mod_version'
29+
30+
jar:
31+
name: Publish JAR
32+
runs-on: ubuntu-latest
33+
needs: [vars]
34+
steps:
35+
- name: Checkout
36+
uses: actions/checkout@v2
37+
38+
- name: Set up JDK 1.8
39+
uses: actions/setup-java@v1
40+
with:
41+
java-version: 1.8
42+
43+
- name: Cache Gradle packages
44+
uses: actions/cache@v2
45+
with:
46+
path: ~/.gradle/caches
47+
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
48+
restore-keys: ${{ runner.os }}-gradle
49+
50+
- name: Grant execute permission for gradlew
51+
run: chmod +x gradlew
52+
53+
- name: Test JAR with Gradle
54+
run: ./gradlew test
55+
# run: ./gradlew publish
56+
env:
57+
GITHUB_ACTOR: ${{ secrets.GITHUB_ACTOR }}
58+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/tagged-release.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# Creates releases on Curseforge and Github Releases based on v* tags
12
name: Tagged Commit Release
23

34
on:
@@ -192,4 +193,4 @@ jobs:
192193
changelog: ${{ steps.changelog.outputs.changelog }}
193194
changelog_type: markdown
194195
game_versions: java:Java 8,Forge
195-
release_type: ${{ needs.vars.outputs.release_type }}
196+
release_type: ${{ needs.vars.outputs.release_type }}

.github/workflows/test-build.yml

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -146,28 +146,3 @@ jobs:
146146
name: out
147147
path: changelog
148148
- run: cat changelog/CHANGELOG.md
149-
150-
release:
151-
name: Make GitHub Release
152-
runs-on: ubuntu-latest
153-
needs: [changelog, vars, jar]
154-
steps:
155-
- name: Download Build Results
156-
uses: actions/download-artifact@v2
157-
with:
158-
name: libs
159-
path: buildfiles
160-
- name: Download Changelog Results
161-
uses: actions/download-artifact@v2
162-
with:
163-
name: out
164-
path: changelog
165-
- name: Debug
166-
run: cat changelog/CHANGELOG.md
167-
- name: ShowFiles
168-
run: dir buildfiles
169-
- name: Full File
170-
id: filename
171-
run: echo "::set-output name=fullpath::buildfiles/${{ needs.vars.outputs.mod_id }}-${{ needs.vars.outputs.mod_version }}.jar"
172-
- name: Echo full file
173-
run: echo "${{ steps.filename.outputs.fullpath }}"

README.md

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,18 +42,7 @@ This command only works for server operators.
4242

4343
#### Technical aspects
4444

45-
- The inside of Compact Machines are rooms in another dimension.
46-
- The rooms in the other dimension are automatically chunk-loaded when the Compact Machine itself is chunk-loaded.
47-
- They only trigger chunk reloads when a block next to one of the tunnels changes.
48-
There are no redstone signals being transferred between the tunnels and machine block.
49-
- There are two kinds of Compact Machine Wall blocks. The actual machines are made out of unbreakable blocks (you can still break them in Creative mode while holding a Personal Shrinking Device), while the machine structures you build for crafting are made out of breakable Wall blocks.
50-
- Right clicking a Compact Machine renders the contents of the machine in a GUI. On multiplayer games this is handled by sending the chunk contents to the client every time he opens the GUI. There is currently no auto-refresh of the machines' content.
51-
- Compact Machines can be nested.
52-
- Compact Machines spawn using a spiral algorithm in the Compact Machine dimension at y=60. This means they all fit in exactly one chunk.
53-
- Mobs and animals will spawn inside of machine blocks if the conditions are right,
54-
e.g. light-level for mobs, grass for animals...
55-
- Players cannot leave the machine block they should currently be in according to the last one they've entered using a Personal Shrinking Device. Trying to enter a Compact Machines with other means results in the player being thrown out of the machine and getting some bad status effect applied. They might even die.
56-
- If players die without a bed in the CM dimension or with the `allowRespawning` config option disabled, they'll be teleported out of the machine dimension.
45+
- [Compact Machines 3 Technical Details](https://github.com/CompactMods/CompactMachines/wiki/Technical-Details-(CM3))
5746

5847
## Tunnels
5948

0 commit comments

Comments
 (0)