Merge branch 'mc-1.18.x' into mc-1.19.2

0/10, would not recommend.

.github/workflows/main-ci.yml

@@ -14,7 +14,7 @@ jobs:
     - name: Set up Java
       uses: actions/setup-java@v3
       with:
-        java-version: 8
+        java-version: 17
         distribution: 'temurin'
 
     - name: Setup Gradle

.github/workflows/make-doc.yml

@@ -17,7 +17,7 @@ jobs:
     - name: Set up Java
       uses: actions/setup-java@v1
       with:
-        java-version: 8
+        java-version: 17
         distribution: 'temurin'
 
     - name: Setup Gradle

build.gradle.kts

@@ -43,6 +43,10 @@ minecraft {
         // configureEach would be better, but we need to eagerly configure configs or otherwise the run task doesn't
         // get set up properly.
         all {
+            lazyToken("minecraft_classpath") {
+                configurations["shade"].copyRecursive().resolve().joinToString(File.pathSeparator) { it.absolutePath }
+            }
+
             property("forge.logging.markers", "REGISTRIES")
             property("forge.logging.console.level", "debug")
 
@@ -75,6 +79,24 @@ minecraft {
         }
 
         fun RunConfig.configureForGameTest() {
+            val old = lazyTokens.get("minecraft_classpath")
+            lazyToken("minecraft_classpath") {
+                // We do some terrible hacks here to basically find all things not already on the runtime classpath
+                // and add them. /Except/ for our source sets, as those need to load inside the Minecraft classpath.
+                val testMod = configurations["testModRuntimeClasspath"].resolve()
+                val implementation = configurations.runtimeClasspath.get().resolve()
+                val new = (testMod - implementation)
+                    .asSequence()
+                    .filter { it.isFile && !it.name.endsWith("-test-fixtures.jar") }
+                    .map { it.absolutePath }
+                    .joinToString(File.pathSeparator)
+                if (old == null) new else old.get() + File.pathSeparator + new
+            }
+
+            property("cctest.sources", file("src/testMod/resources/data/cctest").absolutePath)
+
+            arg("--mixin.config=computercraft-gametest.mixins.json")
+
             mods.register("cctest") {
                 source(sourceSets["testMod"])
                 source(sourceSets["testFixtures"])
@@ -87,12 +109,10 @@ minecraft {
             configureForGameTest()
         }
 
-        val testServer by registering {
+        val gameTestServer by registering {
             workingDirectory(file("run/testServer"))
-            parent(server.get())
             configureForGameTest()
 
-            property("cctest.run", "true")
             property("forge.logging.console.level", "info")
         }
     }
@@ -100,7 +120,6 @@ minecraft {
     mappings("parchment", "${libs.versions.parchmentMc.get()}-${libs.versions.parchment.get()}-$mcVersion")
 
     accessTransformer(file("src/main/resources/META-INF/accesstransformer.cfg"))
-    accessTransformer(file("src/testMod/resources/META-INF/accesstransformer.cfg"))
 }
 
 mixin {
@@ -120,18 +139,18 @@ configurations {
 
 dependencies {
     minecraft("net.minecraftforge:forge:$mcVersion-${libs.versions.forge.get()}")
-    annotationProcessor("org.spongepowered:mixin:0.8.4:processor")
+    annotationProcessor("org.spongepowered:mixin:0.8.5:processor")
 
     compileOnly(libs.jetbrainsAnnotations)
     annotationProcessorEverywhere(libs.autoService)
 
-    "extraModsCompileOnly"(fg.deobf("mezz.jei:jei-1.16.5:7.7.0.104:api"))
+    "extraModsCompileOnly"(fg.deobf("mezz.jei:jei-1.19.2-forge-api:11.3.0.262"))
-    "extraModsRuntimeOnly"(fg.deobf("mezz.jei:jei-1.16.5:7.7.0.104"))
+    "extraModsCompileOnly"(fg.deobf("mezz.jei:jei-1.19.2-common-api:11.3.0.262"))
-
+    "extraModsRuntimeOnly"(fg.deobf("mezz.jei:jei-1.19.2-forge:11.3.0.262"))
-    "extraModsCompileOnly"(fg.deobf("com.blamejared.crafttweaker:CraftTweaker-1.16.5:7.1.0.313"))
+    "extraModsCompileOnly"(fg.deobf("maven.modrinth:oculus:1.2.5"))
-    "extraModsCompileOnly"(fg.deobf("commoble.morered:morered-1.16.5:2.1.1.0"))
 
     "shade"(libs.cobalt)
+    "shade"("io.netty:netty-codec-http:4.1.76.Final")
 
     testFixturesApi(libs.bundles.test)
     testFixturesApi(libs.bundles.kotlin)
@@ -151,7 +170,7 @@ illuaminate {
 
 tasks.javadoc {
     include("dan200/computercraft/api/**/*.java")
-    (options as StandardJavadocDocletOptions).links("https://docs.oracle.com/javase/8/docs/api/")
+    (options as StandardJavadocDocletOptions).links("https://docs.oracle.com/en/java/javase/17/docs/api/")
 }
 
 val apiJar by tasks.registering(Jar::class) {
@@ -177,7 +196,7 @@ val luaJavadoc by tasks.registering(Javadoc::class) {
 
     javadocTool.set(
         javaToolchains.javadocToolFor {
-            languageVersion.set(JavaLanguageVersion.of(11))
+            languageVersion.set(cc.tweaked.gradle.CCTweakedPlugin.JAVA_VERSION)
         },
     )
 }
@@ -187,7 +206,7 @@ tasks.processResources {
     inputs.property("forgeVersion", libs.versions.forge.get())
     inputs.property("gitHash", cct.gitHash)
 
-    filesMatching("data/computercraft/lua/rom/help/credits.txt") {
+    filesMatching("data/computercraft/lua/rom/help/credits.md") {
         expand(mapOf("gitContributors" to cct.gitContributors.get().joinToString("\n")))
     }
 
@@ -320,25 +339,14 @@ val lintLua by tasks.registering(IlluaminateExec::class) {
     doLast { if (System.getenv("GITHUB_ACTIONS") != null) println("::remove-matcher owner=illuaminate::") }
 }
 
-val setupRunGametest by tasks.registering(Copy::class) {
-    group = LifecycleBasePlugin.VERIFICATION_GROUP
-    description = "Sets up the environment for the test server."
-
-    from("src/testMod/server-files") {
-        include("eula.txt")
-        include("server.properties")
-    }
-    into("run/testServer")
-}
-
 val runGametest by tasks.registering(JavaExec::class) {
     group = LifecycleBasePlugin.VERIFICATION_GROUP
     description = "Runs tests on a temporary Minecraft instance."
-    dependsOn(setupRunGametest, "cleanRunGametest")
+    dependsOn("cleanRunGametest")
 
-    // Copy from runTestServer. We do it in this slightly odd way as runTestServer
+    // Copy from runGameTestServer. We do it in this slightly odd way as runGameTestServer
     // isn't created until the task is configured (which is no good for us).
-    val exec = tasks.getByName<JavaExec>("runTestServer")
+    val exec = tasks.getByName<JavaExec>("runGameTestServer")
     dependsOn(exec.dependsOn)
     exec.copyToFull(this)
 }
@@ -364,7 +372,7 @@ val publishCurseForge by tasks.registering(TaskPublishCurseForge::class) {
     apiToken = findProperty("curseForgeApiKey") ?: ""
     enabled = apiToken != ""
 
-    val mainFile = upload("282001", tasks.shadowJar)
+    val mainFile = upload("282001", tasks.shadowJar.get().archiveFile)
     dependsOn(tasks.shadowJar) // Ughr.
     mainFile.changelog = "Release notes can be found on the [GitHub repository](https://github.com/cc-tweaked/CC-Tweaked/releases/tag/v$mcVersion-$modVersion)."
     mainFile.changelogType = "markdown"
@@ -445,6 +453,8 @@ publishing {
     repositories {
         maven("https://squiddev.cc/maven") {
             name = "SquidDev"
+
+            credentials(PasswordCredentials::class)
         }
     }
 }

buildSrc/src/main/kotlin/cc/tweaked/gradle/CCTweakedExtension.kt

@@ -26,12 +26,12 @@ abstract class CCTweakedExtension(
 ) {
     /** Get the hash of the latest git commit. */
     val gitHash: Provider<String> = gitProvider(project, "<no git hash>") {
-        ProcessHelpers.captureOut("git", "-C", project.projectDir.absolutePath, "rev-parse", "HEAD")
+        ProcessHelpers.captureOut("git", "-C", project.projectDir.absolutePath, "rev-parse", "HEAD").trim()
     }
 
     /** Get the current git branch. */
     val gitBranch: Provider<String> = gitProvider(project, "<no git branch>") {
-        ProcessHelpers.captureOut("git", "-C", project.projectDir.absolutePath, "rev-parse", "--abbrev-ref", "HEAD")
+        ProcessHelpers.captureOut("git", "-C", project.projectDir.absolutePath, "rev-parse", "--abbrev-ref", "HEAD").trim()
     }
 
     /** Get a list of all contributors to the project. */

buildSrc/src/main/kotlin/cc/tweaked/gradle/CCTweakedPlugin.kt

@@ -13,6 +13,6 @@ class CCTweakedPlugin : Plugin<Project> {
     }
 
     companion object {
-        val JAVA_VERSION = JavaLanguageVersion.of(8)
+        val JAVA_VERSION = JavaLanguageVersion.of(17)
     }
 }

config/checkstyle/checkstyle.xml

@@ -58,20 +58,29 @@
         <module name="SimplifyBooleanExpression" />
         <module name="SimplifyBooleanReturn" />
         <module name="StringLiteralEquality" />
-        <module name="UnnecessaryParentheses" />
+        <module name="UnnecessaryParentheses">
+            <!-- Default minus LAND. -->
+            <property name="tokens" value="EXPR,IDENT,NUM_DOUBLE,NUM_FLOAT,NUM_INT,NUM_LONG,STRING_LITERAL,LITERAL_NULL,LITERAL_FALSE,LITERAL_TRUE,ASSIGN,BAND_ASSIGN,BOR_ASSIGN,BSR_ASSIGN,BXOR_ASSIGN,DIV_ASSIGN,MINUS_ASSIGN,MOD_ASSIGN,PLUS_ASSIGN,SL_ASSIGN,SR_ASSIGN,STAR_ASSIGN,LAMBDA,TEXT_BLOCK_LITERAL_BEGIN,LITERAL_INSTANCEOF,GT,LT,GE,LE,EQUAL,NOT_EQUAL,UNARY_MINUS,UNARY_PLUS,INC,DEC,LNOT,BNOT,POST_INC,POST_DEC" />
+        </module>
         <module name="UnnecessarySemicolonAfterTypeMemberDeclaration" />
         <module name="UnnecessarySemicolonInTryWithResources" />
         <module name="UnnecessarySemicolonInEnumeration" />
 
         <!-- Imports -->
-        <module name="CustomImportOrder" />
+        <module name="CustomImportOrder">
+            <property name="customImportOrderRules"
+                value="THIRD_PARTY_PACKAGE###STANDARD_JAVA_PACKAGE###STATIC"
+            />
+        </module>
         <module name="IllegalImport" />
         <module name="RedundantImport" />
         <module name="UnusedImports" />
 
         <!-- Javadoc -->
         <!-- TODO: Missing* checks for the dan200.computercraft.api package? -->
-        <module name="AtclauseOrder" />
+        <module name="AtclauseOrder">
+            <property name="tagOrder" value="@param, @return, @throws, @deprecated"/>
+        </module>
         <module name="InvalidJavadocPosition" />
         <module name="JavadocBlockTagLocation" />
         <module name="JavadocMethod"/>
@@ -100,7 +109,9 @@
         <module name="LocalFinalVariableName" />
         <module name="LocalVariableName" />
         <module name="MemberName" />
-        <module name="MethodName" />
+        <module name="MethodName">
+            <property name="format" value="^(computercraft\$)?[a-z][a-zA-Z0-9]*$" />
+        </module>
         <module name="MethodTypeParameterName" />
         <module name="PackageName">
             <property name="format" value="^dan200\.computercraft(\.[a-z][a-z0-9]*)*" />
@@ -108,11 +119,6 @@
         <module name="ParameterName" />
         <module name="StaticVariableName">
             <property name="format" value="^[a-z][a-zA-Z0-9]*|CAPABILITY(_[A-Z_]+)?$" />
-            <property name="applyToPrivate" value="false" />
-        </module>
-        <module name="StaticVariableName">
-            <property name="format" value="^(s_)?[a-z][a-zA-Z0-9]*|CAPABILITY(_[A-Z_]+)?$" />
-            <property name="applyToPrivate" value="true" />
         </module>
         <module name="TypeName" />
 
@@ -156,6 +162,7 @@
             <property name="allowEmptyLambdas" value="true" />
             <property name="allowEmptyMethods" value="true" />
             <property name="allowEmptyConstructors" value="true" />
+            <property name="allowEmptyTypes" value="true" />
 
             <property name="tokens" value="ASSIGN,BAND,BAND_ASSIGN,BOR,BOR_ASSIGN,BSR,BSR_ASSIGN,BXOR,BXOR_ASSIGN,COLON,DIV,DIV_ASSIGN,EQUAL,GE,GT,LAMBDA,LAND,LCURLY,LE,LITERAL_RETURN,LOR,LT,MINUS,MINUS_ASSIGN,MOD,MOD_ASSIGN,NOT_EQUAL,PLUS,PLUS_ASSIGN,QUESTION,RCURLY,SL,SLIST,SL_ASSIGN,SR,SR_ASSIGN,STAR,STAR_ASSIGN,LITERAL_ASSERT,TYPE_EXTENSION_AND" />
         </module>

config/gitpod/Dockerfile

@@ -3,6 +3,6 @@ FROM gitpod/workspace-base
 USER gitpod
 
 RUN sudo apt-get -q update \
- && sudo apt-get install -yq openjdk-8-jdk openjdk-16-jdk python3-pip npm \
+ && sudo apt-get install -yq openjdk-16-jdk python3-pip npm \
  && sudo pip3 install pre-commit \
- && sudo update-java-alternatives --set java-1.8.0-openjdk-amd64
+ && sudo update-java-alternatives --set java-1.16.0-openjdk-amd64

doc/stub/fs.lua

@@ -1,64 +0,0 @@
---- @module fs
-
---- Returns true if a path is mounted to the parent filesystem.
---
--- The root filesystem "/" is considered a mount, along with disk folders and
--- the rom folder. Other programs (such as network shares) can exstend this to
--- make other mount types by correctly assigning their return value for getDrive.
---
--- @tparam string path The path to check.
--- @treturn boolean If the path is mounted, rather than a normal file/folder.
--- @throws If the path does not exist.
--- @see getDrive
--- @since 1.87.0
-function isDriveRoot(path) end
-
---[[- Provides completion for a file or directory name, suitable for use with
-@{_G.read}.
-
-When a directory is a possible candidate for completion, two entries are
-included - one with a trailing slash (indicating that entries within this
-directory exist) and one without it (meaning this entry is an immediate
-completion candidate). `include_dirs` can be set to @{false} to only include
-those with a trailing slash.
-
-@tparam[1] string path The path to complete.
-@tparam[1] string location The location where paths are resolved from.
-@tparam[1,opt=true] boolean include_files When @{false}, only directories will
-be included in the returned list.
-@tparam[1,opt=true] boolean include_dirs When @{false}, "raw" directories will
-not be included in the returned list.
-
-@tparam[2] string path The path to complete.
-@tparam[2] string location The location where paths are resolved from.
-@tparam[2] {
-    include_dirs? = boolean, include_files? = boolean,
-    include_hidden? = boolean
-} options
-This table form is an expanded version of the previous syntax. The
-`include_files` and `include_dirs` arguments from above are passed in as fields.
-
-This table also accepts the following options:
- - `include_hidden`: Whether to include hidden files (those starting with `.`)
-   by default. They will still be shown when typing a `.`.
-
-@treturn { string... } A list of possible completion candidates.
-@since 1.74
-@changed 1.101.0
-@usage Complete files in the root directory.
-
-    read(nil, nil, function(str)
-        return fs.complete(str, "", true, false)
-    end)
-
-@usage Complete files in the root directory, hiding hidden files by default.
-
-    read(nil, nil, function(str)
-        return fs.complete(str, "", {
-            include_files = true,
-            include_dirs = false,
-            included_hidden = false,
-        })
-    end)
-]]
-function complete(path, location, include_files, include_dirs) end

doc/stub/http.lua

@@ -1,177 +0,0 @@
---- Make HTTP requests, sending and receiving data to a remote web server.
---
--- @module http
--- @since 1.1
--- @see local_ips To allow accessing servers running on your local network.
-
---- Asynchronously make a HTTP request to the given url.
---
--- This returns immediately, a @{http_success} or @{http_failure} will be queued
--- once the request has completed.
---
--- @tparam      string url   The url to request
--- @tparam[opt] string body  An optional string containing the body of the
--- request. If specified, a `POST` request will be made instead.
--- @tparam[opt] { [string] = string } headers Additional headers to send as part
--- of this request.
--- @tparam[opt] boolean binary Whether to make a binary HTTP request. If true,
--- the body will not be UTF-8 encoded, and the received response will not be
--- decoded.
---
--- @tparam[2] {
---   url = string, body? = string, headers? = { [string] = string },
---   binary? = boolean, method? = string, redirect? = boolean,
--- } request Options for the request.
---
--- This table form is an expanded version of the previous syntax. All arguments
--- from above are passed in as fields instead (for instance,
--- `http.request("https://example.com")` becomes `http.request { url =
--- "https://example.com" }`).
---
--- This table also accepts several additional options:
---
---  - `method`: Which HTTP method to use, for instance `"PATCH"` or `"DELETE"`.
---  - `redirect`: Whether to follow HTTP redirects. Defaults to true.
---
--- @see http.get  For a synchronous way to make GET requests.
--- @see http.post For a synchronous way to make POST requests.
---
--- @changed 1.63 Added argument for headers.
--- @changed 1.80pr1 Added argument for binary handles.
--- @changed 1.80pr1.6 Added support for table argument.
--- @changed 1.86.0 Added PATCH and TRACE methods.
-function request(...) end
-
---- Make a HTTP GET request to the given url.
---
--- @tparam string url   The url to request
--- @tparam[opt] { [string] = string } headers Additional headers to send as part
--- of this request.
--- @tparam[opt] boolean binary Whether to make a binary HTTP request. If true,
--- the body will not be UTF-8 encoded, and the received response will not be
--- decoded.
---
--- @tparam[2] {
---   url = string, headers? = { [string] = string },
---   binary? = boolean, method? = string, redirect? = boolean,
--- } request Options for the request. See @{http.request} for details on how
--- these options behave.
---
--- @treturn Response The resulting http response, which can be read from.
--- @treturn[2] nil When the http request failed, such as in the event of a 404
--- error or connection timeout.
--- @treturn string A message detailing why the request failed.
--- @treturn Response|nil The failing http response, if available.
---
--- @changed 1.63 Added argument for headers.
--- @changed 1.80pr1 Response handles are now returned on error if available.
--- @changed 1.80pr1 Added argument for binary handles.
--- @changed 1.80pr1.6 Added support for table argument.
--- @changed 1.86.0 Added PATCH and TRACE methods.
---
--- @usage Make a request to [example.tweaked.cc](https://example.tweaked.cc),
--- and print the returned page.
--- ```lua
--- local request = http.get("https://example.tweaked.cc")
--- print(request.readAll())
--- -- => HTTP is working!
--- request.close()
--- ```
-function get(...) end
-
---- Make a HTTP POST request to the given url.
---
--- @tparam string url   The url to request
--- @tparam string body  The body of the POST request.
--- @tparam[opt] { [string] = string } headers Additional headers to send as part
--- of this request.
--- @tparam[opt] boolean binary Whether to make a binary HTTP request. If true,
--- the body will not be UTF-8 encoded, and the received response will not be
--- decoded.
---
--- @tparam[2] {
---   url = string, body? = string, headers? = { [string] = string },
---   binary? = boolean, method? = string, redirect? = boolean,
--- } request Options for the request. See @{http.request} for details on how
--- these options behave.
---
--- @treturn Response The resulting http response, which can be read from.
--- @treturn[2] nil When the http request failed, such as in the event of a 404
--- error or connection timeout.
--- @treturn string A message detailing why the request failed.
--- @treturn Response|nil The failing http response, if available.
---
--- @since 1.31
--- @changed 1.63 Added argument for headers.
--- @changed 1.80pr1 Response handles are now returned on error if available.
--- @changed 1.80pr1 Added argument for binary handles.
--- @changed 1.80pr1.6 Added support for table argument.
--- @changed 1.86.0 Added PATCH and TRACE methods.
-function post(...) end
-
---- Asynchronously determine whether a URL can be requested.
---
--- If this returns `true`, one should also listen for @{http_check} which will
--- container further information about whether the URL is allowed or not.
---
--- @tparam string url The URL to check.
--- @treturn true When this url is not invalid. This does not imply that it is
--- allowed - see the comment above.
--- @treturn[2] false When this url is invalid.
--- @treturn string A reason why this URL is not valid (for instance, if it is
--- malformed, or blocked).
---
--- @see http.checkURL For a synchronous version.
-function checkURLAsync(url) end
-
---- Determine whether a URL can be requested.
---
--- If this returns `true`, one should also listen for @{http_check} which will
--- container further information about whether the URL is allowed or not.
---
--- @tparam string url The URL to check.
--- @treturn true When this url is valid and can be requested via @{http.request}.
--- @treturn[2] false When this url is invalid.
--- @treturn string A reason why this URL is not valid (for instance, if it is
--- malformed, or blocked).
---
--- @see http.checkURLAsync For an asynchronous version.
---
--- @usage
--- ```lua
--- print(http.checkURL("https://example.tweaked.cc/"))
--- -- => true
--- print(http.checkURL("http://localhost/"))
--- -- => false Domain not permitted
--- print(http.checkURL("not a url"))
--- -- => false URL malformed
--- ```
-function checkURL(url) end
-
---- Open a websocket.
---
--- @tparam string url The websocket url to connect to. This should have the
--- `ws://` or `wss://` protocol.
--- @tparam[opt] { [string] = string } headers Additional headers to send as part
--- of the initial websocket connection.
---
--- @treturn Websocket The websocket connection.
--- @treturn[2] false If the websocket connection failed.
--- @treturn string An error message describing why the connection failed.
--- @since 1.80pr1.1
--- @changed 1.80pr1.3 No longer asynchronous.
--- @changed 1.95.3 Added User-Agent to default headers.
-function websocket(url, headers) end
-
---- Asynchronously open a websocket.
---
--- This returns immediately, a @{websocket_success} or @{websocket_failure}
--- will be queued once the request has completed.
---
--- @tparam string url The websocket url to connect to. This should have the
--- `ws://` or `wss://` protocol.
--- @tparam[opt] { [string] = string } headers Additional headers to send as part
--- of the initial websocket connection.
--- @since 1.80pr1.3
--- @changed 1.95.3 Added User-Agent to default headers.
-function websocketAsync(url, headers) end

gradle.properties

@@ -5,7 +5,7 @@ kotlin.stdlib.default.dependency=false
 kotlin.jvm.target.validation.mode=error
 
 # Mod properties
-modVersion=1.101.0
+modVersion=1.101.3
 
 # Minecraft properties: We want to configure this here so we can read it in settings.gradle
-mcVersion=1.16.5
+mcVersion=1.19.2

gradle/libs.versions.toml

@@ -2,12 +2,12 @@
 
 # Minecraft
 # MC version is specified in gradle.properties, as we need that in settings.gradle.
-forge = "36.2.34"
+forge = "43.1.1"
-parchment = "2021.08.08"
+parchment = "2022.10.16"
-parchmentMc = "1.16.5"
+parchmentMc = "1.19.2"
 
 autoService = "1.0.1"
-cobalt = { strictly = "[0.5.8,0.6.0)", prefer = "0.5.8" }
+cobalt = "0.6.0"
 jetbrainsAnnotations = "23.0.0"
 kotlin = "1.7.10"
 kotlin-coroutines = "1.6.0"
@@ -19,11 +19,11 @@ junit = "5.9.1"
 
 # Build tools
 cctJavadoc = "1.5.2"
-checkstyle = "8.25" # There's a reason we're pinned on an ancient version, but I can't remember what it is.
+checkstyle = "10.3.4"
 curseForgeGradle = "1.0.11"
 forgeGradle = "5.1.+"
 githubRelease = "2.2.12"
-illuaminate = "0.1.0-7-g2a5a89c"
+illuaminate = "0.1.0-20-g8c483a4"
 librarian = "1.+"
 minotaur = "2.+"
 mixinGradle = "0.7.+"

illuaminate.sexp

@@ -111,6 +111,6 @@
   (lint
     (globals
       :max sleep write
-      cct_test describe expect howlci fail it pending stub)))
+      cct_test describe expect howlci fail it pending stub before_each)))
 
 (at /src/web/mount/expr_template.lua (lint (globals :max __expr__)))

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

@@ -1,125 +1,125 @@
 {
   "multipart": [
     {
+      "apply": {"model": "computercraft:block/cable_core_facing", "x": 90},
       "when": {
         "OR": [
-          {"east": "false", "north": "false", "south": "false", "cable": "true", "up": "true", "west": "false"},
+          {"cable": "true", "east": "false", "north": "false", "south": "false", "up": "true", "west": "false"},
-          {"down": "true", "east": "false", "north": "false", "south": "false", "cable": "true", "west": "false"}
+          {"cable": "true", "down": "true", "east": "false", "north": "false", "south": "false", "west": "false"}
         ]
-      },
+      }
-      "apply": {"model": "computercraft:block/cable_core_facing", "x": 90}
     },
     {
+      "apply": {"model": "computercraft:block/cable_core_facing", "y": 0},
       "when": {
         "OR": [
           {
+            "cable": "true",
             "down": "false",
             "east": "false",
             "north": "false",
             "south": "false",
-            "cable": "true",
             "up": "false",
             "west": "false"
           },
-          {"down": "false", "east": "false", "north": "true", "cable": "true", "up": "false", "west": "false"},
+          {"cable": "true", "down": "false", "east": "false", "north": "true", "up": "false", "west": "false"},
-          {"down": "false", "east": "false", "south": "true", "cable": "true", "up": "false", "west": "false"}
+          {"cable": "true", "down": "false", "east": "false", "south": "true", "up": "false", "west": "false"}
         ]
-      },
+      }
-      "apply": {"model": "computercraft:block/cable_core_facing", "y": 0}
     },
     {
+      "apply": {"model": "computercraft:block/cable_core_facing", "y": 90},
       "when": {
         "OR": [
-          {"down": "false", "east": "true", "north": "false", "south": "false", "cable": "true", "up": "false"},
+          {"cable": "true", "down": "false", "east": "true", "north": "false", "south": "false", "up": "false"},
-          {"down": "false", "north": "false", "south": "false", "cable": "true", "up": "false", "west": "true"}
+          {"cable": "true", "down": "false", "north": "false", "south": "false", "up": "false", "west": "true"}
         ]
-      },
+      }
-      "apply": {"model": "computercraft:block/cable_core_facing", "y": 90}
     },
     {
+      "apply": {"model": "computercraft:block/cable_core_any"},
       "when": {
         "OR": [
-          {"down": "true", "north": "true", "cable": "true"},
+          {"cable": "true", "down": "true", "north": "true"},
-          {"down": "true", "south": "true", "cable": "true"},
+          {"cable": "true", "down": "true", "south": "true"},
-          {"down": "true", "cable": "true", "west": "true"},
+          {"cable": "true", "down": "true", "west": "true"},
-          {"down": "true", "east": "true", "cable": "true"},
+          {"cable": "true", "down": "true", "east": "true"},
-          {"north": "true", "cable": "true", "up": "true"},
+          {"cable": "true", "north": "true", "up": "true"},
-          {"south": "true", "cable": "true", "up": "true"},
+          {"cable": "true", "south": "true", "up": "true"},
           {"cable": "true", "up": "true", "west": "true"},
-          {"east": "true", "cable": "true", "up": "true"},
+          {"cable": "true", "east": "true", "up": "true"},
-          {"north": "true", "cable": "true", "west": "true"},
+          {"cable": "true", "north": "true", "west": "true"},
-          {"east": "true", "north": "true", "cable": "true"},
+          {"cable": "true", "east": "true", "north": "true"},
-          {"south": "true", "cable": "true", "west": "true"},
+          {"cable": "true", "south": "true", "west": "true"},
-          {"east": "true", "south": "true", "cable": "true"}
+          {"cable": "true", "east": "true", "south": "true"}
         ]
-      },
+      }
-      "apply": {"model": "computercraft:block/cable_core_any"}
     },
-    {"when": {"down": "true"}, "apply": {"model": "computercraft:block/cable_arm", "x": 270, "y": 0}},
+    {"apply": {"model": "computercraft:block/cable_arm", "x": 270, "y": 0}, "when": {"down": "true"}},
-    {"when": {"up": "true"}, "apply": {"model": "computercraft:block/cable_arm", "x": 90, "y": 0}},
+    {"apply": {"model": "computercraft:block/cable_arm", "x": 90, "y": 0}, "when": {"up": "true"}},
-    {"when": {"north": "true"}, "apply": {"model": "computercraft:block/cable_arm", "x": 0, "y": 180}},
+    {"apply": {"model": "computercraft:block/cable_arm", "x": 0, "y": 180}, "when": {"north": "true"}},
-    {"when": {"south": "true"}, "apply": {"model": "computercraft:block/cable_arm", "x": 0, "y": 0}},
+    {"apply": {"model": "computercraft:block/cable_arm", "x": 0, "y": 0}, "when": {"south": "true"}},
-    {"when": {"west": "true"}, "apply": {"model": "computercraft:block/cable_arm", "x": 0, "y": 90}},
+    {"apply": {"model": "computercraft:block/cable_arm", "x": 0, "y": 90}, "when": {"west": "true"}},
-    {"when": {"east": "true"}, "apply": {"model": "computercraft:block/cable_arm", "x": 0, "y": 270}},
+    {"apply": {"model": "computercraft:block/cable_arm", "x": 0, "y": 270}, "when": {"east": "true"}},
-    {"when": {"modem": "down_off"}, "apply": {"model": "computercraft:block/wired_modem_off", "x": 90, "y": 0}},
+    {"apply": {"model": "computercraft:block/wired_modem_off", "x": 90, "y": 0}, "when": {"modem": "down_off"}},
     {
-      "when": {"modem": "down_off_peripheral"},
+      "apply": {"model": "computercraft:block/wired_modem_off_peripheral", "x": 90, "y": 0},
-      "apply": {"model": "computercraft:block/wired_modem_off_peripheral", "x": 90, "y": 0}
+      "when": {"modem": "down_off_peripheral"}
     },
-    {"when": {"modem": "down_on"}, "apply": {"model": "computercraft:block/wired_modem_on", "x": 90, "y": 0}},
+    {"apply": {"model": "computercraft:block/wired_modem_on", "x": 90, "y": 0}, "when": {"modem": "down_on"}},
     {
-      "when": {"modem": "down_on_peripheral"},
+      "apply": {"model": "computercraft:block/wired_modem_on_peripheral", "x": 90, "y": 0},
-      "apply": {"model": "computercraft:block/wired_modem_on_peripheral", "x": 90, "y": 0}
+      "when": {"modem": "down_on_peripheral"}
     },
-    {"when": {"modem": "up_off"}, "apply": {"model": "computercraft:block/wired_modem_off", "x": 270, "y": 0}},
+    {"apply": {"model": "computercraft:block/wired_modem_off", "x": 270, "y": 0}, "when": {"modem": "up_off"}},
     {
-      "when": {"modem": "up_off_peripheral"},
+      "apply": {"model": "computercraft:block/wired_modem_off_peripheral", "x": 270, "y": 0},
-      "apply": {"model": "computercraft:block/wired_modem_off_peripheral", "x": 270, "y": 0}
+      "when": {"modem": "up_off_peripheral"}
     },
-    {"when": {"modem": "up_on"}, "apply": {"model": "computercraft:block/wired_modem_on", "x": 270, "y": 0}},
+    {"apply": {"model": "computercraft:block/wired_modem_on", "x": 270, "y": 0}, "when": {"modem": "up_on"}},
     {
-      "when": {"modem": "up_on_peripheral"},
+      "apply": {"model": "computercraft:block/wired_modem_on_peripheral", "x": 270, "y": 0},
-      "apply": {"model": "computercraft:block/wired_modem_on_peripheral", "x": 270, "y": 0}
+      "when": {"modem": "up_on_peripheral"}
     },
-    {"when": {"modem": "north_off"}, "apply": {"model": "computercraft:block/wired_modem_off", "x": 0, "y": 0}},
+    {"apply": {"model": "computercraft:block/wired_modem_off", "x": 0, "y": 0}, "when": {"modem": "north_off"}},
     {
-      "when": {"modem": "north_off_peripheral"},
+      "apply": {"model": "computercraft:block/wired_modem_off_peripheral", "x": 0, "y": 0},
-      "apply": {"model": "computercraft:block/wired_modem_off_peripheral", "x": 0, "y": 0}
+      "when": {"modem": "north_off_peripheral"}
     },
-    {"when": {"modem": "north_on"}, "apply": {"model": "computercraft:block/wired_modem_on", "x": 0, "y": 0}},
+    {"apply": {"model": "computercraft:block/wired_modem_on", "x": 0, "y": 0}, "when": {"modem": "north_on"}},
     {
-      "when": {"modem": "north_on_peripheral"},
+      "apply": {"model": "computercraft:block/wired_modem_on_peripheral", "x": 0, "y": 0},
-      "apply": {"model": "computercraft:block/wired_modem_on_peripheral", "x": 0, "y": 0}
+      "when": {"modem": "north_on_peripheral"}
     },
-    {"when": {"modem": "south_off"}, "apply": {"model": "computercraft:block/wired_modem_off", "x": 0, "y": 180}},
+    {"apply": {"model": "computercraft:block/wired_modem_off", "x": 0, "y": 180}, "when": {"modem": "south_off"}},
     {
-      "when": {"modem": "south_off_peripheral"},
+      "apply": {"model": "computercraft:block/wired_modem_off_peripheral", "x": 0, "y": 180},
-      "apply": {"model": "computercraft:block/wired_modem_off_peripheral", "x": 0, "y": 180}
+      "when": {"modem": "south_off_peripheral"}
     },
-    {"when": {"modem": "south_on"}, "apply": {"model": "computercraft:block/wired_modem_on", "x": 0, "y": 180}},
+    {"apply": {"model": "computercraft:block/wired_modem_on", "x": 0, "y": 180}, "when": {"modem": "south_on"}},
     {
-      "when": {"modem": "south_on_peripheral"},
+      "apply": {"model": "computercraft:block/wired_modem_on_peripheral", "x": 0, "y": 180},
-      "apply": {"model": "computercraft:block/wired_modem_on_peripheral", "x": 0, "y": 180}
+      "when": {"modem": "south_on_peripheral"}
     },
-    {"when": {"modem": "west_off"}, "apply": {"model": "computercraft:block/wired_modem_off", "x": 0, "y": 270}},
+    {"apply": {"model": "computercraft:block/wired_modem_off", "x": 0, "y": 270}, "when": {"modem": "west_off"}},
     {
-      "when": {"modem": "west_off_peripheral"},
+      "apply": {"model": "computercraft:block/wired_modem_off_peripheral", "x": 0, "y": 270},
-      "apply": {"model": "computercraft:block/wired_modem_off_peripheral", "x": 0, "y": 270}
+      "when": {"modem": "west_off_peripheral"}
     },
-    {"when": {"modem": "west_on"}, "apply": {"model": "computercraft:block/wired_modem_on", "x": 0, "y": 270}},
+    {"apply": {"model": "computercraft:block/wired_modem_on", "x": 0, "y": 270}, "when": {"modem": "west_on"}},
     {
-      "when": {"modem": "west_on_peripheral"},
+      "apply": {"model": "computercraft:block/wired_modem_on_peripheral", "x": 0, "y": 270},
-      "apply": {"model": "computercraft:block/wired_modem_on_peripheral", "x": 0, "y": 270}
+      "when": {"modem": "west_on_peripheral"}
     },
-    {"when": {"modem": "east_off"}, "apply": {"model": "computercraft:block/wired_modem_off", "x": 0, "y": 90}},
+    {"apply": {"model": "computercraft:block/wired_modem_off", "x": 0, "y": 90}, "when": {"modem": "east_off"}},
     {
-      "when": {"modem": "east_off_peripheral"},
+      "apply": {"model": "computercraft:block/wired_modem_off_peripheral", "x": 0, "y": 90},
-      "apply": {"model": "computercraft:block/wired_modem_off_peripheral", "x": 0, "y": 90}
+      "when": {"modem": "east_off_peripheral"}
     },
-    {"when": {"modem": "east_on"}, "apply": {"model": "computercraft:block/wired_modem_on", "x": 0, "y": 90}},
+    {"apply": {"model": "computercraft:block/wired_modem_on", "x": 0, "y": 90}, "when": {"modem": "east_on"}},
     {
-      "when": {"modem": "east_on_peripheral"},
+      "apply": {"model": "computercraft:block/wired_modem_on_peripheral", "x": 0, "y": 90},
-      "apply": {"model": "computercraft:block/wired_modem_on_peripheral", "x": 0, "y": 90}
+      "when": {"modem": "east_on_peripheral"}
     }
   ]
-}
+}

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

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

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

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

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

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

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

@@ -1,16 +1,16 @@
 {
   "variants": {
-    "facing=east,state=empty": {"y": 90, "model": "computercraft:block/disk_drive_empty"},
+    "facing=east,state=empty": {"model": "computercraft:block/disk_drive_empty", "y": 90},
-    "facing=east,state=full": {"y": 90, "model": "computercraft:block/disk_drive_full"},
+    "facing=east,state=full": {"model": "computercraft:block/disk_drive_full", "y": 90},
-    "facing=east,state=invalid": {"y": 90, "model": "computercraft:block/disk_drive_invalid"},
+    "facing=east,state=invalid": {"model": "computercraft:block/disk_drive_invalid", "y": 90},
-    "facing=north,state=empty": {"y": 0, "model": "computercraft:block/disk_drive_empty"},
+    "facing=north,state=empty": {"model": "computercraft:block/disk_drive_empty", "y": 0},
-    "facing=north,state=full": {"y": 0, "model": "computercraft:block/disk_drive_full"},
+    "facing=north,state=full": {"model": "computercraft:block/disk_drive_full", "y": 0},
-    "facing=north,state=invalid": {"y": 0, "model": "computercraft:block/disk_drive_invalid"},
+    "facing=north,state=invalid": {"model": "computercraft:block/disk_drive_invalid", "y": 0},
-    "facing=south,state=empty": {"y": 180, "model": "computercraft:block/disk_drive_empty"},
+    "facing=south,state=empty": {"model": "computercraft:block/disk_drive_empty", "y": 180},
-    "facing=south,state=full": {"y": 180, "model": "computercraft:block/disk_drive_full"},
+    "facing=south,state=full": {"model": "computercraft:block/disk_drive_full", "y": 180},
-    "facing=south,state=invalid": {"y": 180, "model": "computercraft:block/disk_drive_invalid"},
+    "facing=south,state=invalid": {"model": "computercraft:block/disk_drive_invalid", "y": 180},
-    "facing=west,state=empty": {"y": 270, "model": "computercraft:block/disk_drive_empty"},
+    "facing=west,state=empty": {"model": "computercraft:block/disk_drive_empty", "y": 270},
-    "facing=west,state=full": {"y": 270, "model": "computercraft:block/disk_drive_full"},
+    "facing=west,state=full": {"model": "computercraft:block/disk_drive_full", "y": 270},
-    "facing=west,state=invalid": {"y": 270, "model": "computercraft:block/disk_drive_invalid"}
+    "facing=west,state=invalid": {"model": "computercraft:block/disk_drive_invalid", "y": 270}
   }
-}
+}

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

@@ -1,268 +1,268 @@
 {
   "variants": {
-    "facing=east,orientation=down,state=d": {"y": 90, "x": 90, "model": "computercraft:block/monitor_advanced_d"},
+    "facing=east,orientation=down,state=d": {"model": "computercraft:block/monitor_advanced_d", "x": 90, "y": 90},
-    "facing=east,orientation=down,state=l": {"y": 90, "x": 90, "model": "computercraft:block/monitor_advanced_l"},
+    "facing=east,orientation=down,state=l": {"model": "computercraft:block/monitor_advanced_l", "x": 90, "y": 90},
-    "facing=east,orientation=down,state=ld": {"y": 90, "x": 90, "model": "computercraft:block/monitor_advanced_ld"},
+    "facing=east,orientation=down,state=ld": {"model": "computercraft:block/monitor_advanced_ld", "x": 90, "y": 90},
-    "facing=east,orientation=down,state=lr": {"y": 90, "x": 90, "model": "computercraft:block/monitor_advanced_lr"},
+    "facing=east,orientation=down,state=lr": {"model": "computercraft:block/monitor_advanced_lr", "x": 90, "y": 90},
-    "facing=east,orientation=down,state=lrd": {"y": 90, "x": 90, "model": "computercraft:block/monitor_advanced_lrd"},
+    "facing=east,orientation=down,state=lrd": {"model": "computercraft:block/monitor_advanced_lrd", "x": 90, "y": 90},
-    "facing=east,orientation=down,state=lru": {"y": 90, "x": 90, "model": "computercraft:block/monitor_advanced_lru"},
+    "facing=east,orientation=down,state=lru": {"model": "computercraft:block/monitor_advanced_lru", "x": 90, "y": 90},
     "facing=east,orientation=down,state=lrud": {
-      "y": 90,
+      "model": "computercraft:block/monitor_advanced_lrud",
       "x": 90,
-      "model": "computercraft:block/monitor_advanced_lrud"
+      "y": 90
     },
-    "facing=east,orientation=down,state=lu": {"y": 90, "x": 90, "model": "computercraft:block/monitor_advanced_lu"},
+    "facing=east,orientation=down,state=lu": {"model": "computercraft:block/monitor_advanced_lu", "x": 90, "y": 90},
-    "facing=east,orientation=down,state=lud": {"y": 90, "x": 90, "model": "computercraft:block/monitor_advanced_lud"},
+    "facing=east,orientation=down,state=lud": {"model": "computercraft:block/monitor_advanced_lud", "x": 90, "y": 90},
-    "facing=east,orientation=down,state=none": {"y": 90, "x": 90, "model": "computercraft:block/monitor_advanced"},
+    "facing=east,orientation=down,state=none": {"model": "computercraft:block/monitor_advanced", "x": 90, "y": 90},
-    "facing=east,orientation=down,state=r": {"y": 90, "x": 90, "model": "computercraft:block/monitor_advanced_r"},
+    "facing=east,orientation=down,state=r": {"model": "computercraft:block/monitor_advanced_r", "x": 90, "y": 90},
-    "facing=east,orientation=down,state=rd": {"y": 90, "x": 90, "model": "computercraft:block/monitor_advanced_rd"},
+    "facing=east,orientation=down,state=rd": {"model": "computercraft:block/monitor_advanced_rd", "x": 90, "y": 90},
-    "facing=east,orientation=down,state=ru": {"y": 90, "x": 90, "model": "computercraft:block/monitor_advanced_ru"},
+    "facing=east,orientation=down,state=ru": {"model": "computercraft:block/monitor_advanced_ru", "x": 90, "y": 90},
-    "facing=east,orientation=down,state=rud": {"y": 90, "x": 90, "model": "computercraft:block/monitor_advanced_rud"},
+    "facing=east,orientation=down,state=rud": {"model": "computercraft:block/monitor_advanced_rud", "x": 90, "y": 90},
-    "facing=east,orientation=down,state=u": {"y": 90, "x": 90, "model": "computercraft:block/monitor_advanced_u"},
+    "facing=east,orientation=down,state=u": {"model": "computercraft:block/monitor_advanced_u", "x": 90, "y": 90},
-    "facing=east,orientation=down,state=ud": {"y": 90, "x": 90, "model": "computercraft:block/monitor_advanced_ud"},
+    "facing=east,orientation=down,state=ud": {"model": "computercraft:block/monitor_advanced_ud", "x": 90, "y": 90},
-    "facing=east,orientation=north,state=d": {"y": 90, "x": 0, "model": "computercraft:block/monitor_advanced_d"},
+    "facing=east,orientation=north,state=d": {"model": "computercraft:block/monitor_advanced_d", "x": 0, "y": 90},
-    "facing=east,orientation=north,state=l": {"y": 90, "x": 0, "model": "computercraft:block/monitor_advanced_l"},
+    "facing=east,orientation=north,state=l": {"model": "computercraft:block/monitor_advanced_l", "x": 0, "y": 90},
-    "facing=east,orientation=north,state=ld": {"y": 90, "x": 0, "model": "computercraft:block/monitor_advanced_ld"},
+    "facing=east,orientation=north,state=ld": {"model": "computercraft:block/monitor_advanced_ld", "x": 0, "y": 90},
-    "facing=east,orientation=north,state=lr": {"y": 90, "x": 0, "model": "computercraft:block/monitor_advanced_lr"},
+    "facing=east,orientation=north,state=lr": {"model": "computercraft:block/monitor_advanced_lr", "x": 0, "y": 90},
-    "facing=east,orientation=north,state=lrd": {"y": 90, "x": 0, "model": "computercraft:block/monitor_advanced_lrd"},
+    "facing=east,orientation=north,state=lrd": {"model": "computercraft:block/monitor_advanced_lrd", "x": 0, "y": 90},
-    "facing=east,orientation=north,state=lru": {"y": 90, "x": 0, "model": "computercraft:block/monitor_advanced_lru"},
+    "facing=east,orientation=north,state=lru": {"model": "computercraft:block/monitor_advanced_lru", "x": 0, "y": 90},
     "facing=east,orientation=north,state=lrud": {
-      "y": 90,
+      "model": "computercraft:block/monitor_advanced_lrud",
       "x": 0,
-      "model": "computercraft:block/monitor_advanced_lrud"
+      "y": 90
     },
-    "facing=east,orientation=north,state=lu": {"y": 90, "x": 0, "model": "computercraft:block/monitor_advanced_lu"},
+    "facing=east,orientation=north,state=lu": {"model": "computercraft:block/monitor_advanced_lu", "x": 0, "y": 90},
-    "facing=east,orientation=north,state=lud": {"y": 90, "x": 0, "model": "computercraft:block/monitor_advanced_lud"},
+    "facing=east,orientation=north,state=lud": {"model": "computercraft:block/monitor_advanced_lud", "x": 0, "y": 90},
-    "facing=east,orientation=north,state=none": {"y": 90, "x": 0, "model": "computercraft:block/monitor_advanced"},
+    "facing=east,orientation=north,state=none": {"model": "computercraft:block/monitor_advanced", "x": 0, "y": 90},
-    "facing=east,orientation=north,state=r": {"y": 90, "x": 0, "model": "computercraft:block/monitor_advanced_r"},
+    "facing=east,orientation=north,state=r": {"model": "computercraft:block/monitor_advanced_r", "x": 0, "y": 90},
-    "facing=east,orientation=north,state=rd": {"y": 90, "x": 0, "model": "computercraft:block/monitor_advanced_rd"},
+    "facing=east,orientation=north,state=rd": {"model": "computercraft:block/monitor_advanced_rd", "x": 0, "y": 90},
-    "facing=east,orientation=north,state=ru": {"y": 90, "x": 0, "model": "computercraft:block/monitor_advanced_ru"},
+    "facing=east,orientation=north,state=ru": {"model": "computercraft:block/monitor_advanced_ru", "x": 0, "y": 90},
-    "facing=east,orientation=north,state=rud": {"y": 90, "x": 0, "model": "computercraft:block/monitor_advanced_rud"},
+    "facing=east,orientation=north,state=rud": {"model": "computercraft:block/monitor_advanced_rud", "x": 0, "y": 90},
-    "facing=east,orientation=north,state=u": {"y": 90, "x": 0, "model": "computercraft:block/monitor_advanced_u"},
+    "facing=east,orientation=north,state=u": {"model": "computercraft:block/monitor_advanced_u", "x": 0, "y": 90},
-    "facing=east,orientation=north,state=ud": {"y": 90, "x": 0, "model": "computercraft:block/monitor_advanced_ud"},
+    "facing=east,orientation=north,state=ud": {"model": "computercraft:block/monitor_advanced_ud", "x": 0, "y": 90},
-    "facing=east,orientation=up,state=d": {"y": 90, "x": 270, "model": "computercraft:block/monitor_advanced_d"},
+    "facing=east,orientation=up,state=d": {"model": "computercraft:block/monitor_advanced_d", "x": 270, "y": 90},
-    "facing=east,orientation=up,state=l": {"y": 90, "x": 270, "model": "computercraft:block/monitor_advanced_l"},
+    "facing=east,orientation=up,state=l": {"model": "computercraft:block/monitor_advanced_l", "x": 270, "y": 90},
-    "facing=east,orientation=up,state=ld": {"y": 90, "x": 270, "model": "computercraft:block/monitor_advanced_ld"},
+    "facing=east,orientation=up,state=ld": {"model": "computercraft:block/monitor_advanced_ld", "x": 270, "y": 90},
-    "facing=east,orientation=up,state=lr": {"y": 90, "x": 270, "model": "computercraft:block/monitor_advanced_lr"},
+    "facing=east,orientation=up,state=lr": {"model": "computercraft:block/monitor_advanced_lr", "x": 270, "y": 90},
-    "facing=east,orientation=up,state=lrd": {"y": 90, "x": 270, "model": "computercraft:block/monitor_advanced_lrd"},
+    "facing=east,orientation=up,state=lrd": {"model": "computercraft:block/monitor_advanced_lrd", "x": 270, "y": 90},
-    "facing=east,orientation=up,state=lru": {"y": 90, "x": 270, "model": "computercraft:block/monitor_advanced_lru"},
+    "facing=east,orientation=up,state=lru": {"model": "computercraft:block/monitor_advanced_lru", "x": 270, "y": 90},
-    "facing=east,orientation=up,state=lrud": {"y": 90, "x": 270, "model": "computercraft:block/monitor_advanced_lrud"},
+    "facing=east,orientation=up,state=lrud": {"model": "computercraft:block/monitor_advanced_lrud", "x": 270, "y": 90},
-    "facing=east,orientation=up,state=lu": {"y": 90, "x": 270, "model": "computercraft:block/monitor_advanced_lu"},
+    "facing=east,orientation=up,state=lu": {"model": "computercraft:block/monitor_advanced_lu", "x": 270, "y": 90},
-    "facing=east,orientation=up,state=lud": {"y": 90, "x": 270, "model": "computercraft:block/monitor_advanced_lud"},
+    "facing=east,orientation=up,state=lud": {"model": "computercraft:block/monitor_advanced_lud", "x": 270, "y": 90},
-    "facing=east,orientation=up,state=none": {"y": 90, "x": 270, "model": "computercraft:block/monitor_advanced"},
+    "facing=east,orientation=up,state=none": {"model": "computercraft:block/monitor_advanced", "x": 270, "y": 90},
-    "facing=east,orientation=up,state=r": {"y": 90, "x": 270, "model": "computercraft:block/monitor_advanced_r"},
+    "facing=east,orientation=up,state=r": {"model": "computercraft:block/monitor_advanced_r", "x": 270, "y": 90},
-    "facing=east,orientation=up,state=rd": {"y": 90, "x": 270, "model": "computercraft:block/monitor_advanced_rd"},
+    "facing=east,orientation=up,state=rd": {"model": "computercraft:block/monitor_advanced_rd", "x": 270, "y": 90},
-    "facing=east,orientation=up,state=ru": {"y": 90, "x": 270, "model": "computercraft:block/monitor_advanced_ru"},
+    "facing=east,orientation=up,state=ru": {"model": "computercraft:block/monitor_advanced_ru", "x": 270, "y": 90},
-    "facing=east,orientation=up,state=rud": {"y": 90, "x": 270, "model": "computercraft:block/monitor_advanced_rud"},
+    "facing=east,orientation=up,state=rud": {"model": "computercraft:block/monitor_advanced_rud", "x": 270, "y": 90},
-    "facing=east,orientation=up,state=u": {"y": 90, "x": 270, "model": "computercraft:block/monitor_advanced_u"},
+    "facing=east,orientation=up,state=u": {"model": "computercraft:block/monitor_advanced_u", "x": 270, "y": 90},
-    "facing=east,orientation=up,state=ud": {"y": 90, "x": 270, "model": "computercraft:block/monitor_advanced_ud"},
+    "facing=east,orientation=up,state=ud": {"model": "computercraft:block/monitor_advanced_ud", "x": 270, "y": 90},
-    "facing=north,orientation=down,state=d": {"y": 0, "x": 90, "model": "computercraft:block/monitor_advanced_d"},
+    "facing=north,orientation=down,state=d": {"model": "computercraft:block/monitor_advanced_d", "x": 90, "y": 0},
-    "facing=north,orientation=down,state=l": {"y": 0, "x": 90, "model": "computercraft:block/monitor_advanced_l"},
+    "facing=north,orientation=down,state=l": {"model": "computercraft:block/monitor_advanced_l", "x": 90, "y": 0},
-    "facing=north,orientation=down,state=ld": {"y": 0, "x": 90, "model": "computercraft:block/monitor_advanced_ld"},
+    "facing=north,orientation=down,state=ld": {"model": "computercraft:block/monitor_advanced_ld", "x": 90, "y": 0},
-    "facing=north,orientation=down,state=lr": {"y": 0, "x": 90, "model": "computercraft:block/monitor_advanced_lr"},
+    "facing=north,orientation=down,state=lr": {"model": "computercraft:block/monitor_advanced_lr", "x": 90, "y": 0},
-    "facing=north,orientation=down,state=lrd": {"y": 0, "x": 90, "model": "computercraft:block/monitor_advanced_lrd"},
+    "facing=north,orientation=down,state=lrd": {"model": "computercraft:block/monitor_advanced_lrd", "x": 90, "y": 0},
-    "facing=north,orientation=down,state=lru": {"y": 0, "x": 90, "model": "computercraft:block/monitor_advanced_lru"},
+    "facing=north,orientation=down,state=lru": {"model": "computercraft:block/monitor_advanced_lru", "x": 90, "y": 0},
     "facing=north,orientation=down,state=lrud": {
-      "y": 0,
+      "model": "computercraft:block/monitor_advanced_lrud",
       "x": 90,
-      "model": "computercraft:block/monitor_advanced_lrud"
+      "y": 0
     },
-    "facing=north,orientation=down,state=lu": {"y": 0, "x": 90, "model": "computercraft:block/monitor_advanced_lu"},
+    "facing=north,orientation=down,state=lu": {"model": "computercraft:block/monitor_advanced_lu", "x": 90, "y": 0},
-    "facing=north,orientation=down,state=lud": {"y": 0, "x": 90, "model": "computercraft:block/monitor_advanced_lud"},
+    "facing=north,orientation=down,state=lud": {"model": "computercraft:block/monitor_advanced_lud", "x": 90, "y": 0},
-    "facing=north,orientation=down,state=none": {"y": 0, "x": 90, "model": "computercraft:block/monitor_advanced"},
+    "facing=north,orientation=down,state=none": {"model": "computercraft:block/monitor_advanced", "x": 90, "y": 0},
-    "facing=north,orientation=down,state=r": {"y": 0, "x": 90, "model": "computercraft:block/monitor_advanced_r"},
+    "facing=north,orientation=down,state=r": {"model": "computercraft:block/monitor_advanced_r", "x": 90, "y": 0},
-    "facing=north,orientation=down,state=rd": {"y": 0, "x": 90, "model": "computercraft:block/monitor_advanced_rd"},
+    "facing=north,orientation=down,state=rd": {"model": "computercraft:block/monitor_advanced_rd", "x": 90, "y": 0},
-    "facing=north,orientation=down,state=ru": {"y": 0, "x": 90, "model": "computercraft:block/monitor_advanced_ru"},
+    "facing=north,orientation=down,state=ru": {"model": "computercraft:block/monitor_advanced_ru", "x": 90, "y": 0},
-    "facing=north,orientation=down,state=rud": {"y": 0, "x": 90, "model": "computercraft:block/monitor_advanced_rud"},
+    "facing=north,orientation=down,state=rud": {"model": "computercraft:block/monitor_advanced_rud", "x": 90, "y": 0},
-    "facing=north,orientation=down,state=u": {"y": 0, "x": 90, "model": "computercraft:block/monitor_advanced_u"},
+    "facing=north,orientation=down,state=u": {"model": "computercraft:block/monitor_advanced_u", "x": 90, "y": 0},
-    "facing=north,orientation=down,state=ud": {"y": 0, "x": 90, "model": "computercraft:block/monitor_advanced_ud"},
+    "facing=north,orientation=down,state=ud": {"model": "computercraft:block/monitor_advanced_ud", "x": 90, "y": 0},
-    "facing=north,orientation=north,state=d": {"y": 0, "x": 0, "model": "computercraft:block/monitor_advanced_d"},
+    "facing=north,orientation=north,state=d": {"model": "computercraft:block/monitor_advanced_d", "x": 0, "y": 0},
-    "facing=north,orientation=north,state=l": {"y": 0, "x": 0, "model": "computercraft:block/monitor_advanced_l"},
+    "facing=north,orientation=north,state=l": {"model": "computercraft:block/monitor_advanced_l", "x": 0, "y": 0},
-    "facing=north,orientation=north,state=ld": {"y": 0, "x": 0, "model": "computercraft:block/monitor_advanced_ld"},
+    "facing=north,orientation=north,state=ld": {"model": "computercraft:block/monitor_advanced_ld", "x": 0, "y": 0},
-    "facing=north,orientation=north,state=lr": {"y": 0, "x": 0, "model": "computercraft:block/monitor_advanced_lr"},
+    "facing=north,orientation=north,state=lr": {"model": "computercraft:block/monitor_advanced_lr", "x": 0, "y": 0},
-    "facing=north,orientation=north,state=lrd": {"y": 0, "x": 0, "model": "computercraft:block/monitor_advanced_lrd"},
+    "facing=north,orientation=north,state=lrd": {"model": "computercraft:block/monitor_advanced_lrd", "x": 0, "y": 0},
-    "facing=north,orientation=north,state=lru": {"y": 0, "x": 0, "model": "computercraft:block/monitor_advanced_lru"},
+    "facing=north,orientation=north,state=lru": {"model": "computercraft:block/monitor_advanced_lru", "x": 0, "y": 0},
     "facing=north,orientation=north,state=lrud": {
-      "y": 0,
+      "model": "computercraft:block/monitor_advanced_lrud",
       "x": 0,
-      "model": "computercraft:block/monitor_advanced_lrud"
+      "y": 0
     },
-    "facing=north,orientation=north,state=lu": {"y": 0, "x": 0, "model": "computercraft:block/monitor_advanced_lu"},
+    "facing=north,orientation=north,state=lu": {"model": "computercraft:block/monitor_advanced_lu", "x": 0, "y": 0},
-    "facing=north,orientation=north,state=lud": {"y": 0, "x": 0, "model": "computercraft:block/monitor_advanced_lud"},
+    "facing=north,orientation=north,state=lud": {"model": "computercraft:block/monitor_advanced_lud", "x": 0, "y": 0},
-    "facing=north,orientation=north,state=none": {"y": 0, "x": 0, "model": "computercraft:block/monitor_advanced"},
+    "facing=north,orientation=north,state=none": {"model": "computercraft:block/monitor_advanced", "x": 0, "y": 0},
-    "facing=north,orientation=north,state=r": {"y": 0, "x": 0, "model": "computercraft:block/monitor_advanced_r"},
+    "facing=north,orientation=north,state=r": {"model": "computercraft:block/monitor_advanced_r", "x": 0, "y": 0},
-    "facing=north,orientation=north,state=rd": {"y": 0, "x": 0, "model": "computercraft:block/monitor_advanced_rd"},
+    "facing=north,orientation=north,state=rd": {"model": "computercraft:block/monitor_advanced_rd", "x": 0, "y": 0},
-    "facing=north,orientation=north,state=ru": {"y": 0, "x": 0, "model": "computercraft:block/monitor_advanced_ru"},
+    "facing=north,orientation=north,state=ru": {"model": "computercraft:block/monitor_advanced_ru", "x": 0, "y": 0},
-    "facing=north,orientation=north,state=rud": {"y": 0, "x": 0, "model": "computercraft:block/monitor_advanced_rud"},
+    "facing=north,orientation=north,state=rud": {"model": "computercraft:block/monitor_advanced_rud", "x": 0, "y": 0},
-    "facing=north,orientation=north,state=u": {"y": 0, "x": 0, "model": "computercraft:block/monitor_advanced_u"},
+    "facing=north,orientation=north,state=u": {"model": "computercraft:block/monitor_advanced_u", "x": 0, "y": 0},
-    "facing=north,orientation=north,state=ud": {"y": 0, "x": 0, "model": "computercraft:block/monitor_advanced_ud"},
+    "facing=north,orientation=north,state=ud": {"model": "computercraft:block/monitor_advanced_ud", "x": 0, "y": 0},
-    "facing=north,orientation=up,state=d": {"y": 0, "x": 270, "model": "computercraft:block/monitor_advanced_d"},
+    "facing=north,orientation=up,state=d": {"model": "computercraft:block/monitor_advanced_d", "x": 270, "y": 0},
-    "facing=north,orientation=up,state=l": {"y": 0, "x": 270, "model": "computercraft:block/monitor_advanced_l"},
+    "facing=north,orientation=up,state=l": {"model": "computercraft:block/monitor_advanced_l", "x": 270, "y": 0},
-    "facing=north,orientation=up,state=ld": {"y": 0, "x": 270, "model": "computercraft:block/monitor_advanced_ld"},
+    "facing=north,orientation=up,state=ld": {"model": "computercraft:block/monitor_advanced_ld", "x": 270, "y": 0},
-    "facing=north,orientation=up,state=lr": {"y": 0, "x": 270, "model": "computercraft:block/monitor_advanced_lr"},
+    "facing=north,orientation=up,state=lr": {"model": "computercraft:block/monitor_advanced_lr", "x": 270, "y": 0},
-    "facing=north,orientation=up,state=lrd": {"y": 0, "x": 270, "model": "computercraft:block/monitor_advanced_lrd"},
+    "facing=north,orientation=up,state=lrd": {"model": "computercraft:block/monitor_advanced_lrd", "x": 270, "y": 0},
-    "facing=north,orientation=up,state=lru": {"y": 0, "x": 270, "model": "computercraft:block/monitor_advanced_lru"},
+    "facing=north,orientation=up,state=lru": {"model": "computercraft:block/monitor_advanced_lru", "x": 270, "y": 0},
-    "facing=north,orientation=up,state=lrud": {"y": 0, "x": 270, "model": "computercraft:block/monitor_advanced_lrud"},
+    "facing=north,orientation=up,state=lrud": {"model": "computercraft:block/monitor_advanced_lrud", "x": 270, "y": 0},
-    "facing=north,orientation=up,state=lu": {"y": 0, "x": 270, "model": "computercraft:block/monitor_advanced_lu"},
+    "facing=north,orientation=up,state=lu": {"model": "computercraft:block/monitor_advanced_lu", "x": 270, "y": 0},
-    "facing=north,orientation=up,state=lud": {"y": 0, "x": 270, "model": "computercraft:block/monitor_advanced_lud"},
+    "facing=north,orientation=up,state=lud": {"model": "computercraft:block/monitor_advanced_lud", "x": 270, "y": 0},
-    "facing=north,orientation=up,state=none": {"y": 0, "x": 270, "model": "computercraft:block/monitor_advanced"},
+    "facing=north,orientation=up,state=none": {"model": "computercraft:block/monitor_advanced", "x": 270, "y": 0},
-    "facing=north,orientation=up,state=r": {"y": 0, "x": 270, "model": "computercraft:block/monitor_advanced_r"},
+    "facing=north,orientation=up,state=r": {"model": "computercraft:block/monitor_advanced_r", "x": 270, "y": 0},
-    "facing=north,orientation=up,state=rd": {"y": 0, "x": 270, "model": "computercraft:block/monitor_advanced_rd"},
+    "facing=north,orientation=up,state=rd": {"model": "computercraft:block/monitor_advanced_rd", "x": 270, "y": 0},
-    "facing=north,orientation=up,state=ru": {"y": 0, "x": 270, "model": "computercraft:block/monitor_advanced_ru"},
+    "facing=north,orientation=up,state=ru": {"model": "computercraft:block/monitor_advanced_ru", "x": 270, "y": 0},
-    "facing=north,orientation=up,state=rud": {"y": 0, "x": 270, "model": "computercraft:block/monitor_advanced_rud"},
+    "facing=north,orientation=up,state=rud": {"model": "computercraft:block/monitor_advanced_rud", "x": 270, "y": 0},
-    "facing=north,orientation=up,state=u": {"y": 0, "x": 270, "model": "computercraft:block/monitor_advanced_u"},
+    "facing=north,orientation=up,state=u": {"model": "computercraft:block/monitor_advanced_u", "x": 270, "y": 0},
-    "facing=north,orientation=up,state=ud": {"y": 0, "x": 270, "model": "computercraft:block/monitor_advanced_ud"},
+    "facing=north,orientation=up,state=ud": {"model": "computercraft:block/monitor_advanced_ud", "x": 270, "y": 0},
-    "facing=south,orientation=down,state=d": {"y": 180, "x": 90, "model": "computercraft:block/monitor_advanced_d"},
+    "facing=south,orientation=down,state=d": {"model": "computercraft:block/monitor_advanced_d", "x": 90, "y": 180},
-    "facing=south,orientation=down,state=l": {"y": 180, "x": 90, "model": "computercraft:block/monitor_advanced_l"},
+    "facing=south,orientation=down,state=l": {"model": "computercraft:block/monitor_advanced_l", "x": 90, "y": 180},
-    "facing=south,orientation=down,state=ld": {"y": 180, "x": 90, "model": "computercraft:block/monitor_advanced_ld"},
+    "facing=south,orientation=down,state=ld": {"model": "computercraft:block/monitor_advanced_ld", "x": 90, "y": 180},
-    "facing=south,orientation=down,state=lr": {"y": 180, "x": 90, "model": "computercraft:block/monitor_advanced_lr"},
+    "facing=south,orientation=down,state=lr": {"model": "computercraft:block/monitor_advanced_lr", "x": 90, "y": 180},
     "facing=south,orientation=down,state=lrd": {
-      "y": 180,
+      "model": "computercraft:block/monitor_advanced_lrd",
       "x": 90,
-      "model": "computercraft:block/monitor_advanced_lrd"
+      "y": 180
     },
     "facing=south,orientation=down,state=lru": {
-      "y": 180,
+      "model": "computercraft:block/monitor_advanced_lru",
       "x": 90,
-      "model": "computercraft:block/monitor_advanced_lru"
+      "y": 180
     },
     "facing=south,orientation=down,state=lrud": {
-      "y": 180,
+      "model": "computercraft:block/monitor_advanced_lrud",
       "x": 90,
-      "model": "computercraft:block/monitor_advanced_lrud"
+      "y": 180
     },
-    "facing=south,orientation=down,state=lu": {"y": 180, "x": 90, "model": "computercraft:block/monitor_advanced_lu"},
+    "facing=south,orientation=down,state=lu": {"model": "computercraft:block/monitor_advanced_lu", "x": 90, "y": 180},
     "facing=south,orientation=down,state=lud": {
-      "y": 180,
+      "model": "computercraft:block/monitor_advanced_lud",
       "x": 90,
-      "model": "computercraft:block/monitor_advanced_lud"
+      "y": 180
     },
-    "facing=south,orientation=down,state=none": {"y": 180, "x": 90, "model": "computercraft:block/monitor_advanced"},
+    "facing=south,orientation=down,state=none": {"model": "computercraft:block/monitor_advanced", "x": 90, "y": 180},
-    "facing=south,orientation=down,state=r": {"y": 180, "x": 90, "model": "computercraft:block/monitor_advanced_r"},
+    "facing=south,orientation=down,state=r": {"model": "computercraft:block/monitor_advanced_r", "x": 90, "y": 180},
-    "facing=south,orientation=down,state=rd": {"y": 180, "x": 90, "model": "computercraft:block/monitor_advanced_rd"},
+    "facing=south,orientation=down,state=rd": {"model": "computercraft:block/monitor_advanced_rd", "x": 90, "y": 180},
-    "facing=south,orientation=down,state=ru": {"y": 180, "x": 90, "model": "computercraft:block/monitor_advanced_ru"},
+    "facing=south,orientation=down,state=ru": {"model": "computercraft:block/monitor_advanced_ru", "x": 90, "y": 180},
     "facing=south,orientation=down,state=rud": {
-      "y": 180,
+      "model": "computercraft:block/monitor_advanced_rud",
       "x": 90,
-      "model": "computercraft:block/monitor_advanced_rud"
+      "y": 180
     },
-    "facing=south,orientation=down,state=u": {"y": 180, "x": 90, "model": "computercraft:block/monitor_advanced_u"},
+    "facing=south,orientation=down,state=u": {"model": "computercraft:block/monitor_advanced_u", "x": 90, "y": 180},
-    "facing=south,orientation=down,state=ud": {"y": 180, "x": 90, "model": "computercraft:block/monitor_advanced_ud"},
+    "facing=south,orientation=down,state=ud": {"model": "computercraft:block/monitor_advanced_ud", "x": 90, "y": 180},
-    "facing=south,orientation=north,state=d": {"y": 180, "x": 0, "model": "computercraft:block/monitor_advanced_d"},
+    "facing=south,orientation=north,state=d": {"model": "computercraft:block/monitor_advanced_d", "x": 0, "y": 180},
-    "facing=south,orientation=north,state=l": {"y": 180, "x": 0, "model": "computercraft:block/monitor_advanced_l"},
+    "facing=south,orientation=north,state=l": {"model": "computercraft:block/monitor_advanced_l", "x": 0, "y": 180},
-    "facing=south,orientation=north,state=ld": {"y": 180, "x": 0, "model": "computercraft:block/monitor_advanced_ld"},
+    "facing=south,orientation=north,state=ld": {"model": "computercraft:block/monitor_advanced_ld", "x": 0, "y": 180},
-    "facing=south,orientation=north,state=lr": {"y": 180, "x": 0, "model": "computercraft:block/monitor_advanced_lr"},
+    "facing=south,orientation=north,state=lr": {"model": "computercraft:block/monitor_advanced_lr", "x": 0, "y": 180},
     "facing=south,orientation=north,state=lrd": {
-      "y": 180,
+      "model": "computercraft:block/monitor_advanced_lrd",
       "x": 0,
-      "model": "computercraft:block/monitor_advanced_lrd"
+      "y": 180
     },
     "facing=south,orientation=north,state=lru": {
-      "y": 180,
+      "model": "computercraft:block/monitor_advanced_lru",
       "x": 0,
-      "model": "computercraft:block/monitor_advanced_lru"
+      "y": 180
     },
     "facing=south,orientation=north,state=lrud": {
-      "y": 180,
+      "model": "computercraft:block/monitor_advanced_lrud",
       "x": 0,
-      "model": "computercraft:block/monitor_advanced_lrud"
+      "y": 180
     },
-    "facing=south,orientation=north,state=lu": {"y": 180, "x": 0, "model": "computercraft:block/monitor_advanced_lu"},
+    "facing=south,orientation=north,state=lu": {"model": "computercraft:block/monitor_advanced_lu", "x": 0, "y": 180},
     "facing=south,orientation=north,state=lud": {
-      "y": 180,
+      "model": "computercraft:block/monitor_advanced_lud",
       "x": 0,
-      "model": "computercraft:block/monitor_advanced_lud"
+      "y": 180
     },
-    "facing=south,orientation=north,state=none": {"y": 180, "x": 0, "model": "computercraft:block/monitor_advanced"},
+    "facing=south,orientation=north,state=none": {"model": "computercraft:block/monitor_advanced", "x": 0, "y": 180},
-    "facing=south,orientation=north,state=r": {"y": 180, "x": 0, "model": "computercraft:block/monitor_advanced_r"},
+    "facing=south,orientation=north,state=r": {"model": "computercraft:block/monitor_advanced_r", "x": 0, "y": 180},
-    "facing=south,orientation=north,state=rd": {"y": 180, "x": 0, "model": "computercraft:block/monitor_advanced_rd"},
+    "facing=south,orientation=north,state=rd": {"model": "computercraft:block/monitor_advanced_rd", "x": 0, "y": 180},
-    "facing=south,orientation=north,state=ru": {"y": 180, "x": 0, "model": "computercraft:block/monitor_advanced_ru"},
+    "facing=south,orientation=north,state=ru": {"model": "computercraft:block/monitor_advanced_ru", "x": 0, "y": 180},
     "facing=south,orientation=north,state=rud": {
-      "y": 180,
+      "model": "computercraft:block/monitor_advanced_rud",
       "x": 0,
-      "model": "computercraft:block/monitor_advanced_rud"
+      "y": 180
     },
-    "facing=south,orientation=north,state=u": {"y": 180, "x": 0, "model": "computercraft:block/monitor_advanced_u"},
+    "facing=south,orientation=north,state=u": {"model": "computercraft:block/monitor_advanced_u", "x": 0, "y": 180},
-    "facing=south,orientation=north,state=ud": {"y": 180, "x": 0, "model": "computercraft:block/monitor_advanced_ud"},
+    "facing=south,orientation=north,state=ud": {"model": "computercraft:block/monitor_advanced_ud", "x": 0, "y": 180},
-    "facing=south,orientation=up,state=d": {"y": 180, "x": 270, "model": "computercraft:block/monitor_advanced_d"},
+    "facing=south,orientation=up,state=d": {"model": "computercraft:block/monitor_advanced_d", "x": 270, "y": 180},
-    "facing=south,orientation=up,state=l": {"y": 180, "x": 270, "model": "computercraft:block/monitor_advanced_l"},
+    "facing=south,orientation=up,state=l": {"model": "computercraft:block/monitor_advanced_l", "x": 270, "y": 180},
-    "facing=south,orientation=up,state=ld": {"y": 180, "x": 270, "model": "computercraft:block/monitor_advanced_ld"},
+    "facing=south,orientation=up,state=ld": {"model": "computercraft:block/monitor_advanced_ld", "x": 270, "y": 180},
-    "facing=south,orientation=up,state=lr": {"y": 180, "x": 270, "model": "computercraft:block/monitor_advanced_lr"},
+    "facing=south,orientation=up,state=lr": {"model": "computercraft:block/monitor_advanced_lr", "x": 270, "y": 180},
-    "facing=south,orientation=up,state=lrd": {"y": 180, "x": 270, "model": "computercraft:block/monitor_advanced_lrd"},
+    "facing=south,orientation=up,state=lrd": {"model": "computercraft:block/monitor_advanced_lrd", "x": 270, "y": 180},
-    "facing=south,orientation=up,state=lru": {"y": 180, "x": 270, "model": "computercraft:block/monitor_advanced_lru"},
+    "facing=south,orientation=up,state=lru": {"model": "computercraft:block/monitor_advanced_lru", "x": 270, "y": 180},
     "facing=south,orientation=up,state=lrud": {
-      "y": 180,
+      "model": "computercraft:block/monitor_advanced_lrud",
       "x": 270,
-      "model": "computercraft:block/monitor_advanced_lrud"
+      "y": 180
     },
-    "facing=south,orientation=up,state=lu": {"y": 180, "x": 270, "model": "computercraft:block/monitor_advanced_lu"},
+    "facing=south,orientation=up,state=lu": {"model": "computercraft:block/monitor_advanced_lu", "x": 270, "y": 180},
-    "facing=south,orientation=up,state=lud": {"y": 180, "x": 270, "model": "computercraft:block/monitor_advanced_lud"},
+    "facing=south,orientation=up,state=lud": {"model": "computercraft:block/monitor_advanced_lud", "x": 270, "y": 180},
-    "facing=south,orientation=up,state=none": {"y": 180, "x": 270, "model": "computercraft:block/monitor_advanced"},
+    "facing=south,orientation=up,state=none": {"model": "computercraft:block/monitor_advanced", "x": 270, "y": 180},
-    "facing=south,orientation=up,state=r": {"y": 180, "x": 270, "model": "computercraft:block/monitor_advanced_r"},
+    "facing=south,orientation=up,state=r": {"model": "computercraft:block/monitor_advanced_r", "x": 270, "y": 180},
-    "facing=south,orientation=up,state=rd": {"y": 180, "x": 270, "model": "computercraft:block/monitor_advanced_rd"},
+    "facing=south,orientation=up,state=rd": {"model": "computercraft:block/monitor_advanced_rd", "x": 270, "y": 180},
-    "facing=south,orientation=up,state=ru": {"y": 180, "x": 270, "model": "computercraft:block/monitor_advanced_ru"},
+    "facing=south,orientation=up,state=ru": {"model": "computercraft:block/monitor_advanced_ru", "x": 270, "y": 180},
-    "facing=south,orientation=up,state=rud": {"y": 180, "x": 270, "model": "computercraft:block/monitor_advanced_rud"},
+    "facing=south,orientation=up,state=rud": {"model": "computercraft:block/monitor_advanced_rud", "x": 270, "y": 180},
-    "facing=south,orientation=up,state=u": {"y": 180, "x": 270, "model": "computercraft:block/monitor_advanced_u"},
+    "facing=south,orientation=up,state=u": {"model": "computercraft:block/monitor_advanced_u", "x": 270, "y": 180},
-    "facing=south,orientation=up,state=ud": {"y": 180, "x": 270, "model": "computercraft:block/monitor_advanced_ud"},
+    "facing=south,orientation=up,state=ud": {"model": "computercraft:block/monitor_advanced_ud", "x": 270, "y": 180},
-    "facing=west,orientation=down,state=d": {"y": 270, "x": 90, "model": "computercraft:block/monitor_advanced_d"},
+    "facing=west,orientation=down,state=d": {"model": "computercraft:block/monitor_advanced_d", "x": 90, "y": 270},
-    "facing=west,orientation=down,state=l": {"y": 270, "x": 90, "model": "computercraft:block/monitor_advanced_l"},
+    "facing=west,orientation=down,state=l": {"model": "computercraft:block/monitor_advanced_l", "x": 90, "y": 270},
-    "facing=west,orientation=down,state=ld": {"y": 270, "x": 90, "model": "computercraft:block/monitor_advanced_ld"},
+    "facing=west,orientation=down,state=ld": {"model": "computercraft:block/monitor_advanced_ld", "x": 90, "y": 270},
-    "facing=west,orientation=down,state=lr": {"y": 270, "x": 90, "model": "computercraft:block/monitor_advanced_lr"},
+    "facing=west,orientation=down,state=lr": {"model": "computercraft:block/monitor_advanced_lr", "x": 90, "y": 270},
-    "facing=west,orientation=down,state=lrd": {"y": 270, "x": 90, "model": "computercraft:block/monitor_advanced_lrd"},
+    "facing=west,orientation=down,state=lrd": {"model": "computercraft:block/monitor_advanced_lrd", "x": 90, "y": 270},
-    "facing=west,orientation=down,state=lru": {"y": 270, "x": 90, "model": "computercraft:block/monitor_advanced_lru"},
+    "facing=west,orientation=down,state=lru": {"model": "computercraft:block/monitor_advanced_lru", "x": 90, "y": 270},
     "facing=west,orientation=down,state=lrud": {
-      "y": 270,
+      "model": "computercraft:block/monitor_advanced_lrud",
       "x": 90,
-      "model": "computercraft:block/monitor_advanced_lrud"
+      "y": 270
     },
-    "facing=west,orientation=down,state=lu": {"y": 270, "x": 90, "model": "computercraft:block/monitor_advanced_lu"},
+    "facing=west,orientation=down,state=lu": {"model": "computercraft:block/monitor_advanced_lu", "x": 90, "y": 270},
-    "facing=west,orientation=down,state=lud": {"y": 270, "x": 90, "model": "computercraft:block/monitor_advanced_lud"},
+    "facing=west,orientation=down,state=lud": {"model": "computercraft:block/monitor_advanced_lud", "x": 90, "y": 270},
-    "facing=west,orientation=down,state=none": {"y": 270, "x": 90, "model": "computercraft:block/monitor_advanced"},
+    "facing=west,orientation=down,state=none": {"model": "computercraft:block/monitor_advanced", "x": 90, "y": 270},
-    "facing=west,orientation=down,state=r": {"y": 270, "x": 90, "model": "computercraft:block/monitor_advanced_r"},
+    "facing=west,orientation=down,state=r": {"model": "computercraft:block/monitor_advanced_r", "x": 90, "y": 270},
-    "facing=west,orientation=down,state=rd": {"y": 270, "x": 90, "model": "computercraft:block/monitor_advanced_rd"},
+    "facing=west,orientation=down,state=rd": {"model": "computercraft:block/monitor_advanced_rd", "x": 90, "y": 270},
-    "facing=west,orientation=down,state=ru": {"y": 270, "x": 90, "model": "computercraft:block/monitor_advanced_ru"},
+    "facing=west,orientation=down,state=ru": {"model": "computercraft:block/monitor_advanced_ru", "x": 90, "y": 270},
-    "facing=west,orientation=down,state=rud": {"y": 270, "x": 90, "model": "computercraft:block/monitor_advanced_rud"},
+    "facing=west,orientation=down,state=rud": {"model": "computercraft:block/monitor_advanced_rud", "x": 90, "y": 270},
-    "facing=west,orientation=down,state=u": {"y": 270, "x": 90, "model": "computercraft:block/monitor_advanced_u"},
+    "facing=west,orientation=down,state=u": {"model": "computercraft:block/monitor_advanced_u", "x": 90, "y": 270},
-    "facing=west,orientation=down,state=ud": {"y": 270, "x": 90, "model": "computercraft:block/monitor_advanced_ud"},
+    "facing=west,orientation=down,state=ud": {"model": "computercraft:block/monitor_advanced_ud", "x": 90, "y": 270},
-    "facing=west,orientation=north,state=d": {"y": 270, "x": 0, "model": "computercraft:block/monitor_advanced_d"},
+    "facing=west,orientation=north,state=d": {"model": "computercraft:block/monitor_advanced_d", "x": 0, "y": 270},
-    "facing=west,orientation=north,state=l": {"y": 270, "x": 0, "model": "computercraft:block/monitor_advanced_l"},
+    "facing=west,orientation=north,state=l": {"model": "computercraft:block/monitor_advanced_l", "x": 0, "y": 270},
-    "facing=west,orientation=north,state=ld": {"y": 270, "x": 0, "model": "computercraft:block/monitor_advanced_ld"},
+    "facing=west,orientation=north,state=ld": {"model": "computercraft:block/monitor_advanced_ld", "x": 0, "y": 270},
-    "facing=west,orientation=north,state=lr": {"y": 270, "x": 0, "model": "computercraft:block/monitor_advanced_lr"},
+    "facing=west,orientation=north,state=lr": {"model": "computercraft:block/monitor_advanced_lr", "x": 0, "y": 270},
-    "facing=west,orientation=north,state=lrd": {"y": 270, "x": 0, "model": "computercraft:block/monitor_advanced_lrd"},
+    "facing=west,orientation=north,state=lrd": {"model": "computercraft:block/monitor_advanced_lrd", "x": 0, "y": 270},
-    "facing=west,orientation=north,state=lru": {"y": 270, "x": 0, "model": "computercraft:block/monitor_advanced_lru"},
+    "facing=west,orientation=north,state=lru": {"model": "computercraft:block/monitor_advanced_lru", "x": 0, "y": 270},
     "facing=west,orientation=north,state=lrud": {
-      "y": 270,
+      "model": "computercraft:block/monitor_advanced_lrud",
       "x": 0,
-      "model": "computercraft:block/monitor_advanced_lrud"
+      "y": 270
     },
-    "facing=west,orientation=north,state=lu": {"y": 270, "x": 0, "model": "computercraft:block/monitor_advanced_lu"},
+    "facing=west,orientation=north,state=lu": {"model": "computercraft:block/monitor_advanced_lu", "x": 0, "y": 270},
-    "facing=west,orientation=north,state=lud": {"y": 270, "x": 0, "model": "computercraft:block/monitor_advanced_lud"},
+    "facing=west,orientation=north,state=lud": {"model": "computercraft:block/monitor_advanced_lud", "x": 0, "y": 270},
-    "facing=west,orientation=north,state=none": {"y": 270, "x": 0, "model": "computercraft:block/monitor_advanced"},
+    "facing=west,orientation=north,state=none": {"model": "computercraft:block/monitor_advanced", "x": 0, "y": 270},
-    "facing=west,orientation=north,state=r": {"y": 270, "x": 0, "model": "computercraft:block/monitor_advanced_r"},
+    "facing=west,orientation=north,state=r": {"model": "computercraft:block/monitor_advanced_r", "x": 0, "y": 270},
-    "facing=west,orientation=north,state=rd": {"y": 270, "x": 0, "model": "computercraft:block/monitor_advanced_rd"},
+    "facing=west,orientation=north,state=rd": {"model": "computercraft:block/monitor_advanced_rd", "x": 0, "y": 270},
-    "facing=west,orientation=north,state=ru": {"y": 270, "x": 0, "model": "computercraft:block/monitor_advanced_ru"},
+    "facing=west,orientation=north,state=ru": {"model": "computercraft:block/monitor_advanced_ru", "x": 0, "y": 270},
-    "facing=west,orientation=north,state=rud": {"y": 270, "x": 0, "model": "computercraft:block/monitor_advanced_rud"},
+    "facing=west,orientation=north,state=rud": {"model": "computercraft:block/monitor_advanced_rud", "x": 0, "y": 270},
-    "facing=west,orientation=north,state=u": {"y": 270, "x": 0, "model": "computercraft:block/monitor_advanced_u"},
+    "facing=west,orientation=north,state=u": {"model": "computercraft:block/monitor_advanced_u", "x": 0, "y": 270},
-    "facing=west,orientation=north,state=ud": {"y": 270, "x": 0, "model": "computercraft:block/monitor_advanced_ud"},
+    "facing=west,orientation=north,state=ud": {"model": "computercraft:block/monitor_advanced_ud", "x": 0, "y": 270},
-    "facing=west,orientation=up,state=d": {"y": 270, "x": 270, "model": "computercraft:block/monitor_advanced_d"},
+    "facing=west,orientation=up,state=d": {"model": "computercraft:block/monitor_advanced_d", "x": 270, "y": 270},
-    "facing=west,orientation=up,state=l": {"y": 270, "x": 270, "model": "computercraft:block/monitor_advanced_l"},
+    "facing=west,orientation=up,state=l": {"model": "computercraft:block/monitor_advanced_l", "x": 270, "y": 270},
-    "facing=west,orientation=up,state=ld": {"y": 270, "x": 270, "model": "computercraft:block/monitor_advanced_ld"},
+    "facing=west,orientation=up,state=ld": {"model": "computercraft:block/monitor_advanced_ld", "x": 270, "y": 270},
-    "facing=west,orientation=up,state=lr": {"y": 270, "x": 270, "model": "computercraft:block/monitor_advanced_lr"},
+    "facing=west,orientation=up,state=lr": {"model": "computercraft:block/monitor_advanced_lr", "x": 270, "y": 270},
-    "facing=west,orientation=up,state=lrd": {"y": 270, "x": 270, "model": "computercraft:block/monitor_advanced_lrd"},
+    "facing=west,orientation=up,state=lrd": {"model": "computercraft:block/monitor_advanced_lrd", "x": 270, "y": 270},
-    "facing=west,orientation=up,state=lru": {"y": 270, "x": 270, "model": "computercraft:block/monitor_advanced_lru"},
+    "facing=west,orientation=up,state=lru": {"model": "computercraft:block/monitor_advanced_lru", "x": 270, "y": 270},
     "facing=west,orientation=up,state=lrud": {
-      "y": 270,
+      "model": "computercraft:block/monitor_advanced_lrud",
       "x": 270,
-      "model": "computercraft:block/monitor_advanced_lrud"
+      "y": 270
     },
-    "facing=west,orientation=up,state=lu": {"y": 270, "x": 270, "model": "computercraft:block/monitor_advanced_lu"},
+    "facing=west,orientation=up,state=lu": {"model": "computercraft:block/monitor_advanced_lu", "x": 270, "y": 270},
-    "facing=west,orientation=up,state=lud": {"y": 270, "x": 270, "model": "computercraft:block/monitor_advanced_lud"},
+    "facing=west,orientation=up,state=lud": {"model": "computercraft:block/monitor_advanced_lud", "x": 270, "y": 270},
-    "facing=west,orientation=up,state=none": {"y": 270, "x": 270, "model": "computercraft:block/monitor_advanced"},
+    "facing=west,orientation=up,state=none": {"model": "computercraft:block/monitor_advanced", "x": 270, "y": 270},
-    "facing=west,orientation=up,state=r": {"y": 270, "x": 270, "model": "computercraft:block/monitor_advanced_r"},
+    "facing=west,orientation=up,state=r": {"model": "computercraft:block/monitor_advanced_r", "x": 270, "y": 270},
-    "facing=west,orientation=up,state=rd": {"y": 270, "x": 270, "model": "computercraft:block/monitor_advanced_rd"},
+    "facing=west,orientation=up,state=rd": {"model": "computercraft:block/monitor_advanced_rd", "x": 270, "y": 270},
-    "facing=west,orientation=up,state=ru": {"y": 270, "x": 270, "model": "computercraft:block/monitor_advanced_ru"},
+    "facing=west,orientation=up,state=ru": {"model": "computercraft:block/monitor_advanced_ru", "x": 270, "y": 270},
-    "facing=west,orientation=up,state=rud": {"y": 270, "x": 270, "model": "computercraft:block/monitor_advanced_rud"},
+    "facing=west,orientation=up,state=rud": {"model": "computercraft:block/monitor_advanced_rud", "x": 270, "y": 270},
-    "facing=west,orientation=up,state=u": {"y": 270, "x": 270, "model": "computercraft:block/monitor_advanced_u"},
+    "facing=west,orientation=up,state=u": {"model": "computercraft:block/monitor_advanced_u", "x": 270, "y": 270},
-    "facing=west,orientation=up,state=ud": {"y": 270, "x": 270, "model": "computercraft:block/monitor_advanced_ud"}
+    "facing=west,orientation=up,state=ud": {"model": "computercraft:block/monitor_advanced_ud", "x": 270, "y": 270}
   }
-}
+}

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

@@ -1,204 +1,204 @@
 {
   "variants": {
-    "facing=east,orientation=down,state=d": {"y": 90, "x": 90, "model": "computercraft:block/monitor_normal_d"},
+    "facing=east,orientation=down,state=d": {"model": "computercraft:block/monitor_normal_d", "x": 90, "y": 90},
-    "facing=east,orientation=down,state=l": {"y": 90, "x": 90, "model": "computercraft:block/monitor_normal_l"},
+    "facing=east,orientation=down,state=l": {"model": "computercraft:block/monitor_normal_l", "x": 90, "y": 90},
-    "facing=east,orientation=down,state=ld": {"y": 90, "x": 90, "model": "computercraft:block/monitor_normal_ld"},
+    "facing=east,orientation=down,state=ld": {"model": "computercraft:block/monitor_normal_ld", "x": 90, "y": 90},
-    "facing=east,orientation=down,state=lr": {"y": 90, "x": 90, "model": "computercraft:block/monitor_normal_lr"},
+    "facing=east,orientation=down,state=lr": {"model": "computercraft:block/monitor_normal_lr", "x": 90, "y": 90},
-    "facing=east,orientation=down,state=lrd": {"y": 90, "x": 90, "model": "computercraft:block/monitor_normal_lrd"},
+    "facing=east,orientation=down,state=lrd": {"model": "computercraft:block/monitor_normal_lrd", "x": 90, "y": 90},
-    "facing=east,orientation=down,state=lru": {"y": 90, "x": 90, "model": "computercraft:block/monitor_normal_lru"},
+    "facing=east,orientation=down,state=lru": {"model": "computercraft:block/monitor_normal_lru", "x": 90, "y": 90},
-    "facing=east,orientation=down,state=lrud": {"y": 90, "x": 90, "model": "computercraft:block/monitor_normal_lrud"},
+    "facing=east,orientation=down,state=lrud": {"model": "computercraft:block/monitor_normal_lrud", "x": 90, "y": 90},
-    "facing=east,orientation=down,state=lu": {"y": 90, "x": 90, "model": "computercraft:block/monitor_normal_lu"},
+    "facing=east,orientation=down,state=lu": {"model": "computercraft:block/monitor_normal_lu", "x": 90, "y": 90},
-    "facing=east,orientation=down,state=lud": {"y": 90, "x": 90, "model": "computercraft:block/monitor_normal_lud"},
+    "facing=east,orientation=down,state=lud": {"model": "computercraft:block/monitor_normal_lud", "x": 90, "y": 90},
-    "facing=east,orientation=down,state=none": {"y": 90, "x": 90, "model": "computercraft:block/monitor_normal"},
+    "facing=east,orientation=down,state=none": {"model": "computercraft:block/monitor_normal", "x": 90, "y": 90},
-    "facing=east,orientation=down,state=r": {"y": 90, "x": 90, "model": "computercraft:block/monitor_normal_r"},
+    "facing=east,orientation=down,state=r": {"model": "computercraft:block/monitor_normal_r", "x": 90, "y": 90},
-    "facing=east,orientation=down,state=rd": {"y": 90, "x": 90, "model": "computercraft:block/monitor_normal_rd"},
+    "facing=east,orientation=down,state=rd": {"model": "computercraft:block/monitor_normal_rd", "x": 90, "y": 90},
-    "facing=east,orientation=down,state=ru": {"y": 90, "x": 90, "model": "computercraft:block/monitor_normal_ru"},
+    "facing=east,orientation=down,state=ru": {"model": "computercraft:block/monitor_normal_ru", "x": 90, "y": 90},
-    "facing=east,orientation=down,state=rud": {"y": 90, "x": 90, "model": "computercraft:block/monitor_normal_rud"},
+    "facing=east,orientation=down,state=rud": {"model": "computercraft:block/monitor_normal_rud", "x": 90, "y": 90},
-    "facing=east,orientation=down,state=u": {"y": 90, "x": 90, "model": "computercraft:block/monitor_normal_u"},
+    "facing=east,orientation=down,state=u": {"model": "computercraft:block/monitor_normal_u", "x": 90, "y": 90},
-    "facing=east,orientation=down,state=ud": {"y": 90, "x": 90, "model": "computercraft:block/monitor_normal_ud"},
+    "facing=east,orientation=down,state=ud": {"model": "computercraft:block/monitor_normal_ud", "x": 90, "y": 90},
-    "facing=east,orientation=north,state=d": {"y": 90, "x": 0, "model": "computercraft:block/monitor_normal_d"},
+    "facing=east,orientation=north,state=d": {"model": "computercraft:block/monitor_normal_d", "x": 0, "y": 90},
-    "facing=east,orientation=north,state=l": {"y": 90, "x": 0, "model": "computercraft:block/monitor_normal_l"},
+    "facing=east,orientation=north,state=l": {"model": "computercraft:block/monitor_normal_l", "x": 0, "y": 90},
-    "facing=east,orientation=north,state=ld": {"y": 90, "x": 0, "model": "computercraft:block/monitor_normal_ld"},
+    "facing=east,orientation=north,state=ld": {"model": "computercraft:block/monitor_normal_ld", "x": 0, "y": 90},
-    "facing=east,orientation=north,state=lr": {"y": 90, "x": 0, "model": "computercraft:block/monitor_normal_lr"},
+    "facing=east,orientation=north,state=lr": {"model": "computercraft:block/monitor_normal_lr", "x": 0, "y": 90},
-    "facing=east,orientation=north,state=lrd": {"y": 90, "x": 0, "model": "computercraft:block/monitor_normal_lrd"},
+    "facing=east,orientation=north,state=lrd": {"model": "computercraft:block/monitor_normal_lrd", "x": 0, "y": 90},
-    "facing=east,orientation=north,state=lru": {"y": 90, "x": 0, "model": "computercraft:block/monitor_normal_lru"},
+    "facing=east,orientation=north,state=lru": {"model": "computercraft:block/monitor_normal_lru", "x": 0, "y": 90},
-    "facing=east,orientation=north,state=lrud": {"y": 90, "x": 0, "model": "computercraft:block/monitor_normal_lrud"},
+    "facing=east,orientation=north,state=lrud": {"model": "computercraft:block/monitor_normal_lrud", "x": 0, "y": 90},
-    "facing=east,orientation=north,state=lu": {"y": 90, "x": 0, "model": "computercraft:block/monitor_normal_lu"},
+    "facing=east,orientation=north,state=lu": {"model": "computercraft:block/monitor_normal_lu", "x": 0, "y": 90},
-    "facing=east,orientation=north,state=lud": {"y": 90, "x": 0, "model": "computercraft:block/monitor_normal_lud"},
+    "facing=east,orientation=north,state=lud": {"model": "computercraft:block/monitor_normal_lud", "x": 0, "y": 90},
-    "facing=east,orientation=north,state=none": {"y": 90, "x": 0, "model": "computercraft:block/monitor_normal"},
+    "facing=east,orientation=north,state=none": {"model": "computercraft:block/monitor_normal", "x": 0, "y": 90},
-    "facing=east,orientation=north,state=r": {"y": 90, "x": 0, "model": "computercraft:block/monitor_normal_r"},
+    "facing=east,orientation=north,state=r": {"model": "computercraft:block/monitor_normal_r", "x": 0, "y": 90},
-    "facing=east,orientation=north,state=rd": {"y": 90, "x": 0, "model": "computercraft:block/monitor_normal_rd"},
+    "facing=east,orientation=north,state=rd": {"model": "computercraft:block/monitor_normal_rd", "x": 0, "y": 90},
-    "facing=east,orientation=north,state=ru": {"y": 90, "x": 0, "model": "computercraft:block/monitor_normal_ru"},
+    "facing=east,orientation=north,state=ru": {"model": "computercraft:block/monitor_normal_ru", "x": 0, "y": 90},
-    "facing=east,orientation=north,state=rud": {"y": 90, "x": 0, "model": "computercraft:block/monitor_normal_rud"},
+    "facing=east,orientation=north,state=rud": {"model": "computercraft:block/monitor_normal_rud", "x": 0, "y": 90},
-    "facing=east,orientation=north,state=u": {"y": 90, "x": 0, "model": "computercraft:block/monitor_normal_u"},
+    "facing=east,orientation=north,state=u": {"model": "computercraft:block/monitor_normal_u", "x": 0, "y": 90},
-    "facing=east,orientation=north,state=ud": {"y": 90, "x": 0, "model": "computercraft:block/monitor_normal_ud"},
+    "facing=east,orientation=north,state=ud": {"model": "computercraft:block/monitor_normal_ud", "x": 0, "y": 90},
-    "facing=east,orientation=up,state=d": {"y": 90, "x": 270, "model": "computercraft:block/monitor_normal_d"},
+    "facing=east,orientation=up,state=d": {"model": "computercraft:block/monitor_normal_d", "x": 270, "y": 90},
-    "facing=east,orientation=up,state=l": {"y": 90, "x": 270, "model": "computercraft:block/monitor_normal_l"},
+    "facing=east,orientation=up,state=l": {"model": "computercraft:block/monitor_normal_l", "x": 270, "y": 90},
-    "facing=east,orientation=up,state=ld": {"y": 90, "x": 270, "model": "computercraft:block/monitor_normal_ld"},
+    "facing=east,orientation=up,state=ld": {"model": "computercraft:block/monitor_normal_ld", "x": 270, "y": 90},
-    "facing=east,orientation=up,state=lr": {"y": 90, "x": 270, "model": "computercraft:block/monitor_normal_lr"},
+    "facing=east,orientation=up,state=lr": {"model": "computercraft:block/monitor_normal_lr", "x": 270, "y": 90},
-    "facing=east,orientation=up,state=lrd": {"y": 90, "x": 270, "model": "computercraft:block/monitor_normal_lrd"},
+    "facing=east,orientation=up,state=lrd": {"model": "computercraft:block/monitor_normal_lrd", "x": 270, "y": 90},
-    "facing=east,orientation=up,state=lru": {"y": 90, "x": 270, "model": "computercraft:block/monitor_normal_lru"},
+    "facing=east,orientation=up,state=lru": {"model": "computercraft:block/monitor_normal_lru", "x": 270, "y": 90},
-    "facing=east,orientation=up,state=lrud": {"y": 90, "x": 270, "model": "computercraft:block/monitor_normal_lrud"},
+    "facing=east,orientation=up,state=lrud": {"model": "computercraft:block/monitor_normal_lrud", "x": 270, "y": 90},
-    "facing=east,orientation=up,state=lu": {"y": 90, "x": 270, "model": "computercraft:block/monitor_normal_lu"},
+    "facing=east,orientation=up,state=lu": {"model": "computercraft:block/monitor_normal_lu", "x": 270, "y": 90},
-    "facing=east,orientation=up,state=lud": {"y": 90, "x": 270, "model": "computercraft:block/monitor_normal_lud"},
+    "facing=east,orientation=up,state=lud": {"model": "computercraft:block/monitor_normal_lud", "x": 270, "y": 90},
-    "facing=east,orientation=up,state=none": {"y": 90, "x": 270, "model": "computercraft:block/monitor_normal"},
+    "facing=east,orientation=up,state=none": {"model": "computercraft:block/monitor_normal", "x": 270, "y": 90},
-    "facing=east,orientation=up,state=r": {"y": 90, "x": 270, "model": "computercraft:block/monitor_normal_r"},
+    "facing=east,orientation=up,state=r": {"model": "computercraft:block/monitor_normal_r", "x": 270, "y": 90},
-    "facing=east,orientation=up,state=rd": {"y": 90, "x": 270, "model": "computercraft:block/monitor_normal_rd"},
+    "facing=east,orientation=up,state=rd": {"model": "computercraft:block/monitor_normal_rd", "x": 270, "y": 90},
-    "facing=east,orientation=up,state=ru": {"y": 90, "x": 270, "model": "computercraft:block/monitor_normal_ru"},
+    "facing=east,orientation=up,state=ru": {"model": "computercraft:block/monitor_normal_ru", "x": 270, "y": 90},
-    "facing=east,orientation=up,state=rud": {"y": 90, "x": 270, "model": "computercraft:block/monitor_normal_rud"},
+    "facing=east,orientation=up,state=rud": {"model": "computercraft:block/monitor_normal_rud", "x": 270, "y": 90},
-    "facing=east,orientation=up,state=u": {"y": 90, "x": 270, "model": "computercraft:block/monitor_normal_u"},
+    "facing=east,orientation=up,state=u": {"model": "computercraft:block/monitor_normal_u", "x": 270, "y": 90},
-    "facing=east,orientation=up,state=ud": {"y": 90, "x": 270, "model": "computercraft:block/monitor_normal_ud"},
+    "facing=east,orientation=up,state=ud": {"model": "computercraft:block/monitor_normal_ud", "x": 270, "y": 90},
-    "facing=north,orientation=down,state=d": {"y": 0, "x": 90, "model": "computercraft:block/monitor_normal_d"},
+    "facing=north,orientation=down,state=d": {"model": "computercraft:block/monitor_normal_d", "x": 90, "y": 0},
-    "facing=north,orientation=down,state=l": {"y": 0, "x": 90, "model": "computercraft:block/monitor_normal_l"},
+    "facing=north,orientation=down,state=l": {"model": "computercraft:block/monitor_normal_l", "x": 90, "y": 0},
-    "facing=north,orientation=down,state=ld": {"y": 0, "x": 90, "model": "computercraft:block/monitor_normal_ld"},
+    "facing=north,orientation=down,state=ld": {"model": "computercraft:block/monitor_normal_ld", "x": 90, "y": 0},
-    "facing=north,orientation=down,state=lr": {"y": 0, "x": 90, "model": "computercraft:block/monitor_normal_lr"},
+    "facing=north,orientation=down,state=lr": {"model": "computercraft:block/monitor_normal_lr", "x": 90, "y": 0},
-    "facing=north,orientation=down,state=lrd": {"y": 0, "x": 90, "model": "computercraft:block/monitor_normal_lrd"},
+    "facing=north,orientation=down,state=lrd": {"model": "computercraft:block/monitor_normal_lrd", "x": 90, "y": 0},
-    "facing=north,orientation=down,state=lru": {"y": 0, "x": 90, "model": "computercraft:block/monitor_normal_lru"},
+    "facing=north,orientation=down,state=lru": {"model": "computercraft:block/monitor_normal_lru", "x": 90, "y": 0},
-    "facing=north,orientation=down,state=lrud": {"y": 0, "x": 90, "model": "computercraft:block/monitor_normal_lrud"},
+    "facing=north,orientation=down,state=lrud": {"model": "computercraft:block/monitor_normal_lrud", "x": 90, "y": 0},
-    "facing=north,orientation=down,state=lu": {"y": 0, "x": 90, "model": "computercraft:block/monitor_normal_lu"},
+    "facing=north,orientation=down,state=lu": {"model": "computercraft:block/monitor_normal_lu", "x": 90, "y": 0},
-    "facing=north,orientation=down,state=lud": {"y": 0, "x": 90, "model": "computercraft:block/monitor_normal_lud"},
+    "facing=north,orientation=down,state=lud": {"model": "computercraft:block/monitor_normal_lud", "x": 90, "y": 0},
-    "facing=north,orientation=down,state=none": {"y": 0, "x": 90, "model": "computercraft:block/monitor_normal"},
+    "facing=north,orientation=down,state=none": {"model": "computercraft:block/monitor_normal", "x": 90, "y": 0},
-    "facing=north,orientation=down,state=r": {"y": 0, "x": 90, "model": "computercraft:block/monitor_normal_r"},
+    "facing=north,orientation=down,state=r": {"model": "computercraft:block/monitor_normal_r", "x": 90, "y": 0},
-    "facing=north,orientation=down,state=rd": {"y": 0, "x": 90, "model": "computercraft:block/monitor_normal_rd"},
+    "facing=north,orientation=down,state=rd": {"model": "computercraft:block/monitor_normal_rd", "x": 90, "y": 0},
-    "facing=north,orientation=down,state=ru": {"y": 0, "x": 90, "model": "computercraft:block/monitor_normal_ru"},
+    "facing=north,orientation=down,state=ru": {"model": "computercraft:block/monitor_normal_ru", "x": 90, "y": 0},
-    "facing=north,orientation=down,state=rud": {"y": 0, "x": 90, "model": "computercraft:block/monitor_normal_rud"},
+    "facing=north,orientation=down,state=rud": {"model": "computercraft:block/monitor_normal_rud", "x": 90, "y": 0},
-    "facing=north,orientation=down,state=u": {"y": 0, "x": 90, "model": "computercraft:block/monitor_normal_u"},
+    "facing=north,orientation=down,state=u": {"model": "computercraft:block/monitor_normal_u", "x": 90, "y": 0},
-    "facing=north,orientation=down,state=ud": {"y": 0, "x": 90, "model": "computercraft:block/monitor_normal_ud"},
+    "facing=north,orientation=down,state=ud": {"model": "computercraft:block/monitor_normal_ud", "x": 90, "y": 0},
-    "facing=north,orientation=north,state=d": {"y": 0, "x": 0, "model": "computercraft:block/monitor_normal_d"},
+    "facing=north,orientation=north,state=d": {"model": "computercraft:block/monitor_normal_d", "x": 0, "y": 0},
-    "facing=north,orientation=north,state=l": {"y": 0, "x": 0, "model": "computercraft:block/monitor_normal_l"},
+    "facing=north,orientation=north,state=l": {"model": "computercraft:block/monitor_normal_l", "x": 0, "y": 0},
-    "facing=north,orientation=north,state=ld": {"y": 0, "x": 0, "model": "computercraft:block/monitor_normal_ld"},
+    "facing=north,orientation=north,state=ld": {"model": "computercraft:block/monitor_normal_ld", "x": 0, "y": 0},
-    "facing=north,orientation=north,state=lr": {"y": 0, "x": 0, "model": "computercraft:block/monitor_normal_lr"},
+    "facing=north,orientation=north,state=lr": {"model": "computercraft:block/monitor_normal_lr", "x": 0, "y": 0},
-    "facing=north,orientation=north,state=lrd": {"y": 0, "x": 0, "model": "computercraft:block/monitor_normal_lrd"},
+    "facing=north,orientation=north,state=lrd": {"model": "computercraft:block/monitor_normal_lrd", "x": 0, "y": 0},
-    "facing=north,orientation=north,state=lru": {"y": 0, "x": 0, "model": "computercraft:block/monitor_normal_lru"},
+    "facing=north,orientation=north,state=lru": {"model": "computercraft:block/monitor_normal_lru", "x": 0, "y": 0},
-    "facing=north,orientation=north,state=lrud": {"y": 0, "x": 0, "model": "computercraft:block/monitor_normal_lrud"},
+    "facing=north,orientation=north,state=lrud": {"model": "computercraft:block/monitor_normal_lrud", "x": 0, "y": 0},
-    "facing=north,orientation=north,state=lu": {"y": 0, "x": 0, "model": "computercraft:block/monitor_normal_lu"},
+    "facing=north,orientation=north,state=lu": {"model": "computercraft:block/monitor_normal_lu", "x": 0, "y": 0},
-    "facing=north,orientation=north,state=lud": {"y": 0, "x": 0, "model": "computercraft:block/monitor_normal_lud"},
+    "facing=north,orientation=north,state=lud": {"model": "computercraft:block/monitor_normal_lud", "x": 0, "y": 0},
-    "facing=north,orientation=north,state=none": {"y": 0, "x": 0, "model": "computercraft:block/monitor_normal"},
+    "facing=north,orientation=north,state=none": {"model": "computercraft:block/monitor_normal", "x": 0, "y": 0},
-    "facing=north,orientation=north,state=r": {"y": 0, "x": 0, "model": "computercraft:block/monitor_normal_r"},
+    "facing=north,orientation=north,state=r": {"model": "computercraft:block/monitor_normal_r", "x": 0, "y": 0},
-    "facing=north,orientation=north,state=rd": {"y": 0, "x": 0, "model": "computercraft:block/monitor_normal_rd"},
+    "facing=north,orientation=north,state=rd": {"model": "computercraft:block/monitor_normal_rd", "x": 0, "y": 0},
-    "facing=north,orientation=north,state=ru": {"y": 0, "x": 0, "model": "computercraft:block/monitor_normal_ru"},
+    "facing=north,orientation=north,state=ru": {"model": "computercraft:block/monitor_normal_ru", "x": 0, "y": 0},
-    "facing=north,orientation=north,state=rud": {"y": 0, "x": 0, "model": "computercraft:block/monitor_normal_rud"},
+    "facing=north,orientation=north,state=rud": {"model": "computercraft:block/monitor_normal_rud", "x": 0, "y": 0},
-    "facing=north,orientation=north,state=u": {"y": 0, "x": 0, "model": "computercraft:block/monitor_normal_u"},
+    "facing=north,orientation=north,state=u": {"model": "computercraft:block/monitor_normal_u", "x": 0, "y": 0},
-    "facing=north,orientation=north,state=ud": {"y": 0, "x": 0, "model": "computercraft:block/monitor_normal_ud"},
+    "facing=north,orientation=north,state=ud": {"model": "computercraft:block/monitor_normal_ud", "x": 0, "y": 0},
-    "facing=north,orientation=up,state=d": {"y": 0, "x": 270, "model": "computercraft:block/monitor_normal_d"},
+    "facing=north,orientation=up,state=d": {"model": "computercraft:block/monitor_normal_d", "x": 270, "y": 0},
-    "facing=north,orientation=up,state=l": {"y": 0, "x": 270, "model": "computercraft:block/monitor_normal_l"},
+    "facing=north,orientation=up,state=l": {"model": "computercraft:block/monitor_normal_l", "x": 270, "y": 0},
-    "facing=north,orientation=up,state=ld": {"y": 0, "x": 270, "model": "computercraft:block/monitor_normal_ld"},
+    "facing=north,orientation=up,state=ld": {"model": "computercraft:block/monitor_normal_ld", "x": 270, "y": 0},
-    "facing=north,orientation=up,state=lr": {"y": 0, "x": 270, "model": "computercraft:block/monitor_normal_lr"},
+    "facing=north,orientation=up,state=lr": {"model": "computercraft:block/monitor_normal_lr", "x": 270, "y": 0},
-    "facing=north,orientation=up,state=lrd": {"y": 0, "x": 270, "model": "computercraft:block/monitor_normal_lrd"},
+    "facing=north,orientation=up,state=lrd": {"model": "computercraft:block/monitor_normal_lrd", "x": 270, "y": 0},
-    "facing=north,orientation=up,state=lru": {"y": 0, "x": 270, "model": "computercraft:block/monitor_normal_lru"},
+    "facing=north,orientation=up,state=lru": {"model": "computercraft:block/monitor_normal_lru", "x": 270, "y": 0},
-    "facing=north,orientation=up,state=lrud": {"y": 0, "x": 270, "model": "computercraft:block/monitor_normal_lrud"},
+    "facing=north,orientation=up,state=lrud": {"model": "computercraft:block/monitor_normal_lrud", "x": 270, "y": 0},
-    "facing=north,orientation=up,state=lu": {"y": 0, "x": 270, "model": "computercraft:block/monitor_normal_lu"},
+    "facing=north,orientation=up,state=lu": {"model": "computercraft:block/monitor_normal_lu", "x": 270, "y": 0},
-    "facing=north,orientation=up,state=lud": {"y": 0, "x": 270, "model": "computercraft:block/monitor_normal_lud"},
+    "facing=north,orientation=up,state=lud": {"model": "computercraft:block/monitor_normal_lud", "x": 270, "y": 0},
-    "facing=north,orientation=up,state=none": {"y": 0, "x": 270, "model": "computercraft:block/monitor_normal"},
+    "facing=north,orientation=up,state=none": {"model": "computercraft:block/monitor_normal", "x": 270, "y": 0},
-    "facing=north,orientation=up,state=r": {"y": 0, "x": 270, "model": "computercraft:block/monitor_normal_r"},
+    "facing=north,orientation=up,state=r": {"model": "computercraft:block/monitor_normal_r", "x": 270, "y": 0},
-    "facing=north,orientation=up,state=rd": {"y": 0, "x": 270, "model": "computercraft:block/monitor_normal_rd"},
+    "facing=north,orientation=up,state=rd": {"model": "computercraft:block/monitor_normal_rd", "x": 270, "y": 0},
-    "facing=north,orientation=up,state=ru": {"y": 0, "x": 270, "model": "computercraft:block/monitor_normal_ru"},
+    "facing=north,orientation=up,state=ru": {"model": "computercraft:block/monitor_normal_ru", "x": 270, "y": 0},
-    "facing=north,orientation=up,state=rud": {"y": 0, "x": 270, "model": "computercraft:block/monitor_normal_rud"},
+    "facing=north,orientation=up,state=rud": {"model": "computercraft:block/monitor_normal_rud", "x": 270, "y": 0},
-    "facing=north,orientation=up,state=u": {"y": 0, "x": 270, "model": "computercraft:block/monitor_normal_u"},
+    "facing=north,orientation=up,state=u": {"model": "computercraft:block/monitor_normal_u", "x": 270, "y": 0},
-    "facing=north,orientation=up,state=ud": {"y": 0, "x": 270, "model": "computercraft:block/monitor_normal_ud"},
+    "facing=north,orientation=up,state=ud": {"model": "computercraft:block/monitor_normal_ud", "x": 270, "y": 0},
-    "facing=south,orientation=down,state=d": {"y": 180, "x": 90, "model": "computercraft:block/monitor_normal_d"},
+    "facing=south,orientation=down,state=d": {"model": "computercraft:block/monitor_normal_d", "x": 90, "y": 180},
-    "facing=south,orientation=down,state=l": {"y": 180, "x": 90, "model": "computercraft:block/monitor_normal_l"},
+    "facing=south,orientation=down,state=l": {"model": "computercraft:block/monitor_normal_l", "x": 90, "y": 180},
-    "facing=south,orientation=down,state=ld": {"y": 180, "x": 90, "model": "computercraft:block/monitor_normal_ld"},
+    "facing=south,orientation=down,state=ld": {"model": "computercraft:block/monitor_normal_ld", "x": 90, "y": 180},
-    "facing=south,orientation=down,state=lr": {"y": 180, "x": 90, "model": "computercraft:block/monitor_normal_lr"},
+    "facing=south,orientation=down,state=lr": {"model": "computercraft:block/monitor_normal_lr", "x": 90, "y": 180},
-    "facing=south,orientation=down,state=lrd": {"y": 180, "x": 90, "model": "computercraft:block/monitor_normal_lrd"},
+    "facing=south,orientation=down,state=lrd": {"model": "computercraft:block/monitor_normal_lrd", "x": 90, "y": 180},
-    "facing=south,orientation=down,state=lru": {"y": 180, "x": 90, "model": "computercraft:block/monitor_normal_lru"},
+    "facing=south,orientation=down,state=lru": {"model": "computercraft:block/monitor_normal_lru", "x": 90, "y": 180},
     "facing=south,orientation=down,state=lrud": {
-      "y": 180,
+      "model": "computercraft:block/monitor_normal_lrud",
       "x": 90,
-      "model": "computercraft:block/monitor_normal_lrud"
+      "y": 180
     },
-    "facing=south,orientation=down,state=lu": {"y": 180, "x": 90, "model": "computercraft:block/monitor_normal_lu"},
+    "facing=south,orientation=down,state=lu": {"model": "computercraft:block/monitor_normal_lu", "x": 90, "y": 180},
-    "facing=south,orientation=down,state=lud": {"y": 180, "x": 90, "model": "computercraft:block/monitor_normal_lud"},
+    "facing=south,orientation=down,state=lud": {"model": "computercraft:block/monitor_normal_lud", "x": 90, "y": 180},
-    "facing=south,orientation=down,state=none": {"y": 180, "x": 90, "model": "computercraft:block/monitor_normal"},
+    "facing=south,orientation=down,state=none": {"model": "computercraft:block/monitor_normal", "x": 90, "y": 180},
-    "facing=south,orientation=down,state=r": {"y": 180, "x": 90, "model": "computercraft:block/monitor_normal_r"},
+    "facing=south,orientation=down,state=r": {"model": "computercraft:block/monitor_normal_r", "x": 90, "y": 180},
-    "facing=south,orientation=down,state=rd": {"y": 180, "x": 90, "model": "computercraft:block/monitor_normal_rd"},
+    "facing=south,orientation=down,state=rd": {"model": "computercraft:block/monitor_normal_rd", "x": 90, "y": 180},
-    "facing=south,orientation=down,state=ru": {"y": 180, "x": 90, "model": "computercraft:block/monitor_normal_ru"},
+    "facing=south,orientation=down,state=ru": {"model": "computercraft:block/monitor_normal_ru", "x": 90, "y": 180},
-    "facing=south,orientation=down,state=rud": {"y": 180, "x": 90, "model": "computercraft:block/monitor_normal_rud"},
+    "facing=south,orientation=down,state=rud": {"model": "computercraft:block/monitor_normal_rud", "x": 90, "y": 180},
-    "facing=south,orientation=down,state=u": {"y": 180, "x": 90, "model": "computercraft:block/monitor_normal_u"},
+    "facing=south,orientation=down,state=u": {"model": "computercraft:block/monitor_normal_u", "x": 90, "y": 180},
-    "facing=south,orientation=down,state=ud": {"y": 180, "x": 90, "model": "computercraft:block/monitor_normal_ud"},
+    "facing=south,orientation=down,state=ud": {"model": "computercraft:block/monitor_normal_ud", "x": 90, "y": 180},
-    "facing=south,orientation=north,state=d": {"y": 180, "x": 0, "model": "computercraft:block/monitor_normal_d"},
+    "facing=south,orientation=north,state=d": {"model": "computercraft:block/monitor_normal_d", "x": 0, "y": 180},
-    "facing=south,orientation=north,state=l": {"y": 180, "x": 0, "model": "computercraft:block/monitor_normal_l"},
+    "facing=south,orientation=north,state=l": {"model": "computercraft:block/monitor_normal_l", "x": 0, "y": 180},
-    "facing=south,orientation=north,state=ld": {"y": 180, "x": 0, "model": "computercraft:block/monitor_normal_ld"},
+    "facing=south,orientation=north,state=ld": {"model": "computercraft:block/monitor_normal_ld", "x": 0, "y": 180},
-    "facing=south,orientation=north,state=lr": {"y": 180, "x": 0, "model": "computercraft:block/monitor_normal_lr"},
+    "facing=south,orientation=north,state=lr": {"model": "computercraft:block/monitor_normal_lr", "x": 0, "y": 180},
-    "facing=south,orientation=north,state=lrd": {"y": 180, "x": 0, "model": "computercraft:block/monitor_normal_lrd"},
+    "facing=south,orientation=north,state=lrd": {"model": "computercraft:block/monitor_normal_lrd", "x": 0, "y": 180},
-    "facing=south,orientation=north,state=lru": {"y": 180, "x": 0, "model": "computercraft:block/monitor_normal_lru"},
+    "facing=south,orientation=north,state=lru": {"model": "computercraft:block/monitor_normal_lru", "x": 0, "y": 180},
     "facing=south,orientation=north,state=lrud": {
-      "y": 180,
+      "model": "computercraft:block/monitor_normal_lrud",
       "x": 0,
-      "model": "computercraft:block/monitor_normal_lrud"
+      "y": 180
     },
-    "facing=south,orientation=north,state=lu": {"y": 180, "x": 0, "model": "computercraft:block/monitor_normal_lu"},
+    "facing=south,orientation=north,state=lu": {"model": "computercraft:block/monitor_normal_lu", "x": 0, "y": 180},
-    "facing=south,orientation=north,state=lud": {"y": 180, "x": 0, "model": "computercraft:block/monitor_normal_lud"},
+    "facing=south,orientation=north,state=lud": {"model": "computercraft:block/monitor_normal_lud", "x": 0, "y": 180},
-    "facing=south,orientation=north,state=none": {"y": 180, "x": 0, "model": "computercraft:block/monitor_normal"},
+    "facing=south,orientation=north,state=none": {"model": "computercraft:block/monitor_normal", "x": 0, "y": 180},
-    "facing=south,orientation=north,state=r": {"y": 180, "x": 0, "model": "computercraft:block/monitor_normal_r"},
+    "facing=south,orientation=north,state=r": {"model": "computercraft:block/monitor_normal_r", "x": 0, "y": 180},
-    "facing=south,orientation=north,state=rd": {"y": 180, "x": 0, "model": "computercraft:block/monitor_normal_rd"},
+    "facing=south,orientation=north,state=rd": {"model": "computercraft:block/monitor_normal_rd", "x": 0, "y": 180},
-    "facing=south,orientation=north,state=ru": {"y": 180, "x": 0, "model": "computercraft:block/monitor_normal_ru"},
+    "facing=south,orientation=north,state=ru": {"model": "computercraft:block/monitor_normal_ru", "x": 0, "y": 180},
-    "facing=south,orientation=north,state=rud": {"y": 180, "x": 0, "model": "computercraft:block/monitor_normal_rud"},
+    "facing=south,orientation=north,state=rud": {"model": "computercraft:block/monitor_normal_rud", "x": 0, "y": 180},
-    "facing=south,orientation=north,state=u": {"y": 180, "x": 0, "model": "computercraft:block/monitor_normal_u"},
+    "facing=south,orientation=north,state=u": {"model": "computercraft:block/monitor_normal_u", "x": 0, "y": 180},
-    "facing=south,orientation=north,state=ud": {"y": 180, "x": 0, "model": "computercraft:block/monitor_normal_ud"},
+    "facing=south,orientation=north,state=ud": {"model": "computercraft:block/monitor_normal_ud", "x": 0, "y": 180},
-    "facing=south,orientation=up,state=d": {"y": 180, "x": 270, "model": "computercraft:block/monitor_normal_d"},
+    "facing=south,orientation=up,state=d": {"model": "computercraft:block/monitor_normal_d", "x": 270, "y": 180},
-    "facing=south,orientation=up,state=l": {"y": 180, "x": 270, "model": "computercraft:block/monitor_normal_l"},
+    "facing=south,orientation=up,state=l": {"model": "computercraft:block/monitor_normal_l", "x": 270, "y": 180},
-    "facing=south,orientation=up,state=ld": {"y": 180, "x": 270, "model": "computercraft:block/monitor_normal_ld"},
+    "facing=south,orientation=up,state=ld": {"model": "computercraft:block/monitor_normal_ld", "x": 270, "y": 180},
-    "facing=south,orientation=up,state=lr": {"y": 180, "x": 270, "model": "computercraft:block/monitor_normal_lr"},
+    "facing=south,orientation=up,state=lr": {"model": "computercraft:block/monitor_normal_lr", "x": 270, "y": 180},
-    "facing=south,orientation=up,state=lrd": {"y": 180, "x": 270, "model": "computercraft:block/monitor_normal_lrd"},
+    "facing=south,orientation=up,state=lrd": {"model": "computercraft:block/monitor_normal_lrd", "x": 270, "y": 180},
-    "facing=south,orientation=up,state=lru": {"y": 180, "x": 270, "model": "computercraft:block/monitor_normal_lru"},
+    "facing=south,orientation=up,state=lru": {"model": "computercraft:block/monitor_normal_lru", "x": 270, "y": 180},
-    "facing=south,orientation=up,state=lrud": {"y": 180, "x": 270, "model": "computercraft:block/monitor_normal_lrud"},
+    "facing=south,orientation=up,state=lrud": {"model": "computercraft:block/monitor_normal_lrud", "x": 270, "y": 180},
-    "facing=south,orientation=up,state=lu": {"y": 180, "x": 270, "model": "computercraft:block/monitor_normal_lu"},
+    "facing=south,orientation=up,state=lu": {"model": "computercraft:block/monitor_normal_lu", "x": 270, "y": 180},
-    "facing=south,orientation=up,state=lud": {"y": 180, "x": 270, "model": "computercraft:block/monitor_normal_lud"},
+    "facing=south,orientation=up,state=lud": {"model": "computercraft:block/monitor_normal_lud", "x": 270, "y": 180},
-    "facing=south,orientation=up,state=none": {"y": 180, "x": 270, "model": "computercraft:block/monitor_normal"},
+    "facing=south,orientation=up,state=none": {"model": "computercraft:block/monitor_normal", "x": 270, "y": 180},
-    "facing=south,orientation=up,state=r": {"y": 180, "x": 270, "model": "computercraft:block/monitor_normal_r"},
+    "facing=south,orientation=up,state=r": {"model": "computercraft:block/monitor_normal_r", "x": 270, "y": 180},
-    "facing=south,orientation=up,state=rd": {"y": 180, "x": 270, "model": "computercraft:block/monitor_normal_rd"},
+    "facing=south,orientation=up,state=rd": {"model": "computercraft:block/monitor_normal_rd", "x": 270, "y": 180},
-    "facing=south,orientation=up,state=ru": {"y": 180, "x": 270, "model": "computercraft:block/monitor_normal_ru"},
+    "facing=south,orientation=up,state=ru": {"model": "computercraft:block/monitor_normal_ru", "x": 270, "y": 180},
-    "facing=south,orientation=up,state=rud": {"y": 180, "x": 270, "model": "computercraft:block/monitor_normal_rud"},
+    "facing=south,orientation=up,state=rud": {"model": "computercraft:block/monitor_normal_rud", "x": 270, "y": 180},
-    "facing=south,orientation=up,state=u": {"y": 180, "x": 270, "model": "computercraft:block/monitor_normal_u"},
+    "facing=south,orientation=up,state=u": {"model": "computercraft:block/monitor_normal_u", "x": 270, "y": 180},
-    "facing=south,orientation=up,state=ud": {"y": 180, "x": 270, "model": "computercraft:block/monitor_normal_ud"},
+    "facing=south,orientation=up,state=ud": {"model": "computercraft:block/monitor_normal_ud", "x": 270, "y": 180},
-    "facing=west,orientation=down,state=d": {"y": 270, "x": 90, "model": "computercraft:block/monitor_normal_d"},
+    "facing=west,orientation=down,state=d": {"model": "computercraft:block/monitor_normal_d", "x": 90, "y": 270},
-    "facing=west,orientation=down,state=l": {"y": 270, "x": 90, "model": "computercraft:block/monitor_normal_l"},
+    "facing=west,orientation=down,state=l": {"model": "computercraft:block/monitor_normal_l", "x": 90, "y": 270},
-    "facing=west,orientation=down,state=ld": {"y": 270, "x": 90, "model": "computercraft:block/monitor_normal_ld"},
+    "facing=west,orientation=down,state=ld": {"model": "computercraft:block/monitor_normal_ld", "x": 90, "y": 270},
-    "facing=west,orientation=down,state=lr": {"y": 270, "x": 90, "model": "computercraft:block/monitor_normal_lr"},
+    "facing=west,orientation=down,state=lr": {"model": "computercraft:block/monitor_normal_lr", "x": 90, "y": 270},
-    "facing=west,orientation=down,state=lrd": {"y": 270, "x": 90, "model": "computercraft:block/monitor_normal_lrd"},
+    "facing=west,orientation=down,state=lrd": {"model": "computercraft:block/monitor_normal_lrd", "x": 90, "y": 270},
-    "facing=west,orientation=down,state=lru": {"y": 270, "x": 90, "model": "computercraft:block/monitor_normal_lru"},
+    "facing=west,orientation=down,state=lru": {"model": "computercraft:block/monitor_normal_lru", "x": 90, "y": 270},
-    "facing=west,orientation=down,state=lrud": {"y": 270, "x": 90, "model": "computercraft:block/monitor_normal_lrud"},
+    "facing=west,orientation=down,state=lrud": {"model": "computercraft:block/monitor_normal_lrud", "x": 90, "y": 270},
-    "facing=west,orientation=down,state=lu": {"y": 270, "x": 90, "model": "computercraft:block/monitor_normal_lu"},
+    "facing=west,orientation=down,state=lu": {"model": "computercraft:block/monitor_normal_lu", "x": 90, "y": 270},
-    "facing=west,orientation=down,state=lud": {"y": 270, "x": 90, "model": "computercraft:block/monitor_normal_lud"},
+    "facing=west,orientation=down,state=lud": {"model": "computercraft:block/monitor_normal_lud", "x": 90, "y": 270},
-    "facing=west,orientation=down,state=none": {"y": 270, "x": 90, "model": "computercraft:block/monitor_normal"},
+    "facing=west,orientation=down,state=none": {"model": "computercraft:block/monitor_normal", "x": 90, "y": 270},
-    "facing=west,orientation=down,state=r": {"y": 270, "x": 90, "model": "computercraft:block/monitor_normal_r"},
+    "facing=west,orientation=down,state=r": {"model": "computercraft:block/monitor_normal_r", "x": 90, "y": 270},
-    "facing=west,orientation=down,state=rd": {"y": 270, "x": 90, "model": "computercraft:block/monitor_normal_rd"},
+    "facing=west,orientation=down,state=rd": {"model": "computercraft:block/monitor_normal_rd", "x": 90, "y": 270},
-    "facing=west,orientation=down,state=ru": {"y": 270, "x": 90, "model": "computercraft:block/monitor_normal_ru"},
+    "facing=west,orientation=down,state=ru": {"model": "computercraft:block/monitor_normal_ru", "x": 90, "y": 270},
-    "facing=west,orientation=down,state=rud": {"y": 270, "x": 90, "model": "computercraft:block/monitor_normal_rud"},
+    "facing=west,orientation=down,state=rud": {"model": "computercraft:block/monitor_normal_rud", "x": 90, "y": 270},
-    "facing=west,orientation=down,state=u": {"y": 270, "x": 90, "model": "computercraft:block/monitor_normal_u"},
+    "facing=west,orientation=down,state=u": {"model": "computercraft:block/monitor_normal_u", "x": 90, "y": 270},
-    "facing=west,orientation=down,state=ud": {"y": 270, "x": 90, "model": "computercraft:block/monitor_normal_ud"},
+    "facing=west,orientation=down,state=ud": {"model": "computercraft:block/monitor_normal_ud", "x": 90, "y": 270},
-    "facing=west,orientation=north,state=d": {"y": 270, "x": 0, "model": "computercraft:block/monitor_normal_d"},
+    "facing=west,orientation=north,state=d": {"model": "computercraft:block/monitor_normal_d", "x": 0, "y": 270},
-    "facing=west,orientation=north,state=l": {"y": 270, "x": 0, "model": "computercraft:block/monitor_normal_l"},
+    "facing=west,orientation=north,state=l": {"model": "computercraft:block/monitor_normal_l", "x": 0, "y": 270},
-    "facing=west,orientation=north,state=ld": {"y": 270, "x": 0, "model": "computercraft:block/monitor_normal_ld"},
+    "facing=west,orientation=north,state=ld": {"model": "computercraft:block/monitor_normal_ld", "x": 0, "y": 270},
-    "facing=west,orientation=north,state=lr": {"y": 270, "x": 0, "model": "computercraft:block/monitor_normal_lr"},
+    "facing=west,orientation=north,state=lr": {"model": "computercraft:block/monitor_normal_lr", "x": 0, "y": 270},
-    "facing=west,orientation=north,state=lrd": {"y": 270, "x": 0, "model": "computercraft:block/monitor_normal_lrd"},
+    "facing=west,orientation=north,state=lrd": {"model": "computercraft:block/monitor_normal_lrd", "x": 0, "y": 270},
-    "facing=west,orientation=north,state=lru": {"y": 270, "x": 0, "model": "computercraft:block/monitor_normal_lru"},
+    "facing=west,orientation=north,state=lru": {"model": "computercraft:block/monitor_normal_lru", "x": 0, "y": 270},
-    "facing=west,orientation=north,state=lrud": {"y": 270, "x": 0, "model": "computercraft:block/monitor_normal_lrud"},
+    "facing=west,orientation=north,state=lrud": {"model": "computercraft:block/monitor_normal_lrud", "x": 0, "y": 270},
-    "facing=west,orientation=north,state=lu": {"y": 270, "x": 0, "model": "computercraft:block/monitor_normal_lu"},
+    "facing=west,orientation=north,state=lu": {"model": "computercraft:block/monitor_normal_lu", "x": 0, "y": 270},
-    "facing=west,orientation=north,state=lud": {"y": 270, "x": 0, "model": "computercraft:block/monitor_normal_lud"},
+    "facing=west,orientation=north,state=lud": {"model": "computercraft:block/monitor_normal_lud", "x": 0, "y": 270},
-    "facing=west,orientation=north,state=none": {"y": 270, "x": 0, "model": "computercraft:block/monitor_normal"},
+    "facing=west,orientation=north,state=none": {"model": "computercraft:block/monitor_normal", "x": 0, "y": 270},
-    "facing=west,orientation=north,state=r": {"y": 270, "x": 0, "model": "computercraft:block/monitor_normal_r"},
+    "facing=west,orientation=north,state=r": {"model": "computercraft:block/monitor_normal_r", "x": 0, "y": 270},
-    "facing=west,orientation=north,state=rd": {"y": 270, "x": 0, "model": "computercraft:block/monitor_normal_rd"},
+    "facing=west,orientation=north,state=rd": {"model": "computercraft:block/monitor_normal_rd", "x": 0, "y": 270},
-    "facing=west,orientation=north,state=ru": {"y": 270, "x": 0, "model": "computercraft:block/monitor_normal_ru"},
+    "facing=west,orientation=north,state=ru": {"model": "computercraft:block/monitor_normal_ru", "x": 0, "y": 270},
-    "facing=west,orientation=north,state=rud": {"y": 270, "x": 0, "model": "computercraft:block/monitor_normal_rud"},
+    "facing=west,orientation=north,state=rud": {"model": "computercraft:block/monitor_normal_rud", "x": 0, "y": 270},
-    "facing=west,orientation=north,state=u": {"y": 270, "x": 0, "model": "computercraft:block/monitor_normal_u"},
+    "facing=west,orientation=north,state=u": {"model": "computercraft:block/monitor_normal_u", "x": 0, "y": 270},
-    "facing=west,orientation=north,state=ud": {"y": 270, "x": 0, "model": "computercraft:block/monitor_normal_ud"},
+    "facing=west,orientation=north,state=ud": {"model": "computercraft:block/monitor_normal_ud", "x": 0, "y": 270},
-    "facing=west,orientation=up,state=d": {"y": 270, "x": 270, "model": "computercraft:block/monitor_normal_d"},
+    "facing=west,orientation=up,state=d": {"model": "computercraft:block/monitor_normal_d", "x": 270, "y": 270},
-    "facing=west,orientation=up,state=l": {"y": 270, "x": 270, "model": "computercraft:block/monitor_normal_l"},
+    "facing=west,orientation=up,state=l": {"model": "computercraft:block/monitor_normal_l", "x": 270, "y": 270},
-    "facing=west,orientation=up,state=ld": {"y": 270, "x": 270, "model": "computercraft:block/monitor_normal_ld"},
+    "facing=west,orientation=up,state=ld": {"model": "computercraft:block/monitor_normal_ld", "x": 270, "y": 270},
-    "facing=west,orientation=up,state=lr": {"y": 270, "x": 270, "model": "computercraft:block/monitor_normal_lr"},
+    "facing=west,orientation=up,state=lr": {"model": "computercraft:block/monitor_normal_lr", "x": 270, "y": 270},
-    "facing=west,orientation=up,state=lrd": {"y": 270, "x": 270, "model": "computercraft:block/monitor_normal_lrd"},
+    "facing=west,orientation=up,state=lrd": {"model": "computercraft:block/monitor_normal_lrd", "x": 270, "y": 270},
-    "facing=west,orientation=up,state=lru": {"y": 270, "x": 270, "model": "computercraft:block/monitor_normal_lru"},
+    "facing=west,orientation=up,state=lru": {"model": "computercraft:block/monitor_normal_lru", "x": 270, "y": 270},
-    "facing=west,orientation=up,state=lrud": {"y": 270, "x": 270, "model": "computercraft:block/monitor_normal_lrud"},
+    "facing=west,orientation=up,state=lrud": {"model": "computercraft:block/monitor_normal_lrud", "x": 270, "y": 270},
-    "facing=west,orientation=up,state=lu": {"y": 270, "x": 270, "model": "computercraft:block/monitor_normal_lu"},
+    "facing=west,orientation=up,state=lu": {"model": "computercraft:block/monitor_normal_lu", "x": 270, "y": 270},
-    "facing=west,orientation=up,state=lud": {"y": 270, "x": 270, "model": "computercraft:block/monitor_normal_lud"},
+    "facing=west,orientation=up,state=lud": {"model": "computercraft:block/monitor_normal_lud", "x": 270, "y": 270},
-    "facing=west,orientation=up,state=none": {"y": 270, "x": 270, "model": "computercraft:block/monitor_normal"},
+    "facing=west,orientation=up,state=none": {"model": "computercraft:block/monitor_normal", "x": 270, "y": 270},
-    "facing=west,orientation=up,state=r": {"y": 270, "x": 270, "model": "computercraft:block/monitor_normal_r"},
+    "facing=west,orientation=up,state=r": {"model": "computercraft:block/monitor_normal_r", "x": 270, "y": 270},
-    "facing=west,orientation=up,state=rd": {"y": 270, "x": 270, "model": "computercraft:block/monitor_normal_rd"},
+    "facing=west,orientation=up,state=rd": {"model": "computercraft:block/monitor_normal_rd", "x": 270, "y": 270},
-    "facing=west,orientation=up,state=ru": {"y": 270, "x": 270, "model": "computercraft:block/monitor_normal_ru"},
+    "facing=west,orientation=up,state=ru": {"model": "computercraft:block/monitor_normal_ru", "x": 270, "y": 270},
-    "facing=west,orientation=up,state=rud": {"y": 270, "x": 270, "model": "computercraft:block/monitor_normal_rud"},
+    "facing=west,orientation=up,state=rud": {"model": "computercraft:block/monitor_normal_rud", "x": 270, "y": 270},
-    "facing=west,orientation=up,state=u": {"y": 270, "x": 270, "model": "computercraft:block/monitor_normal_u"},
+    "facing=west,orientation=up,state=u": {"model": "computercraft:block/monitor_normal_u", "x": 270, "y": 270},
-    "facing=west,orientation=up,state=ud": {"y": 270, "x": 270, "model": "computercraft:block/monitor_normal_ud"}
+    "facing=west,orientation=up,state=ud": {"model": "computercraft:block/monitor_normal_ud", "x": 270, "y": 270}
   }
-}
+}

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

@@ -1,20 +1,20 @@
 {
   "variants": {
-    "bottom=false,facing=east,top=false": {"y": 90, "model": "computercraft:block/printer_empty"},
+    "bottom=false,facing=east,top=false": {"model": "computercraft:block/printer_empty", "y": 90},
-    "bottom=false,facing=east,top=true": {"y": 90, "model": "computercraft:block/printer_top_full"},
+    "bottom=false,facing=east,top=true": {"model": "computercraft:block/printer_top_full", "y": 90},
-    "bottom=false,facing=north,top=false": {"y": 0, "model": "computercraft:block/printer_empty"},
+    "bottom=false,facing=north,top=false": {"model": "computercraft:block/printer_empty", "y": 0},
-    "bottom=false,facing=north,top=true": {"y": 0, "model": "computercraft:block/printer_top_full"},
+    "bottom=false,facing=north,top=true": {"model": "computercraft:block/printer_top_full", "y": 0},
-    "bottom=false,facing=south,top=false": {"y": 180, "model": "computercraft:block/printer_empty"},
+    "bottom=false,facing=south,top=false": {"model": "computercraft:block/printer_empty", "y": 180},
-    "bottom=false,facing=south,top=true": {"y": 180, "model": "computercraft:block/printer_top_full"},
+    "bottom=false,facing=south,top=true": {"model": "computercraft:block/printer_top_full", "y": 180},
-    "bottom=false,facing=west,top=false": {"y": 270, "model": "computercraft:block/printer_empty"},
+    "bottom=false,facing=west,top=false": {"model": "computercraft:block/printer_empty", "y": 270},
-    "bottom=false,facing=west,top=true": {"y": 270, "model": "computercraft:block/printer_top_full"},
+    "bottom=false,facing=west,top=true": {"model": "computercraft:block/printer_top_full", "y": 270},
-    "bottom=true,facing=east,top=false": {"y": 90, "model": "computercraft:block/printer_bottom_full"},
+    "bottom=true,facing=east,top=false": {"model": "computercraft:block/printer_bottom_full", "y": 90},
-    "bottom=true,facing=east,top=true": {"y": 90, "model": "computercraft:block/printer_both_full"},
+    "bottom=true,facing=east,top=true": {"model": "computercraft:block/printer_both_full", "y": 90},
-    "bottom=true,facing=north,top=false": {"y": 0, "model": "computercraft:block/printer_bottom_full"},
+    "bottom=true,facing=north,top=false": {"model": "computercraft:block/printer_bottom_full", "y": 0},
-    "bottom=true,facing=north,top=true": {"y": 0, "model": "computercraft:block/printer_both_full"},
+    "bottom=true,facing=north,top=true": {"model": "computercraft:block/printer_both_full", "y": 0},
-    "bottom=true,facing=south,top=false": {"y": 180, "model": "computercraft:block/printer_bottom_full"},
+    "bottom=true,facing=south,top=false": {"model": "computercraft:block/printer_bottom_full", "y": 180},
-    "bottom=true,facing=south,top=true": {"y": 180, "model": "computercraft:block/printer_both_full"},
+    "bottom=true,facing=south,top=true": {"model": "computercraft:block/printer_both_full", "y": 180},
-    "bottom=true,facing=west,top=false": {"y": 270, "model": "computercraft:block/printer_bottom_full"},
+    "bottom=true,facing=west,top=false": {"model": "computercraft:block/printer_bottom_full", "y": 270},
-    "bottom=true,facing=west,top=true": {"y": 270, "model": "computercraft:block/printer_both_full"}
+    "bottom=true,facing=west,top=true": {"model": "computercraft:block/printer_both_full", "y": 270}
   }
-}
+}

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

