Skip to content

Commit d03b68e

Browse files
Merith-TKMerith-TK
authored
Merge pull request #100 from cc-tweaked/mc-1.18.x/1.18.2
Merge mc-1.18.x/1.18.2 to mc-1.18.x/stable for release
2 parents cc93953 + 5a40483 commit d03b68e

File tree

1,063 files changed

+19584
-7582
lines changed

Some content is hidden

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

1,063 files changed

+19584
-7582
lines changed

‎.gitattributes‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# Ignore changes in generated files
2+
src/generated/resources/data/** linguist-generated
3+
4+
* text=auto
5+
6+
*.gradle eol=lf diff=java
7+
*.java eol=lf diff=java
8+
*.kt eol=lf diff=java
9+
*.lua eol=lf
10+
*.md eol=lf diff=markdown
11+
*.txt eol=lf
12+
13+
*.png binary
14+
*.jar binary
15+
*.dfpwm binary

‎.github/workflows/main-ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212
with:
1313
submodules: true
1414

15-
- name: Set up Java 16
15+
- name: Set up Java 17
1616
uses: actions/setup-java@v1
1717
with:
18-
java-version: 16
18+
java-version: 17
1919

2020
- name: Cache gradle dependencies
2121
uses: actions/cache@v2

‎.github/workflows/release.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ jobs:
2525
with:
2626
java-version: 17
2727

28+
- name: Pull submodules
29+
run: git submodule update --init --recursive
30+
2831
- name: Grant execute permission for gradlew
2932
run: chmod +x gradlew
3033

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,5 @@
2222
*.DS_Store
2323
.project
2424
*.launch
25+
26+
/src/generated/resources/.cache

‎build.gradle‎

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ plugins {
33
id "jacoco"
44
id "maven-publish"
55
id "com.github.hierynomus.license" version "0.16.1"
6-
id "org.jetbrains.kotlin.jvm" version "1.5.21"
7-
id 'fabric-loom' version '0.10-SNAPSHOT'
6+
id "org.jetbrains.kotlin.jvm" version "1.6.0"
7+
id 'fabric-loom' version '0.11-SNAPSHOT'
88
id "com.modrinth.minotaur" version "2.+"
99
id 'com.matthewprenger.cursegradle' version '1.4.0'
1010
}
@@ -40,6 +40,18 @@ sourceSets {
4040

4141
loom {
4242
accessWidenerPath = file("src/main/resources/cc.accesswidener")
43+
44+
runs {
45+
data {
46+
server()
47+
48+
name "Data Generation"
49+
vmArg "-Dfabric-api.datagen"
50+
vmArg "-Dfabric-api.datagen.output-dir=${file("src/generated/resources")}"
51+
52+
runDir "build/datagen"
53+
}
54+
}
4355
}
4456

4557
repositories {
@@ -92,10 +104,11 @@ dependencies {
92104
testImplementation 'org.junit.jupiter:junit-jupiter-params:5.7.0'
93105
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.0'
94106
testImplementation 'org.hamcrest:hamcrest:2.2'
95-
testImplementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.21'
96-
testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.1'
107+
testImplementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0'
108+
testImplementation 'org.jetbrains.kotlin:kotlin-reflect:1.6.0'
109+
testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2'
97110

98-
cctJavadoc 'cc.tweaked:cct-javadoc:1.4.2'
111+
cctJavadoc 'cc.tweaked:cct-javadoc:1.4.5'
99112
}
100113

101114
processResources {

‎doc/events/mouse_click.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ numerical value depending on which button on your mouse was last pressed when th
1919
<!-- Our markdown parser doesn't work on tables!? Guess I'll have to roll my own soonish :/. -->
2020
<tr><th>Button code</th><th>Mouse button</th></tr>
2121
<tr><td align="right">1</td><td>Left button</td></tr>
22-
<tr><td align="right">2</td><td>Middle button</td></tr>
23-
<tr><td align="right">3</td><td>Right button</td></tr>
22+
<tr><td align="right">2</td><td>Right button</td></tr>
23+
<tr><td align="right">3</td><td>Middle button</td></tr>
2424
</table>
2525

2626
## Example

‎gradle.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
org.gradle.jvmargs=-Xmx3G
33

44
# Mod properties
5-
mod_version=1.100.5
5+
mod_version=1.100.6
66

77
# Minecraft properties
88
mc_version=1.18.2
9-
fabric_api_version=0.47.8+1.18.2
9+
fabric_api_version=0.51.1+1.18.2
1010
fabric_loader_version=0.13.3
1111

1212
cloth_api_version=2.0.54

‎jitpack.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
before_install:
22
- wget https://github.com/sormuras/bach/raw/master/install-jdk.sh
3-
- source ./install-jdk.sh --feature 16 --license GPL
3+
- source ./install-jdk.sh --feature 17 --license GPL
44
jdk:
55
- openjdk16

‎src/generated/resources/assets/computercraft/blockstates/computer_advanced.json‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
{
2+
"variants": {
3+
"facing=east,state=blinking": {
4+
"y": 90,
5+
"model": "computercraft:block/computer_advanced_blinking"
6+
},
7+
"facing=east,state=off": {
8+
"y": 90,
9+
"model": "computercraft:block/computer_advanced_off"
10+
},
11+
"facing=east,state=on": {
12+
"y": 90,
13+
"model": "computercraft:block/computer_advanced_on"
14+
},
15+
"facing=north,state=blinking": {
16+
"y": 0,
17+
"model": "computercraft:block/computer_advanced_blinking"
18+
},
19+
"facing=north,state=off": {
20+
"y": 0,
21+
"model": "computercraft:block/computer_advanced_off"
22+
},
23+
"facing=north,state=on": {
24+
"y": 0,
25+
"model": "computercraft:block/computer_advanced_on"
26+
},
27+
"facing=south,state=blinking": {
28+
"y": 180,
29+
"model": "computercraft:block/computer_advanced_blinking"
30+
},
31+
"facing=south,state=off": {
32+
"y": 180,
33+
"model": "computercraft:block/computer_advanced_off"
34+
},
35+
"facing=south,state=on": {
36+
"y": 180,
37+
"model": "computercraft:block/computer_advanced_on"
38+
},
39+
"facing=west,state=blinking": {
40+
"y": 270,
41+
"model": "computercraft:block/computer_advanced_blinking"
42+
},
43+
"facing=west,state=off": {
44+
"y": 270,
45+
"model": "computercraft:block/computer_advanced_off"
46+
},
47+
"facing=west,state=on": {
48+
"y": 270,
49+
"model": "computercraft:block/computer_advanced_on"
50+
}
51+
}
52+
}

‎src/generated/resources/assets/computercraft/blockstates/computer_command.json‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
{
2+
"variants": {
3+
"facing=east,state=blinking": {
4+
"y": 90,
5+
"model": "computercraft:block/computer_command_blinking"
6+
},
7+
"facing=east,state=off": {
8+
"y": 90,
9+
"model": "computercraft:block/computer_command_off"
10+
},
11+
"facing=east,state=on": {
12+
"y": 90,
13+
"model": "computercraft:block/computer_command_on"
14+
},
15+
"facing=north,state=blinking": {
16+
"y": 0,
17+
"model": "computercraft:block/computer_command_blinking"
18+
},
19+
"facing=north,state=off": {
20+
"y": 0,
21+
"model": "computercraft:block/computer_command_off"
22+
},
23+
"facing=north,state=on": {
24+
"y": 0,
25+
"model": "computercraft:block/computer_command_on"
26+
},
27+
"facing=south,state=blinking": {
28+
"y": 180,
29+
"model": "computercraft:block/computer_command_blinking"
30+
},
31+
"facing=south,state=off": {
32+
"y": 180,
33+
"model": "computercraft:block/computer_command_off"
34+
},
35+
"facing=south,state=on": {
36+
"y": 180,
37+
"model": "computercraft:block/computer_command_on"
38+
},
39+
"facing=west,state=blinking": {
40+
"y": 270,
41+
"model": "computercraft:block/computer_command_blinking"
42+
},
43+
"facing=west,state=off": {
44+
"y": 270,
45+
"model": "computercraft:block/computer_command_off"
46+
},
47+
"facing=west,state=on": {
48+
"y": 270,
49+
"model": "computercraft:block/computer_command_on"
50+
}
51+
}
52+
}

0 commit comments

Comments
 (0)