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

.gitattributes

@@ -0,0 +1,15 @@
+# Ignore changes in generated files
+src/generated/resources/data/** linguist-generated
+
+* text=auto
+
+*.gradle eol=lf diff=java
+*.java   eol=lf diff=java
+*.kt     eol=lf diff=java
+*.lua    eol=lf
+*.md     eol=lf diff=markdown
+*.txt    eol=lf
+
+*.png binary
+*.jar binary
+*.dfpwm binary

.github/workflows/main-ci.yml

@@ -12,10 +12,10 @@ jobs:
       with:
         submodules: true
 
-    - name: Set up Java 16
+    - name: Set up Java 17
       uses: actions/setup-java@v1
       with:
-        java-version: 16
+        java-version: 17
 
     - name: Cache gradle dependencies
       uses: actions/cache@v2

.github/workflows/release.yml

@@ -25,6 +25,9 @@ jobs:
               with:
                   java-version: 17
 
+            - name: Pull submodules
+              run: git submodule update --init --recursive
+
             - name: Grant execute permission for gradlew
               run: chmod +x gradlew
 

.gitignore

@@ -22,3 +22,5 @@
 *.DS_Store
 .project
 *.launch
+
+/src/generated/resources/.cache

build.gradle

@@ -3,8 +3,8 @@ plugins {
     id "jacoco"
     id "maven-publish"
     id "com.github.hierynomus.license" version "0.16.1"
-    id "org.jetbrains.kotlin.jvm" version "1.5.21"
-    id 'fabric-loom' version '0.10-SNAPSHOT'
+    id "org.jetbrains.kotlin.jvm" version "1.6.0"
+    id 'fabric-loom' version '0.11-SNAPSHOT'
     id "com.modrinth.minotaur" version "2.+"
     id 'com.matthewprenger.cursegradle' version '1.4.0'
 }
@@ -40,6 +40,18 @@ sourceSets {
 
 loom {
     accessWidenerPath = file("src/main/resources/cc.accesswidener")
+
+    runs {
+        data {
+            server()
+
+            name "Data Generation"
+            vmArg "-Dfabric-api.datagen"
+            vmArg "-Dfabric-api.datagen.output-dir=${file("src/generated/resources")}"
+
+            runDir "build/datagen"
+        }
+    }
 }
 
 repositories {
@@ -92,10 +104,11 @@ dependencies {
     testImplementation 'org.junit.jupiter:junit-jupiter-params:5.7.0'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.0'
     testImplementation 'org.hamcrest:hamcrest:2.2'
-    testImplementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.21'
-    testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.1'
+    testImplementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0'
+    testImplementation 'org.jetbrains.kotlin:kotlin-reflect:1.6.0'
+    testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2'
 
-    cctJavadoc 'cc.tweaked:cct-javadoc:1.4.2'
+    cctJavadoc 'cc.tweaked:cct-javadoc:1.4.5'
 }
 
 processResources {

doc/events/mouse_click.md

@@ -19,8 +19,8 @@ numerical value depending on which button on your mouse was last pressed when th
     <!-- Our markdown parser doesn't work on tables!? Guess I'll have to roll my own soonish :/. -->
     <tr><th>Button code</th><th>Mouse button</th></tr>
     <tr><td align="right">1</td><td>Left button</td></tr>
-    <tr><td align="right">2</td><td>Middle button</td></tr>
-    <tr><td align="right">3</td><td>Right button</td></tr>
+    <tr><td align="right">2</td><td>Right button</td></tr>
+    <tr><td align="right">3</td><td>Middle button</td></tr>
 </table>
 
 ## Example

gradle.properties

@@ -2,11 +2,11 @@
 org.gradle.jvmargs=-Xmx3G
 
 # Mod properties
-mod_version=1.100.5
+mod_version=1.100.6
 
 # Minecraft properties
 mc_version=1.18.2
-fabric_api_version=0.47.8+1.18.2
+fabric_api_version=0.51.1+1.18.2
 fabric_loader_version=0.13.3
 
 cloth_api_version=2.0.54

jitpack.yml

@@ -1,5 +1,5 @@
 before_install:
   - wget https://github.com/sormuras/bach/raw/master/install-jdk.sh
-  - source ./install-jdk.sh --feature 16 --license GPL
+  - source ./install-jdk.sh --feature 17 --license GPL
 jdk:
   - openjdk16

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

@@ -0,0 +1,52 @@
+{
+  "variants": {
+    "facing=east,state=blinking": {
+      "y": 90,
+      "model": "computercraft:block/computer_advanced_blinking"
+    },
+    "facing=east,state=off": {
+      "y": 90,
+      "model": "computercraft:block/computer_advanced_off"
+    },
+    "facing=east,state=on": {
+      "y": 90,
+      "model": "computercraft:block/computer_advanced_on"
+    },
+    "facing=north,state=blinking": {
+      "y": 0,
+      "model": "computercraft:block/computer_advanced_blinking"
+    },
+    "facing=north,state=off": {
+      "y": 0,
+      "model": "computercraft:block/computer_advanced_off"
+    },
+    "facing=north,state=on": {
+      "y": 0,
+      "model": "computercraft:block/computer_advanced_on"
+    },
+    "facing=south,state=blinking": {
+      "y": 180,
+      "model": "computercraft:block/computer_advanced_blinking"
+    },
+    "facing=south,state=off": {
+      "y": 180,
+      "model": "computercraft:block/computer_advanced_off"
+    },
+    "facing=south,state=on": {
+      "y": 180,
+      "model": "computercraft:block/computer_advanced_on"
+    },
+    "facing=west,state=blinking": {
+      "y": 270,
+      "model": "computercraft:block/computer_advanced_blinking"
+    },
+    "facing=west,state=off": {
+      "y": 270,
+      "model": "computercraft:block/computer_advanced_off"
+    },
+    "facing=west,state=on": {
+      "y": 270,
+      "model": "computercraft:block/computer_advanced_on"
+    }
+  }
+}

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

@@ -0,0 +1,52 @@
+{
+  "variants": {
+    "facing=east,state=blinking": {
+      "y": 90,
+      "model": "computercraft:block/computer_command_blinking"
+    },
+    "facing=east,state=off": {
+      "y": 90,
+      "model": "computercraft:block/computer_command_off"
+    },
+    "facing=east,state=on": {
+      "y": 90,
+      "model": "computercraft:block/computer_command_on"
+    },
+    "facing=north,state=blinking": {
+      "y": 0,
+      "model": "computercraft:block/computer_command_blinking"
+    },
+    "facing=north,state=off": {
+      "y": 0,
+      "model": "computercraft:block/computer_command_off"
+    },
+    "facing=north,state=on": {
+      "y": 0,
+      "model": "computercraft:block/computer_command_on"
+    },
+    "facing=south,state=blinking": {
+      "y": 180,
+      "model": "computercraft:block/computer_command_blinking"
+    },
+    "facing=south,state=off": {
+      "y": 180,
+      "model": "computercraft:block/computer_command_off"
+    },
+    "facing=south,state=on": {
+      "y": 180,
+      "model": "computercraft:block/computer_command_on"
+    },
+    "facing=west,state=blinking": {
+      "y": 270,
+      "model": "computercraft:block/computer_command_blinking"
+    },
+    "facing=west,state=off": {
+      "y": 270,
+      "model": "computercraft:block/computer_command_off"
+    },
+    "facing=west,state=on": {
+      "y": 270,
+      "model": "computercraft:block/computer_command_on"
+    }
+  }
+}

src/generated/resources/assets/computercraft/blockstates/computer_normal.json

@@ -0,0 +1,52 @@
+{
+  "variants": {
+    "facing=east,state=blinking": {
+      "y": 90,
+      "model": "computercraft:block/computer_normal_blinking"
+    },
+    "facing=east,state=off": {
+      "y": 90,
+      "model": "computercraft:block/computer_normal_off"
+    },
+    "facing=east,state=on": {
+      "y": 90,
+      "model": "computercraft:block/computer_normal_on"
+    },
+    "facing=north,state=blinking": {
+      "y": 0,
+      "model": "computercraft:block/computer_normal_blinking"
+    },
+    "facing=north,state=off": {
+      "y": 0,
+      "model": "computercraft:block/computer_normal_off"
+    },
+    "facing=north,state=on": {
+      "y": 0,
+      "model": "computercraft:block/computer_normal_on"
+    },
+    "facing=south,state=blinking": {
+      "y": 180,
+      "model": "computercraft:block/computer_normal_blinking"
+    },
+    "facing=south,state=off": {
+      "y": 180,
+      "model": "computercraft:block/computer_normal_off"
+    },
+    "facing=south,state=on": {
+      "y": 180,
+      "model": "computercraft:block/computer_normal_on"
+    },
+    "facing=west,state=blinking": {
+      "y": 270,
+      "model": "computercraft:block/computer_normal_blinking"
+    },
+    "facing=west,state=off": {
+      "y": 270,
+      "model": "computercraft:block/computer_normal_off"
+    },
+    "facing=west,state=on": {
+      "y": 270,
+      "model": "computercraft:block/computer_normal_on"
+    }
+  }
+}