@@ -5,4 +5,4 @@
     "facing=south": {"model": "computercraft:block/speaker", "y": 180},
     "facing=west": {"model": "computercraft:block/speaker", "y": 270}
   }
-}
+}

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

@@ -5,4 +5,4 @@
     "facing=south": {"model": "computercraft:block/turtle_advanced", "y": 180},
     "facing=west": {"model": "computercraft:block/turtle_advanced", "y": 270}
   }
-}
+}

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

@@ -5,4 +5,4 @@
     "facing=south": {"model": "computercraft:block/turtle_normal", "y": 180},
     "facing=west": {"model": "computercraft:block/turtle_normal", "y": 270}
   }
-}
+}

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

@@ -5,4 +5,4 @@
     "modem=true,peripheral=false": {"model": "computercraft:block/wired_modem_full_on"},
     "modem=true,peripheral=true": {"model": "computercraft:block/wired_modem_full_on_peripheral"}
   }
-}
+}

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

@@ -1,16 +1,16 @@
 {
   "variants": {
-    "facing=down,on=false": {"y": 0, "x": 90, "model": "computercraft:block/wireless_modem_advanced_off"},
+    "facing=down,on=false": {"model": "computercraft:block/wireless_modem_advanced_off", "x": 90, "y": 0},
-    "facing=down,on=true": {"y": 0, "x": 90, "model": "computercraft:block/wireless_modem_advanced_on"},
+    "facing=down,on=true": {"model": "computercraft:block/wireless_modem_advanced_on", "x": 90, "y": 0},
-    "facing=east,on=false": {"y": 90, "x": 0, "model": "computercraft:block/wireless_modem_advanced_off"},
+    "facing=east,on=false": {"model": "computercraft:block/wireless_modem_advanced_off", "x": 0, "y": 90},
-    "facing=east,on=true": {"y": 90, "x": 0, "model": "computercraft:block/wireless_modem_advanced_on"},
+    "facing=east,on=true": {"model": "computercraft:block/wireless_modem_advanced_on", "x": 0, "y": 90},
-    "facing=north,on=false": {"y": 0, "x": 0, "model": "computercraft:block/wireless_modem_advanced_off"},
+    "facing=north,on=false": {"model": "computercraft:block/wireless_modem_advanced_off", "x": 0, "y": 0},
-    "facing=north,on=true": {"y": 0, "x": 0, "model": "computercraft:block/wireless_modem_advanced_on"},
+    "facing=north,on=true": {"model": "computercraft:block/wireless_modem_advanced_on", "x": 0, "y": 0},
-    "facing=south,on=false": {"y": 180, "x": 0, "model": "computercraft:block/wireless_modem_advanced_off"},
+    "facing=south,on=false": {"model": "computercraft:block/wireless_modem_advanced_off", "x": 0, "y": 180},
-    "facing=south,on=true": {"y": 180, "x": 0, "model": "computercraft:block/wireless_modem_advanced_on"},
+    "facing=south,on=true": {"model": "computercraft:block/wireless_modem_advanced_on", "x": 0, "y": 180},
-    "facing=up,on=false": {"y": 0, "x": 270, "model": "computercraft:block/wireless_modem_advanced_off"},
+    "facing=up,on=false": {"model": "computercraft:block/wireless_modem_advanced_off", "x": 270, "y": 0},
-    "facing=up,on=true": {"y": 0, "x": 270, "model": "computercraft:block/wireless_modem_advanced_on"},
+    "facing=up,on=true": {"model": "computercraft:block/wireless_modem_advanced_on", "x": 270, "y": 0},
-    "facing=west,on=false": {"y": 270, "x": 0, "model": "computercraft:block/wireless_modem_advanced_off"},
+    "facing=west,on=false": {"model": "computercraft:block/wireless_modem_advanced_off", "x": 0, "y": 270},
-    "facing=west,on=true": {"y": 270, "x": 0, "model": "computercraft:block/wireless_modem_advanced_on"}
+    "facing=west,on=true": {"model": "computercraft:block/wireless_modem_advanced_on", "x": 0, "y": 270}
   }
-}
+}

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

@@ -1,16 +1,16 @@
 {
   "variants": {
-    "facing=down,on=false": {"y": 0, "x": 90, "model": "computercraft:block/wireless_modem_normal_off"},
+    "facing=down,on=false": {"model": "computercraft:block/wireless_modem_normal_off", "x": 90, "y": 0},
-    "facing=down,on=true": {"y": 0, "x": 90, "model": "computercraft:block/wireless_modem_normal_on"},
+    "facing=down,on=true": {"model": "computercraft:block/wireless_modem_normal_on", "x": 90, "y": 0},
-    "facing=east,on=false": {"y": 90, "x": 0, "model": "computercraft:block/wireless_modem_normal_off"},
+    "facing=east,on=false": {"model": "computercraft:block/wireless_modem_normal_off", "x": 0, "y": 90},
-    "facing=east,on=true": {"y": 90, "x": 0, "model": "computercraft:block/wireless_modem_normal_on"},
+    "facing=east,on=true": {"model": "computercraft:block/wireless_modem_normal_on", "x": 0, "y": 90},
-    "facing=north,on=false": {"y": 0, "x": 0, "model": "computercraft:block/wireless_modem_normal_off"},
+    "facing=north,on=false": {"model": "computercraft:block/wireless_modem_normal_off", "x": 0, "y": 0},
-    "facing=north,on=true": {"y": 0, "x": 0, "model": "computercraft:block/wireless_modem_normal_on"},
+    "facing=north,on=true": {"model": "computercraft:block/wireless_modem_normal_on", "x": 0, "y": 0},
-    "facing=south,on=false": {"y": 180, "x": 0, "model": "computercraft:block/wireless_modem_normal_off"},
+    "facing=south,on=false": {"model": "computercraft:block/wireless_modem_normal_off", "x": 0, "y": 180},
-    "facing=south,on=true": {"y": 180, "x": 0, "model": "computercraft:block/wireless_modem_normal_on"},
+    "facing=south,on=true": {"model": "computercraft:block/wireless_modem_normal_on", "x": 0, "y": 180},
-    "facing=up,on=false": {"y": 0, "x": 270, "model": "computercraft:block/wireless_modem_normal_off"},
+    "facing=up,on=false": {"model": "computercraft:block/wireless_modem_normal_off", "x": 270, "y": 0},
-    "facing=up,on=true": {"y": 0, "x": 270, "model": "computercraft:block/wireless_modem_normal_on"},
+    "facing=up,on=true": {"model": "computercraft:block/wireless_modem_normal_on", "x": 270, "y": 0},
-    "facing=west,on=false": {"y": 270, "x": 0, "model": "computercraft:block/wireless_modem_normal_off"},
+    "facing=west,on=false": {"model": "computercraft:block/wireless_modem_normal_off", "x": 0, "y": 270},
-    "facing=west,on=true": {"y": 270, "x": 0, "model": "computercraft:block/wireless_modem_normal_on"}
+    "facing=west,on=true": {"model": "computercraft:block/wireless_modem_normal_on", "x": 0, "y": 270}
   }
-}
+}

src/generated/resources/assets/computercraft/models/block/computer_advanced_blinking.json

@@ -1,8 +1,8 @@
 {
   "parent": "minecraft:block/orientable",
   "textures": {
-    "top": "computercraft:block/computer_advanced_top",
     "front": "computercraft:block/computer_advanced_front_blink",
-    "side": "computercraft:block/computer_advanced_side"
+    "side": "computercraft:block/computer_advanced_side",
+    "top": "computercraft:block/computer_advanced_top"
   }
-}
+}

src/generated/resources/assets/computercraft/models/block/computer_advanced_off.json

@@ -1,8 +1,8 @@
 {
   "parent": "minecraft:block/orientable",
   "textures": {
-    "top": "computercraft:block/computer_advanced_top",
     "front": "computercraft:block/computer_advanced_front",
-    "side": "computercraft:block/computer_advanced_side"
+    "side": "computercraft:block/computer_advanced_side",
+    "top": "computercraft:block/computer_advanced_top"
   }
-}
+}

src/generated/resources/assets/computercraft/models/block/computer_advanced_on.json

@@ -1,8 +1,8 @@
 {
   "parent": "minecraft:block/orientable",
   "textures": {
-    "top": "computercraft:block/computer_advanced_top",
     "front": "computercraft:block/computer_advanced_front_on",
-    "side": "computercraft:block/computer_advanced_side"
+    "side": "computercraft:block/computer_advanced_side",
+    "top": "computercraft:block/computer_advanced_top"
   }
-}
+}

src/generated/resources/assets/computercraft/models/block/computer_command_blinking.json

@@ -1,8 +1,8 @@
 {
   "parent": "minecraft:block/orientable",
   "textures": {
-    "top": "computercraft:block/computer_command_top",
     "front": "computercraft:block/computer_command_front_blink",
-    "side": "computercraft:block/computer_command_side"
+    "side": "computercraft:block/computer_command_side",
+    "top": "computercraft:block/computer_command_top"
   }
-}
+}

src/generated/resources/assets/computercraft/models/block/computer_command_off.json

@@ -1,8 +1,8 @@
 {
   "parent": "minecraft:block/orientable",
   "textures": {
-    "top": "computercraft:block/computer_command_top",
     "front": "computercraft:block/computer_command_front",
-    "side": "computercraft:block/computer_command_side"
+    "side": "computercraft:block/computer_command_side",
+    "top": "computercraft:block/computer_command_top"
   }
-}
+}

src/generated/resources/assets/computercraft/models/block/computer_command_on.json

@@ -1,8 +1,8 @@
 {
   "parent": "minecraft:block/orientable",
   "textures": {
-    "top": "computercraft:block/computer_command_top",
     "front": "computercraft:block/computer_command_front_on",
-    "side": "computercraft:block/computer_command_side"
+    "side": "computercraft:block/computer_command_side",
+    "top": "computercraft:block/computer_command_top"
   }
-}
+}

src/generated/resources/assets/computercraft/models/block/computer_normal_blinking.json

@@ -1,8 +1,8 @@
 {
   "parent": "minecraft:block/orientable",
   "textures": {
-    "top": "computercraft:block/computer_normal_top",
     "front": "computercraft:block/computer_normal_front_blink",
-    "side": "computercraft:block/computer_normal_side"
+    "side": "computercraft:block/computer_normal_side",
+    "top": "computercraft:block/computer_normal_top"
   }
-}
+}

src/generated/resources/assets/computercraft/models/block/computer_normal_off.json

@@ -1,8 +1,8 @@
 {
   "parent": "minecraft:block/orientable",
   "textures": {
-    "top": "computercraft:block/computer_normal_top",
     "front": "computercraft:block/computer_normal_front",
-    "side": "computercraft:block/computer_normal_side"
+    "side": "computercraft:block/computer_normal_side",
+    "top": "computercraft:block/computer_normal_top"
   }
-}
+}

src/generated/resources/assets/computercraft/models/block/computer_normal_on.json

@@ -1,8 +1,8 @@
 {
   "parent": "minecraft:block/orientable",
   "textures": {
-    "top": "computercraft:block/computer_normal_top",
     "front": "computercraft:block/computer_normal_front_on",
-    "side": "computercraft:block/computer_normal_side"
+    "side": "computercraft:block/computer_normal_side",
+    "top": "computercraft:block/computer_normal_top"
   }
-}
+}

src/generated/resources/assets/computercraft/models/block/disk_drive_empty.json

@@ -1,8 +1,8 @@
 {
   "parent": "minecraft:block/orientable",
   "textures": {
-    "top": "computercraft:block/disk_drive_top",
     "front": "computercraft:block/disk_drive_front",
-    "side": "computercraft:block/disk_drive_side"
+    "side": "computercraft:block/disk_drive_side",
+    "top": "computercraft:block/disk_drive_top"
   }
-}
+}

src/generated/resources/assets/computercraft/models/block/disk_drive_full.json

@@ -1,8 +1,8 @@
 {
   "parent": "minecraft:block/orientable",
   "textures": {
-    "top": "computercraft:block/disk_drive_top",
     "front": "computercraft:block/disk_drive_front_accepted",
-    "side": "computercraft:block/disk_drive_side"
+    "side": "computercraft:block/disk_drive_side",
+    "top": "computercraft:block/disk_drive_top"
   }
-}
+}

src/generated/resources/assets/computercraft/models/block/disk_drive_invalid.json

@@ -1,8 +1,8 @@
 {
   "parent": "minecraft:block/orientable",
   "textures": {
-    "top": "computercraft:block/disk_drive_top",
     "front": "computercraft:block/disk_drive_front_rejected",
-    "side": "computercraft:block/disk_drive_side"
+    "side": "computercraft:block/disk_drive_side",
+    "top": "computercraft:block/disk_drive_top"
   }
-}
+}

src/generated/resources/assets/computercraft/models/block/monitor_advanced.json

@@ -1,9 +1,9 @@
 {
   "parent": "computercraft:block/monitor_base",
   "textures": {
+    "back": "computercraft:block/monitor_advanced_32",
     "front": "computercraft:block/monitor_advanced_16",
     "side": "computercraft:block/monitor_advanced_4",
-    "top": "computercraft:block/monitor_advanced_0",
+    "top": "computercraft:block/monitor_advanced_0"
-    "back": "computercraft:block/monitor_advanced_32"
   }
-}
+}

src/generated/resources/assets/computercraft/models/block/monitor_advanced_d.json

@@ -1,9 +1,9 @@
 {
   "parent": "computercraft:block/monitor_base",
   "textures": {
+    "back": "computercraft:block/monitor_advanced_36",
     "front": "computercraft:block/monitor_advanced_20",
     "side": "computercraft:block/monitor_advanced_7",
-    "top": "computercraft:block/monitor_advanced_0",
+    "top": "computercraft:block/monitor_advanced_0"
-    "back": "computercraft:block/monitor_advanced_36"
   }
-}
+}

src/generated/resources/assets/computercraft/models/block/monitor_advanced_item.json

@@ -1,9 +1,9 @@
 {
   "parent": "computercraft:block/monitor_base",
   "textures": {
+    "back": "computercraft:block/monitor_advanced_32",
     "front": "computercraft:block/monitor_advanced_15",
     "side": "computercraft:block/monitor_advanced_4",
-    "top": "computercraft:block/monitor_advanced_0",
+    "top": "computercraft:block/monitor_advanced_0"
-    "back": "computercraft:block/monitor_advanced_32"
   }
-}
+}

src/generated/resources/assets/computercraft/models/block/monitor_advanced_l.json

@@ -1,9 +1,9 @@
 {
   "parent": "computercraft:block/monitor_base",
   "textures": {
+    "back": "computercraft:block/monitor_advanced_33",
     "front": "computercraft:block/monitor_advanced_19",
     "side": "computercraft:block/monitor_advanced_4",
-    "top": "computercraft:block/monitor_advanced_1",
+    "top": "computercraft:block/monitor_advanced_1"
-    "back": "computercraft:block/monitor_advanced_33"
   }
-}
+}

src/generated/resources/assets/computercraft/models/block/monitor_advanced_ld.json

@@ -1,9 +1,9 @@
 {
   "parent": "computercraft:block/monitor_base",
   "textures": {
+    "back": "computercraft:block/monitor_advanced_45",
     "front": "computercraft:block/monitor_advanced_31",
     "side": "computercraft:block/monitor_advanced_7",
-    "top": "computercraft:block/monitor_advanced_1",
+    "top": "computercraft:block/monitor_advanced_1"
-    "back": "computercraft:block/monitor_advanced_45"
   }
-}
+}

src/generated/resources/assets/computercraft/models/block/monitor_advanced_lr.json

@@ -1,9 +1,9 @@
 {
   "parent": "computercraft:block/monitor_base",
   "textures": {
+    "back": "computercraft:block/monitor_advanced_34",
     "front": "computercraft:block/monitor_advanced_18",
     "side": "computercraft:block/monitor_advanced_4",
-    "top": "computercraft:block/monitor_advanced_2",
+    "top": "computercraft:block/monitor_advanced_2"
-    "back": "computercraft:block/monitor_advanced_34"
   }
-}
+}

src/generated/resources/assets/computercraft/models/block/monitor_advanced_lrd.json

@@ -1,9 +1,9 @@
 {
   "parent": "computercraft:block/monitor_base",
   "textures": {
+    "back": "computercraft:block/monitor_advanced_46",
     "front": "computercraft:block/monitor_advanced_30",
     "side": "computercraft:block/monitor_advanced_7",
-    "top": "computercraft:block/monitor_advanced_2",
+    "top": "computercraft:block/monitor_advanced_2"
-    "back": "computercraft:block/monitor_advanced_46"
   }
-}
+}

src/generated/resources/assets/computercraft/models/block/monitor_advanced_lru.json

@@ -1,9 +1,9 @@
 {
   "parent": "computercraft:block/monitor_base",
   "textures": {
+    "back": "computercraft:block/monitor_advanced_40",
     "front": "computercraft:block/monitor_advanced_24",
     "side": "computercraft:block/monitor_advanced_5",
-    "top": "computercraft:block/monitor_advanced_2",
+    "top": "computercraft:block/monitor_advanced_2"
-    "back": "computercraft:block/monitor_advanced_40"
   }
-}
+}

src/generated/resources/assets/computercraft/models/block/monitor_advanced_lrud.json

@@ -1,9 +1,9 @@
 {
   "parent": "computercraft:block/monitor_base",
   "textures": {
+    "back": "computercraft:block/monitor_advanced_43",
     "front": "computercraft:block/monitor_advanced_27",
     "side": "computercraft:block/monitor_advanced_6",
-    "top": "computercraft:block/monitor_advanced_2",
+    "top": "computercraft:block/monitor_advanced_2"
-    "back": "computercraft:block/monitor_advanced_43"
   }
-}
+}

src/generated/resources/assets/computercraft/models/block/monitor_advanced_lu.json

@@ -1,9 +1,9 @@
 {
   "parent": "computercraft:block/monitor_base",
   "textures": {
+    "back": "computercraft:block/monitor_advanced_39",
     "front": "computercraft:block/monitor_advanced_25",
     "side": "computercraft:block/monitor_advanced_5",
-    "top": "computercraft:block/monitor_advanced_1",
+    "top": "computercraft:block/monitor_advanced_1"
-    "back": "computercraft:block/monitor_advanced_39"
   }
-}
+}

src/generated/resources/assets/computercraft/models/block/monitor_advanced_lud.json

@@ -1,9 +1,9 @@
 {
   "parent": "computercraft:block/monitor_base",
   "textures": {
+    "back": "computercraft:block/monitor_advanced_42",
     "front": "computercraft:block/monitor_advanced_28",
     "side": "computercraft:block/monitor_advanced_6",
-    "top": "computercraft:block/monitor_advanced_1",
+    "top": "computercraft:block/monitor_advanced_1"
-    "back": "computercraft:block/monitor_advanced_42"
   }
-}
+}

src/generated/resources/assets/computercraft/models/block/monitor_advanced_r.json

@@ -1,9 +1,9 @@
 {
   "parent": "computercraft:block/monitor_base",
   "textures": {
+    "back": "computercraft:block/monitor_advanced_35",
     "front": "computercraft:block/monitor_advanced_17",
     "side": "computercraft:block/monitor_advanced_4",
-    "top": "computercraft:block/monitor_advanced_3",
+    "top": "computercraft:block/monitor_advanced_3"
-    "back": "computercraft:block/monitor_advanced_35"
   }
-}
+}

src/generated/resources/assets/computercraft/models/block/monitor_advanced_rd.json

@@ -1,9 +1,9 @@
 {
   "parent": "computercraft:block/monitor_base",
   "textures": {
+    "back": "computercraft:block/monitor_advanced_47",
     "front": "computercraft:block/monitor_advanced_29",
     "side": "computercraft:block/monitor_advanced_7",
-    "top": "computercraft:block/monitor_advanced_3",
+    "top": "computercraft:block/monitor_advanced_3"
-    "back": "computercraft:block/monitor_advanced_47"
   }
-}
+}

src/generated/resources/assets/computercraft/models/block/monitor_advanced_ru.json

@@ -1,9 +1,9 @@
 {
   "parent": "computercraft:block/monitor_base",
   "textures": {
+    "back": "computercraft:block/monitor_advanced_41",
     "front": "computercraft:block/monitor_advanced_23",
     "side": "computercraft:block/monitor_advanced_5",
-    "top": "computercraft:block/monitor_advanced_3",
+    "top": "computercraft:block/monitor_advanced_3"
-    "back": "computercraft:block/monitor_advanced_41"
   }
-}
+}

src/generated/resources/assets/computercraft/models/block/monitor_advanced_rud.json

@@ -1,9 +1,9 @@
 {
   "parent": "computercraft:block/monitor_base",
   "textures": {
+    "back": "computercraft:block/monitor_advanced_44",
     "front": "computercraft:block/monitor_advanced_26",
     "side": "computercraft:block/monitor_advanced_6",
-    "top": "computercraft:block/monitor_advanced_3",
+    "top": "computercraft:block/monitor_advanced_3"
-    "back": "computercraft:block/monitor_advanced_44"
   }
-}
+}

src/generated/resources/assets/computercraft/models/block/monitor_advanced_u.json

@@ -1,9 +1,9 @@
 {
   "parent": "computercraft:block/monitor_base",
   "textures": {
+    "back": "computercraft:block/monitor_advanced_38",
     "front": "computercraft:block/monitor_advanced_22",
     "side": "computercraft:block/monitor_advanced_5",
-    "top": "computercraft:block/monitor_advanced_0",
+    "top": "computercraft:block/monitor_advanced_0"
-    "back": "computercraft:block/monitor_advanced_38"
   }
-}
+}

src/generated/resources/assets/computercraft/models/block/monitor_advanced_ud.json

@@ -1,9 +1,9 @@
 {
   "parent": "computercraft:block/monitor_base",
   "textures": {
+    "back": "computercraft:block/monitor_advanced_37",
     "front": "computercraft:block/monitor_advanced_21",
     "side": "computercraft:block/monitor_advanced_6",
-    "top": "computercraft:block/monitor_advanced_0",
+    "top": "computercraft:block/monitor_advanced_0"
-    "back": "computercraft:block/monitor_advanced_37"
   }
-}
+}

src/generated/resources/assets/computercraft/models/block/monitor_normal.json

@@ -1,9 +1,9 @@
 {
   "parent": "computercraft:block/monitor_base",
   "textures": {
+    "back": "computercraft:block/monitor_normal_32",
     "front": "computercraft:block/monitor_normal_16",
     "side": "computercraft:block/monitor_normal_4",
-    "top": "computercraft:block/monitor_normal_0",
+    "top": "computercraft:block/monitor_normal_0"
-    "back": "computercraft:block/monitor_normal_32"
   }
-}
+}

src/generated/resources/assets/computercraft/models/block/monitor_normal_d.json

@@ -1,9 +1,9 @@
 {
   "parent": "computercraft:block/monitor_base",
   "textures": {
+    "back": "computercraft:block/monitor_normal_36",
     "front": "computercraft:block/monitor_normal_20",
     "side": "computercraft:block/monitor_normal_7",
-    "top": "computercraft:block/monitor_normal_0",
+    "top": "computercraft:block/monitor_normal_0"
-    "back": "computercraft:block/monitor_normal_36"
   }
-}
+}

src/generated/resources/assets/computercraft/models/block/monitor_normal_item.json

@@ -1,9 +1,9 @@
 {
   "parent": "computercraft:block/monitor_base",
   "textures": {
+    "back": "computercraft:block/monitor_normal_32",
     "front": "computercraft:block/monitor_normal_15",
     "side": "computercraft:block/monitor_normal_4",
-    "top": "computercraft:block/monitor_normal_0",
+    "top": "computercraft:block/monitor_normal_0"
-    "back": "computercraft:block/monitor_normal_32"
   }
-}
+}

src/generated/resources/assets/computercraft/models/block/monitor_normal_l.json

@@ -1,9 +1,9 @@
 {
   "parent": "computercraft:block/monitor_base",
   "textures": {
+    "back": "computercraft:block/monitor_normal_33",
     "front": "computercraft:block/monitor_normal_19",
     "side": "computercraft:block/monitor_normal_4",
-    "top": "computercraft:block/monitor_normal_1",
+    "top": "computercraft:block/monitor_normal_1"
-    "back": "computercraft:block/monitor_normal_33"
   }
-}
+}

src/generated/resources/assets/computercraft/models/block/monitor_normal_ld.json

@@ -1,9 +1,9 @@
 {
   "parent": "computercraft:block/monitor_base",
   "textures": {
+    "back": "computercraft:block/monitor_normal_45",
     "front": "computercraft:block/monitor_normal_31",
     "side": "computercraft:block/monitor_normal_7",
-    "top": "computercraft:block/monitor_normal_1",
+    "top": "computercraft:block/monitor_normal_1"
-    "back": "computercraft:block/monitor_normal_45"
   }
-}
+}

src/generated/resources/assets/computercraft/models/block/monitor_normal_lr.json

@@ -1,9 +1,9 @@
 {
   "parent": "computercraft:block/monitor_base",
   "textures": {
+    "back": "computercraft:block/monitor_normal_34",
     "front": "computercraft:block/monitor_normal_18",
     "side": "computercraft:block/monitor_normal_4",
-    "top": "computercraft:block/monitor_normal_2",
+    "top": "computercraft:block/monitor_normal_2"
-    "back": "computercraft:block/monitor_normal_34"
   }
-}
+}

src/generated/resources/assets/computercraft/models/block/monitor_normal_lrd.json

@@ -1,9 +1,9 @@
 {
   "parent": "computercraft:block/monitor_base",
   "textures": {
+    "back": "computercraft:block/monitor_normal_46",
     "front": "computercraft:block/monitor_normal_30",
     "side": "computercraft:block/monitor_normal_7",
-    "top": "computercraft:block/monitor_normal_2",
+    "top": "computercraft:block/monitor_normal_2"
-    "back": "computercraft:block/monitor_normal_46"
   }
-}
+}

src/generated/resources/assets/computercraft/models/block/monitor_normal_lru.json

@@ -1,9 +1,9 @@
 {
   "parent": "computercraft:block/monitor_base",
   "textures": {
+    "back": "computercraft:block/monitor_normal_40",
     "front": "computercraft:block/monitor_normal_24",
     "side": "computercraft:block/monitor_normal_5",
-    "top": "computercraft:block/monitor_normal_2",
+    "top": "computercraft:block/monitor_normal_2"
-    "back": "computercraft:block/monitor_normal_40"
   }
-}
+}

src/generated/resources/assets/computercraft/models/block/monitor_normal_lrud.json

@@ -1,9 +1,9 @@
 {
   "parent": "computercraft:block/monitor_base",
   "textures": {
+    "back": "computercraft:block/monitor_normal_43",
     "front": "computercraft:block/monitor_normal_27",
     "side": "computercraft:block/monitor_normal_6",
-    "top": "computercraft:block/monitor_normal_2",
+    "top": "computercraft:block/monitor_normal_2"
-    "back": "computercraft:block/monitor_normal_43"
   }
-}
+}

src/generated/resources/assets/computercraft/models/block/monitor_normal_lu.json

@@ -1,9 +1,9 @@
 {
   "parent": "computercraft:block/monitor_base",
   "textures": {
+    "back": "computercraft:block/monitor_normal_39",
     "front": "computercraft:block/monitor_normal_25",
     "side": "computercraft:block/monitor_normal_5",
-    "top": "computercraft:block/monitor_normal_1",
+    "top": "computercraft:block/monitor_normal_1"
-    "back": "computercraft:block/monitor_normal_39"
   }
-}
+}

src/generated/resources/assets/computercraft/models/block/monitor_normal_lud.json

@@ -1,9 +1,9 @@
 {
   "parent": "computercraft:block/monitor_base",
   "textures": {
+    "back": "computercraft:block/monitor_normal_42",
     "front": "computercraft:block/monitor_normal_28",
     "side": "computercraft:block/monitor_normal_6",
-    "top": "computercraft:block/monitor_normal_1",
+    "top": "computercraft:block/monitor_normal_1"
-    "back": "computercraft:block/monitor_normal_42"
   }
-}
+}

src/generated/resources/assets/computercraft/models/block/monitor_normal_r.json

@@ -1,9 +1,9 @@
 {
   "parent": "computercraft:block/monitor_base",
   "textures": {
+    "back": "computercraft:block/monitor_normal_35",
     "front": "computercraft:block/monitor_normal_17",
     "side": "computercraft:block/monitor_normal_4",
-    "top": "computercraft:block/monitor_normal_3",
+    "top": "computercraft:block/monitor_normal_3"
-    "back": "computercraft:block/monitor_normal_35"
   }
-}
+}

src/generated/resources/assets/computercraft/models/block/monitor_normal_rd.json

@@ -1,9 +1,9 @@
 {
   "parent": "computercraft:block/monitor_base",
   "textures": {
+    "back": "computercraft:block/monitor_normal_47",
     "front": "computercraft:block/monitor_normal_29",
     "side": "computercraft:block/monitor_normal_7",
-    "top": "computercraft:block/monitor_normal_3",
+    "top": "computercraft:block/monitor_normal_3"
-    "back": "computercraft:block/monitor_normal_47"
   }
-}
+}

src/generated/resources/assets/computercraft/models/block/monitor_normal_ru.json

@@ -1,9 +1,9 @@
 {
   "parent": "computercraft:block/monitor_base",
   "textures": {
+    "back": "computercraft:block/monitor_normal_41",
     "front": "computercraft:block/monitor_normal_23",
     "side": "computercraft:block/monitor_normal_5",
-    "top": "computercraft:block/monitor_normal_3",
+    "top": "computercraft:block/monitor_normal_3"
-    "back": "computercraft:block/monitor_normal_41"
   }
-}
+}

src/generated/resources/assets/computercraft/models/block/monitor_normal_rud.json

@@ -1,9 +1,9 @@
 {
   "parent": "computercraft:block/monitor_base",
   "textures": {
+    "back": "computercraft:block/monitor_normal_44",
     "front": "computercraft:block/monitor_normal_26",
     "side": "computercraft:block/monitor_normal_6",
-    "top": "computercraft:block/monitor_normal_3",
+    "top": "computercraft:block/monitor_normal_3"
-    "back": "computercraft:block/monitor_normal_44"
   }
-}
+}

src/generated/resources/assets/computercraft/models/block/monitor_normal_u.json

@@ -1,9 +1,9 @@
 {
   "parent": "computercraft:block/monitor_base",
   "textures": {
+    "back": "computercraft:block/monitor_normal_38",
     "front": "computercraft:block/monitor_normal_22",
     "side": "computercraft:block/monitor_normal_5",
-    "top": "computercraft:block/monitor_normal_0",
+    "top": "computercraft:block/monitor_normal_0"
-    "back": "computercraft:block/monitor_normal_38"
   }
-}
+}

src/generated/resources/assets/computercraft/models/block/monitor_normal_ud.json

@@ -1,9 +1,9 @@
 {
   "parent": "computercraft:block/monitor_base",
   "textures": {
+    "back": "computercraft:block/monitor_normal_37",
     "front": "computercraft:block/monitor_normal_21",
     "side": "computercraft:block/monitor_normal_6",
-    "top": "computercraft:block/monitor_normal_0",
+    "top": "computercraft:block/monitor_normal_0"
-    "back": "computercraft:block/monitor_normal_37"
   }
-}
+}

src/generated/resources/assets/computercraft/models/block/printer_both_full.json

@@ -1,8 +1,8 @@
 {
   "parent": "minecraft:block/orientable",
   "textures": {
-    "top": "computercraft:block/printer_top",
     "front": "computercraft:block/printer_front_both_trays",
-    "side": "computercraft:block/printer_side"
+    "side": "computercraft:block/printer_side",
+    "top": "computercraft:block/printer_top"
   }
-}
+}

src/generated/resources/assets/computercraft/models/block/printer_bottom_full.json

@@ -1,8 +1,8 @@
 {
   "parent": "minecraft:block/orientable",
   "textures": {
-    "top": "computercraft:block/printer_top",
     "front": "computercraft:block/printer_front_bottom_tray",
-    "side": "computercraft:block/printer_side"
+    "side": "computercraft:block/printer_side",
+    "top": "computercraft:block/printer_top"
   }
-}
+}

src/generated/resources/assets/computercraft/models/block/printer_empty.json

@@ -1,8 +1,8 @@
 {
   "parent": "minecraft:block/orientable",
   "textures": {
-    "top": "computercraft:block/printer_top",
     "front": "computercraft:block/printer_front_empty",
-    "side": "computercraft:block/printer_side"
+    "side": "computercraft:block/printer_side",
+    "top": "computercraft:block/printer_top"
   }
-}
+}

src/generated/resources/assets/computercraft/models/block/printer_top_full.json

@@ -1,8 +1,8 @@
 {
   "parent": "minecraft:block/orientable",
   "textures": {
-    "top": "computercraft:block/printer_top",
     "front": "computercraft:block/printer_front_top_tray",
-    "side": "computercraft:block/printer_side"
+    "side": "computercraft:block/printer_side",
+    "top": "computercraft:block/printer_top"
   }
-}
+}

src/generated/resources/assets/computercraft/models/block/speaker.json

@@ -1,8 +1,8 @@
 {
   "parent": "minecraft:block/orientable",
   "textures": {
-    "top": "computercraft:block/speaker_top",
     "front": "computercraft:block/speaker_front",
-    "side": "computercraft:block/speaker_side"
+    "side": "computercraft:block/speaker_side",
+    "top": "computercraft:block/speaker_top"
   }
-}
+}

src/generated/resources/assets/computercraft/models/block/turtle_advanced.json

@@ -1 +1 @@
-{"parent": "computercraft:block/turtle_base", "textures": {"texture": "computercraft:block/turtle_advanced"}}
+{"parent": "computercraft:block/turtle_base", "textures": {"texture": "computercraft:block/turtle_advanced"}}

src/generated/resources/assets/computercraft/models/block/turtle_crafting_table_left.json

@@ -1,4 +1,4 @@
 {
   "parent": "computercraft:block/turtle_upgrade_base_left",
   "textures": {"texture": "computercraft:block/turtle_crafty_face"}
-}
+}

src/generated/resources/assets/computercraft/models/block/turtle_crafting_table_right.json

@@ -1,4 +1,4 @@
 {
   "parent": "computercraft:block/turtle_upgrade_base_right",
   "textures": {"texture": "computercraft:block/turtle_crafty_face"}
-}
+}

src/generated/resources/assets/computercraft/models/block/turtle_modem_advanced_off_left.json

@@ -1,4 +1,4 @@
 {
   "parent": "computercraft:block/turtle_upgrade_base_left",
   "textures": {"texture": "computercraft:block/wireless_modem_advanced_face"}
-}
+}

src/generated/resources/assets/computercraft/models/block/turtle_modem_advanced_off_right.json

@@ -1,4 +1,4 @@
 {
   "parent": "computercraft:block/turtle_upgrade_base_right",
   "textures": {"texture": "computercraft:block/wireless_modem_advanced_face"}
-}
+}

src/generated/resources/assets/computercraft/models/block/turtle_modem_advanced_on_left.json

@@ -1,4 +1,4 @@
 {
   "parent": "computercraft:block/turtle_upgrade_base_left",
   "textures": {"texture": "computercraft:block/wireless_modem_advanced_face_on"}
-}
+}

src/generated/resources/assets/computercraft/models/block/turtle_modem_advanced_on_right.json

@@ -1,4 +1,4 @@
 {
   "parent": "computercraft:block/turtle_upgrade_base_right",
   "textures": {"texture": "computercraft:block/wireless_modem_advanced_face_on"}
-}
+}

src/generated/resources/assets/computercraft/models/block/turtle_modem_normal_off_left.json

@@ -1,4 +1,4 @@
 {
   "parent": "computercraft:block/turtle_upgrade_base_left",
   "textures": {"texture": "computercraft:block/wireless_modem_normal_face"}
-}
+}

src/generated/resources/assets/computercraft/models/block/turtle_modem_normal_off_right.json

@@ -1,4 +1,4 @@
 {
   "parent": "computercraft:block/turtle_upgrade_base_right",
   "textures": {"texture": "computercraft:block/wireless_modem_normal_face"}
-}
+}

src/generated/resources/assets/computercraft/models/block/turtle_modem_normal_on_left.json

@@ -1,4 +1,4 @@
 {
   "parent": "computercraft:block/turtle_upgrade_base_left",
   "textures": {"texture": "computercraft:block/wireless_modem_normal_face_on"}
-}
+}

src/generated/resources/assets/computercraft/models/block/turtle_modem_normal_on_right.json

@@ -1,4 +1,4 @@
 {
   "parent": "computercraft:block/turtle_upgrade_base_right",
   "textures": {"texture": "computercraft:block/wireless_modem_normal_face_on"}
-}
+}

src/generated/resources/assets/computercraft/models/block/turtle_normal.json

@@ -1 +1 @@
-{"parent": "computercraft:block/turtle_base", "textures": {"texture": "computercraft:block/turtle_normal"}}
+{"parent": "computercraft:block/turtle_base", "textures": {"texture": "computercraft:block/turtle_normal"}}

src/generated/resources/assets/computercraft/models/block/turtle_speaker_left.json

@@ -1,4 +1,4 @@
 {
   "parent": "computercraft:block/turtle_upgrade_base_left",
   "textures": {"texture": "computercraft:block/turtle_speaker_face"}
-}
+}

src/generated/resources/assets/computercraft/models/block/turtle_speaker_right.json

@@ -1,4 +1,4 @@
 {
   "parent": "computercraft:block/turtle_upgrade_base_right",
   "textures": {"texture": "computercraft:block/turtle_speaker_face"}
-}
+}

src/generated/resources/assets/computercraft/models/block/wired_modem_full_off.json

@@ -1 +1 @@
-{"parent": "minecraft:block/cube_all", "textures": {"all": "computercraft:block/wired_modem_face"}}
+{"parent": "minecraft:block/cube_all", "textures": {"all": "computercraft:block/wired_modem_face"}}

src/generated/resources/assets/computercraft/models/block/wired_modem_full_off_peripheral.json

@@ -1 +1 @@
-{"parent": "minecraft:block/cube_all", "textures": {"all": "computercraft:block/wired_modem_face_peripheral"}}
+{"parent": "minecraft:block/cube_all", "textures": {"all": "computercraft:block/wired_modem_face_peripheral"}}

src/generated/resources/assets/computercraft/models/block/wired_modem_full_on.json

@@ -1 +1 @@
-{"parent": "minecraft:block/cube_all", "textures": {"all": "computercraft:block/wired_modem_face_on"}}
+{"parent": "minecraft:block/cube_all", "textures": {"all": "computercraft:block/wired_modem_face_on"}}

src/generated/resources/assets/computercraft/models/block/wired_modem_full_on_peripheral.json

@@ -1 +1 @@
-{"parent": "minecraft:block/cube_all", "textures": {"all": "computercraft:block/wired_modem_face_peripheral_on"}}
+{"parent": "minecraft:block/cube_all", "textures": {"all": "computercraft:block/wired_modem_face_peripheral_on"}}

src/generated/resources/assets/computercraft/models/block/wired_modem_off.json

@@ -1,4 +1,4 @@
 {
   "parent": "computercraft:block/modem",
-  "textures": {"front": "computercraft:block/wired_modem_face", "back": "computercraft:block/modem_back"}
+  "textures": {"back": "computercraft:block/modem_back", "front": "computercraft:block/wired_modem_face"}
-}
+}

src/generated/resources/assets/computercraft/models/block/wired_modem_off_peripheral.json

@@ -1,4 +1,4 @@
 {
   "parent": "computercraft:block/modem",
-  "textures": {"front": "computercraft:block/wired_modem_face_peripheral", "back": "computercraft:block/modem_back"}
+  "textures": {"back": "computercraft:block/modem_back", "front": "computercraft:block/wired_modem_face_peripheral"}
-}
+}

src/generated/resources/assets/computercraft/models/block/wired_modem_on.json

@@ -1,4 +1,4 @@
 {
   "parent": "computercraft:block/modem",
-  "textures": {"front": "computercraft:block/wired_modem_face_on", "back": "computercraft:block/modem_back"}
+  "textures": {"back": "computercraft:block/modem_back", "front": "computercraft:block/wired_modem_face_on"}
-}
+}

src/generated/resources/assets/computercraft/models/block/wired_modem_on_peripheral.json

@@ -1,7 +1,7 @@
 {
   "parent": "computercraft:block/modem",
   "textures": {
-    "front": "computercraft:block/wired_modem_face_peripheral_on",
+    "back": "computercraft:block/modem_back",
-    "back": "computercraft:block/modem_back"
+    "front": "computercraft:block/wired_modem_face_peripheral_on"
   }
-}
+}

src/generated/resources/assets/computercraft/models/block/wireless_modem_advanced_off.json

@@ -1,4 +1,4 @@
 {
   "parent": "computercraft:block/modem",
-  "textures": {"front": "computercraft:block/wireless_modem_advanced_face", "back": "computercraft:block/modem_back"}
+  "textures": {"back": "computercraft:block/modem_back", "front": "computercraft:block/wireless_modem_advanced_face"}
-}
+}