From 632f04bb123f74f2b06702a875fa8e45c006887d Mon Sep 17 00:00:00 2001 From: EnderTurret <36442079+EnderTurret@users.noreply.github.com> Date: Tue, 26 Nov 2024 03:18:17 -0500 Subject: [PATCH 01/16] Update gradle. --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.jar | Bin 63721 -> 43583 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 7 +- gradlew.bat | 186 ++++++++++++----------- 5 files changed, 101 insertions(+), 96 deletions(-) mode change 100644 => 100755 gradlew diff --git a/build.gradle b/build.gradle index de3c856..2cd8c9e 100644 --- a/build.gradle +++ b/build.gradle @@ -29,7 +29,7 @@ version = "${mc_version}-${mod_version}-fusion" java.toolchain.languageVersion = JavaLanguageVersion.of(17) wrapper { - gradleVersion = '7.5.1' + gradleVersion = '8.10' distributionType = Wrapper.DistributionType.ALL } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7f93135c49b765f8051ef9d0a6055ff8e46073d8..a4b76b9530d66f5e68d973ea569d8e19de379189 100644 GIT binary patch literal 43583 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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 GZ~q4|mN%#X literal 63721 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鯊%1Et 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⁢ zv5o9#E7!G0XmdzfsS{efPNi`1b44~SZ4Z8fuX!I}#8g+(wxzQwUT#Xb2(tbY1+EUhGKoT@KEU9Ktl>_0 z%bjDJg;#*gtJZv!-Zs`?^}v5eKmnbjqlvnSzE@_SP|LG_PJ6CYU+6zY6>92%E+ z=j@TZf-iW4(%U{lnYxQA;7Q!b;^brF8n0D>)`q5>|WDDXLrqYU_tKN2>=#@~OE7grMnNh?UOz-O~6 z6%rHy{#h9K0AT+lDC7q4{hw^|q6*Ry;;L%Q@)Ga}$60_q%D)rv(CtS$CQbpq9|y1e zRSrN4;$Jyl{m5bZw`$8TGvb}(LpY{-cQ)fcyJv7l3S52TLXVDsphtv&aPuDk1OzCA z4A^QtC(!11`IsNx_HnSy?>EKpHJWT^wmS~hc^p^zIIh@9f6U@I2 zC=Mve{j2^)mS#U$e{@Q?SO6%LDsXz@SY+=cK_QMmXBIU)j!$ajc-zLx3V60EXJ!qC zi<%2x8Q24YN+&8U@CIlN zrZkcT9yh%LrlGS9`G)KdP(@9Eo-AQz@8GEFWcb7U=a0H^ZVbLmz{+&M7W(nXJ4sN8 zJLR7eeK(K8`2-}j(T7JsO`L!+CvbueT%izanm-^A1Dn{`1Nw`9P?cq;7no+XfC`K(GO9?O^5zNIt4M+M8LM0=7Gz8UA@Z0N+lg+cX)NfazRu z5D)~HA^(u%w^cz+@2@_#S|u>GpB+j4KzQ^&Wcl9f z&hG#bCA(Yk0D&t&aJE^xME^&E-&xGHhXn%}psEIj641H+Nl-}boj;)Zt*t(4wZ5DN z@GXF$bL=&pBq-#vkTkh>7hl%K5|3 z{`Vn9b$iR-SoGENp}bn4;fR3>9sA%X2@1L3aE9yTra;Wb#_`xWwLSLdfu+PAu+o3| zGVnpzPr=ch{uuoHjtw7+_!L_2;knQ!DuDl0R`|%jr+}jFzXtrHIKc323?JO{l&;VF z*L1+}JU7%QJOg|5|Tc|D8fN zJORAg=_vsy{ak|o);@)Yh8Lkcg@$FG3k@ep36BRa^>~UmnRPziS>Z=`Jb2x*Q#`%A zU*i3&Vg?TluO@X0O;r2Jl6LKLUOVhSqg1*qOt^|8*c7 zo(298@+r$k_wQNGHv{|$tW(T8L+4_`FQ{kEW5Jgg{yf7ey4ss_(SNKfz(N9lx&a;< je(UuV8hP?p&}TPdm1I$XmG#(RzlD&B2izSj9sl%y5~4qc diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7b8745f..9355b41 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 index 1aa94a4..f5feea6 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -55,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -84,7 +86,8 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/gradlew.bat b/gradlew.bat index 93e3f59..9b42019 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,92 +1,94 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%"=="" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%"=="" set DIRNAME=. -@rem This is normally unused -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if %ERRORLEVEL% equ 0 goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega From d4bf3a2334356f23194972c7a44b3a0ca2054ace Mon Sep 17 00:00:00 2001 From: EnderTurret <36442079+EnderTurret@users.noreply.github.com> Date: Tue, 26 Nov 2024 03:24:24 -0500 Subject: [PATCH 02/16] Set up ModDevGradle. --- build.gradle | 144 +++++++++++++--------------------------------- gradle.properties | 14 +++-- settings.gradle | 9 +-- 3 files changed, 50 insertions(+), 117 deletions(-) diff --git a/build.gradle b/build.gradle index 2cd8c9e..148d99f 100644 --- a/build.gradle +++ b/build.gradle @@ -1,124 +1,61 @@ -buildscript { - repositories { - maven { - name = "Minecraft Forge maven" - url = "https://maven.minecraftforge.net" - } - maven { - name = "Parchment maven" - url = "https://maven.parchmentmc.org" - } - mavenCentral() - } - dependencies { - classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true - classpath 'org.parchmentmc:librarian:1.+' - } -} - plugins { - id "maven-publish" + id 'maven-publish' + id 'net.neoforged.moddev' version '1.0.21' } -apply plugin: 'net.minecraftforge.gradle' -apply plugin: 'org.parchmentmc.librarian.forgegradle' - group = 'de.artemis.laboratoryblocks' version = "${mc_version}-${mod_version}-fusion" -java.toolchain.languageVersion = JavaLanguageVersion.of(17) +java.toolchain.languageVersion = JavaLanguageVersion.of(21) wrapper { gradleVersion = '8.10' distributionType = Wrapper.DistributionType.ALL } -minecraft { - mappings channel: "${mappings_channel}", version: "${mappings_version}" - - accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') - - runs { - client { - workingDirectory project.file('run') - property 'forge.logging.markers', 'REGISTRIES' - property 'forge.logging.console.level', 'debug' - property 'forge.enabledGameTestNamespaces', 'laboratoryblocks' - property 'mixin.env.remapRefMap', 'true' - property 'mixin.env.refMapRemappingFile', "${buildDir}/createSrgToMcp/output.srg" +sourceSets { + main.resources { + srcDir 'src/generated/resources' + } +} - args "--username", "ArtemisYouTube" - args "--uuid", "6611b78f-7fbb-4f41-801a-4e85fd0dca3c" +neoForge { + version = "${neoforge_version}" - mods { - laboratoryblocks { - source sourceSets.main - } - } + mods { + laboratoryblocks { + sourceSet sourceSets.main } + } - server { - workingDirectory project.file('server') - property 'forge.logging.markers', 'REGISTRIES' - property 'forge.logging.console.level', 'debug' - property 'forge.enabledGameTestNamespaces', 'laboratoryblocks' - property 'mixin.env.remapRefMap', 'true' - property 'mixin.env.refMapRemappingFile', "${buildDir}/createSrgToMcp/output.srg" + parchment { + minecraftVersion = "${parchment_mcversion}" + mappingsVersion = "${parchment_version}" + } - mods { - laboratoryblocks { - source sourceSets.main - } - } + runs { + client { + client() + ideName = 'runLaboratoryBlocksClient' + programArguments = ['--username', 'ArtemisYouTube', '--uuid', '6611b78f-7fbb-4f41-801a-4e85fd0dca3c'] } - gameTestServer { - workingDirectory project.file('run') - property 'forge.logging.markers', 'REGISTRIES' - property 'forge.logging.console.level', 'debug' - property 'forge.enabledGameTestNamespaces', 'laboratoryblocks' - property 'mixin.env.remapRefMap', 'true' - property 'mixin.env.refMapRemappingFile', "${buildDir}/createSrgToMcp/output.srg" - - mods { - laboratoryblocks { - source sourceSets.main - } - } + server { + server() + gameDirectory = project.file('server') + ideName = 'runLaboratoryBlocksServer' } data { - workingDirectory project.file('run') - property 'forge.logging.markers', 'REGISTRIES' - property 'forge.logging.console.level', 'debug' - property 'mixin.env.remapRefMap', 'true' - property 'mixin.env.refMapRemappingFile', "${buildDir}/createSrgToMcp/output.srg" - - args '--mod', 'laboratoryblocks', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/') - - mods { - laboratoryblocks { - source sourceSets.main - } - } + data() + ideName = 'runLaboratoryBlocksData' } } } -sourceSets { - main.resources { - srcDir 'src/generated/resources' - } - testMod {} -} - repositories { - flatDir { - dirs 'lib' - } - maven { - name = "Blamejared maven botania patchouli" + name = "Blamejared maven" url = 'https://maven.blamejared.com' } maven { @@ -133,17 +70,13 @@ repositories { name = "Modrinth" url = "https://api.modrinth.com/maven" } - maven { - url "https://cursemaven.com" - } } dependencies { - minecraft "net.minecraftforge:forge:${mc_version}-${forge_version}" - //JEI - runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}-forge:${jei_version}") + // JEI + runtimeOnly "mezz.jei:jei-${mc_version}-neoforge:${jei_version}" // Fusion - implementation fg.deobf("maven.modrinth:fusion-connected-textures:${fusion_version}-forge-mc${mc_version}") + implementation "maven.modrinth:fusion-connected-textures:${fusion_version}" } jar { @@ -154,15 +87,16 @@ jar { "Specification-Version" : "${mod_version}", "Implementation-Title" : project.name, "Implementation-Version" : project.jar.archiveVersion, - "Implementation-Vendor" : "Artemis", - "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") + "Implementation-Vendor" : "Artemis" ]) } } -jar.finalizedBy('reobfJar') - tasks.withType(JavaCompile).configureEach { - options.encoding = 'UTF-8' + options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation } +tasks.withType(AbstractArchiveTask).configureEach { + preserveFileTimestamps = false + reproducibleFileOrder = true +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 20c07ac..71d971d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,12 +1,14 @@ org.gradle.jvmargs=-Xmx4G org.gradle.daemon=false -forge_version=47.2.20 -mc_version=1.20.1 + +neoforge_version=21.1.72 +mc_version=1.21.1 mod_version=0.5r -mappings_channel=parchment -mappings_version=2023.07.16-1.20.1 -jei_version=15.2.0.23 -fusion_version=1.1.0b +parchment_mcversion=1.21 +parchment_version=2024.07.28 + +jei_version=19.21.0.247 +fusion_version=1.1.1a-neoforge-mc1.21 spaceUsername = Srendi # This is an access token with repo read permissions diff --git a/settings.gradle b/settings.gradle index 8f76a80..3895210 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,8 +1,5 @@ -pluginManagement { - repositories { - gradlePluginPortal() - maven { url = 'https://maven.minecraftforge.net/' } - } +plugins { + id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0' } -rootProject.name = 'laboratoryblocks' +rootProject.name = 'laboratoryblocks' \ No newline at end of file From 4926634f05f5cadb77394cad6eb76b27cbea0f42 Mon Sep 17 00:00:00 2001 From: EnderTurret <36442079+EnderTurret@users.noreply.github.com> Date: Tue, 26 Nov 2024 03:25:09 -0500 Subject: [PATCH 03/16] Clean up `.gitignore` and add Eclipse stuff to it. --- .gitignore | 79 +++++++----------------------------------------------- 1 file changed, 9 insertions(+), 70 deletions(-) diff --git a/.gitignore b/.gitignore index 41ca258..9434cea 100644 --- a/.gitignore +++ b/.gitignore @@ -1,73 +1,28 @@ -# User-specific stuff -.idea/ - +# IntelliJ *.iml *.ipr *.iws - -# IntelliJ +.idea/ out/ + # mpeltonen/sbt-idea plugin .idea_modules/ -# JIRA plugin -atlassian-ide-plugin.xml - -# Compiled class file -*.class - -# Log file -*.log - -# BlueJ files -*.ctxt - -# Package Files # -*.jar -*.war -*.nar -*.ear -*.zip -*.tar.gz -*.rar - -# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml -hs_err_pid* - -*~ - -# temporary files which can be created if a process still has a handle open of a deleted file -.fuse_hidden* - -# KDE directory preferences -.directory - -# Linux trash folder which might appear on any partition or disk -.Trash-* - -# .nfs files are created when an open file is removed but is still being accessed -.nfs* +# Eclipse +.project +.classpath +.settings/ +.eclipse/ +bin/ # General .DS_Store .AppleDouble .LSOverride -# Icon must end with two \r -Icon - # Thumbnails ._* -# Files that might appear in the root of a volume -.DocumentRevisions-V100 -.fseventsd -.Spotlight-V100 -.TemporaryItems -.Trashes -.VolumeIcon.icns -.com.apple.timemachine.donotpresent - # Directories potentially created on remote AFP share .AppleDB .AppleDesktop @@ -81,25 +36,12 @@ Thumbs.db:encryptable ehthumbs.db ehthumbs_vista.db -# Dump file -*.stackdump - # Folder config file [Dd]esktop.ini # Recycle Bin used on file shares $RECYCLE.BIN/ -# Windows Installer files -*.cab -*.msi -*.msix -*.msm -*.msp - -# Windows shortcuts -*.lnk - .gradle build/ @@ -115,6 +57,3 @@ gradle-app.setting run/ server/ -# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) -!gradle-wrapper.jar - From 6ba9efdb393ee16476dd30d78a9c8f4b1d53213d Mon Sep 17 00:00:00 2001 From: EnderTurret <36442079+EnderTurret@users.noreply.github.com> Date: Tue, 26 Nov 2024 03:28:53 -0500 Subject: [PATCH 04/16] Update mod metadata. --- .../{mods.toml => neoforge.mods.toml} | 22 +++++++++---------- src/main/resources/pack.mcmeta | 8 ------- 2 files changed, 11 insertions(+), 19 deletions(-) rename src/main/resources/META-INF/{mods.toml => neoforge.mods.toml} (72%) delete mode 100644 src/main/resources/pack.mcmeta diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/neoforge.mods.toml similarity index 72% rename from src/main/resources/META-INF/mods.toml rename to src/main/resources/META-INF/neoforge.mods.toml index da11376..caf1275 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/neoforge.mods.toml @@ -1,5 +1,5 @@ modLoader = "javafml" -loaderVersion = "[47,)" +loaderVersion = "[1,)" license = "GPL-2.0" [[mods]] modId = "laboratoryblocks" @@ -14,22 +14,22 @@ Get ready to upgrade your builds! This mod adds modern and futuristic looking la ''' [[dependencies.laboratoryblocks]] - modId = "forge" - mandatory = true - versionRange = "[47,)" + modId = "neoforge" + type = "required" + versionRange = "[21.0,21.2)" ordering = "NONE" side = "BOTH" [[dependencies.laboratoryblocks]] modId = "minecraft" - mandatory = true - versionRange = "[1.20.1,1.21)" + type = "required" + versionRange = "[1.21,1.21.2)" ordering = "NONE" side = "BOTH" [[dependencies.laboratoryblocks]] - modId="fusion" - mandatory=true - versionRange="[1.0.3,)" - ordering="NONE" - side="CLIENT" + modId = "fusion" + type = "required" + versionRange = "[1.0.3,)" + ordering = "NONE" + side = "CLIENT" diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta deleted file mode 100644 index f64ea04..0000000 --- a/src/main/resources/pack.mcmeta +++ /dev/null @@ -1,8 +0,0 @@ -{ - "pack": { - "description": "laboratoryblocks resources", - "pack_format": 9, - "forge:resource_pack_format": 9, - "forge:data_pack_format": 10 - } -} From d1bc270ee7d40e0fc94f537ed9c073d2c543ca6d Mon Sep 17 00:00:00 2001 From: EnderTurret <36442079+EnderTurret@users.noreply.github.com> Date: Tue, 26 Nov 2024 03:30:30 -0500 Subject: [PATCH 05/16] Move advancements and loot tables. --- .../{advancements => advancement}/glassworking.json | 0 .../{advancements => advancement}/i_have_spoken.json | 0 .../{advancements => advancement}/i_said_the_real_tile.json | 0 .../laboratoryblocks/{advancements => advancement}/ironworks.json | 0 .../laboratoryblocks/{advancements => advancement}/it_glows.json | 0 .../{advancements => advancement}/lab_assistant.json | 0 .../laboratoryblocks/{advancements => advancement}/librarian.json | 0 .../{advancements => advancement}/librarian_but_fancy.json | 0 .../{advancements => advancement}/perfection.json | 0 .../{advancements => advancement}/pla_enthusiast.json | 0 .../{advancements => advancement}/pla_master.json | 0 .../{advancements => advancement}/pla_tiling.json | 0 .../{advancements => advancement}/ready_for_work.json | 0 .../{advancements => advancement}/screen_time.json | 0 .../{advancements => advancement}/show_me_the_real_tile.json | 0 .../{advancements => advancement}/show_me_the_way.json | 0 .../{advancements => advancement}/this_is_the_way.json | 0 .../{advancements => advancement}/welcome_to_the_lab.json | 0 .../{advancements => advancement}/you_spin_me_round.json | 0 .../you_spin_me_round_in_controlled_manner.json | 0 .../blocks/chiseled_laboratory_bookshelf.json | 0 .../blocks/enlighted_chiseled_laboratory_bookshelf.json | 0 22 files changed, 0 insertions(+), 0 deletions(-) rename src/main/resources/data/laboratoryblocks/{advancements => advancement}/glassworking.json (100%) rename src/main/resources/data/laboratoryblocks/{advancements => advancement}/i_have_spoken.json (100%) rename src/main/resources/data/laboratoryblocks/{advancements => advancement}/i_said_the_real_tile.json (100%) rename src/main/resources/data/laboratoryblocks/{advancements => advancement}/ironworks.json (100%) rename src/main/resources/data/laboratoryblocks/{advancements => advancement}/it_glows.json (100%) rename src/main/resources/data/laboratoryblocks/{advancements => advancement}/lab_assistant.json (100%) rename src/main/resources/data/laboratoryblocks/{advancements => advancement}/librarian.json (100%) rename src/main/resources/data/laboratoryblocks/{advancements => advancement}/librarian_but_fancy.json (100%) rename src/main/resources/data/laboratoryblocks/{advancements => advancement}/perfection.json (100%) rename src/main/resources/data/laboratoryblocks/{advancements => advancement}/pla_enthusiast.json (100%) rename src/main/resources/data/laboratoryblocks/{advancements => advancement}/pla_master.json (100%) rename src/main/resources/data/laboratoryblocks/{advancements => advancement}/pla_tiling.json (100%) rename src/main/resources/data/laboratoryblocks/{advancements => advancement}/ready_for_work.json (100%) rename src/main/resources/data/laboratoryblocks/{advancements => advancement}/screen_time.json (100%) rename src/main/resources/data/laboratoryblocks/{advancements => advancement}/show_me_the_real_tile.json (100%) rename src/main/resources/data/laboratoryblocks/{advancements => advancement}/show_me_the_way.json (100%) rename src/main/resources/data/laboratoryblocks/{advancements => advancement}/this_is_the_way.json (100%) rename src/main/resources/data/laboratoryblocks/{advancements => advancement}/welcome_to_the_lab.json (100%) rename src/main/resources/data/laboratoryblocks/{advancements => advancement}/you_spin_me_round.json (100%) rename src/main/resources/data/laboratoryblocks/{advancements => advancement}/you_spin_me_round_in_controlled_manner.json (100%) rename src/main/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/chiseled_laboratory_bookshelf.json (100%) rename src/main/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/enlighted_chiseled_laboratory_bookshelf.json (100%) diff --git a/src/main/resources/data/laboratoryblocks/advancements/glassworking.json b/src/main/resources/data/laboratoryblocks/advancement/glassworking.json similarity index 100% rename from src/main/resources/data/laboratoryblocks/advancements/glassworking.json rename to src/main/resources/data/laboratoryblocks/advancement/glassworking.json diff --git a/src/main/resources/data/laboratoryblocks/advancements/i_have_spoken.json b/src/main/resources/data/laboratoryblocks/advancement/i_have_spoken.json similarity index 100% rename from src/main/resources/data/laboratoryblocks/advancements/i_have_spoken.json rename to src/main/resources/data/laboratoryblocks/advancement/i_have_spoken.json diff --git a/src/main/resources/data/laboratoryblocks/advancements/i_said_the_real_tile.json b/src/main/resources/data/laboratoryblocks/advancement/i_said_the_real_tile.json similarity index 100% rename from src/main/resources/data/laboratoryblocks/advancements/i_said_the_real_tile.json rename to src/main/resources/data/laboratoryblocks/advancement/i_said_the_real_tile.json diff --git a/src/main/resources/data/laboratoryblocks/advancements/ironworks.json b/src/main/resources/data/laboratoryblocks/advancement/ironworks.json similarity index 100% rename from src/main/resources/data/laboratoryblocks/advancements/ironworks.json rename to src/main/resources/data/laboratoryblocks/advancement/ironworks.json diff --git a/src/main/resources/data/laboratoryblocks/advancements/it_glows.json b/src/main/resources/data/laboratoryblocks/advancement/it_glows.json similarity index 100% rename from src/main/resources/data/laboratoryblocks/advancements/it_glows.json rename to src/main/resources/data/laboratoryblocks/advancement/it_glows.json diff --git a/src/main/resources/data/laboratoryblocks/advancements/lab_assistant.json b/src/main/resources/data/laboratoryblocks/advancement/lab_assistant.json similarity index 100% rename from src/main/resources/data/laboratoryblocks/advancements/lab_assistant.json rename to src/main/resources/data/laboratoryblocks/advancement/lab_assistant.json diff --git a/src/main/resources/data/laboratoryblocks/advancements/librarian.json b/src/main/resources/data/laboratoryblocks/advancement/librarian.json similarity index 100% rename from src/main/resources/data/laboratoryblocks/advancements/librarian.json rename to src/main/resources/data/laboratoryblocks/advancement/librarian.json diff --git a/src/main/resources/data/laboratoryblocks/advancements/librarian_but_fancy.json b/src/main/resources/data/laboratoryblocks/advancement/librarian_but_fancy.json similarity index 100% rename from src/main/resources/data/laboratoryblocks/advancements/librarian_but_fancy.json rename to src/main/resources/data/laboratoryblocks/advancement/librarian_but_fancy.json diff --git a/src/main/resources/data/laboratoryblocks/advancements/perfection.json b/src/main/resources/data/laboratoryblocks/advancement/perfection.json similarity index 100% rename from src/main/resources/data/laboratoryblocks/advancements/perfection.json rename to src/main/resources/data/laboratoryblocks/advancement/perfection.json diff --git a/src/main/resources/data/laboratoryblocks/advancements/pla_enthusiast.json b/src/main/resources/data/laboratoryblocks/advancement/pla_enthusiast.json similarity index 100% rename from src/main/resources/data/laboratoryblocks/advancements/pla_enthusiast.json rename to src/main/resources/data/laboratoryblocks/advancement/pla_enthusiast.json diff --git a/src/main/resources/data/laboratoryblocks/advancements/pla_master.json b/src/main/resources/data/laboratoryblocks/advancement/pla_master.json similarity index 100% rename from src/main/resources/data/laboratoryblocks/advancements/pla_master.json rename to src/main/resources/data/laboratoryblocks/advancement/pla_master.json diff --git a/src/main/resources/data/laboratoryblocks/advancements/pla_tiling.json b/src/main/resources/data/laboratoryblocks/advancement/pla_tiling.json similarity index 100% rename from src/main/resources/data/laboratoryblocks/advancements/pla_tiling.json rename to src/main/resources/data/laboratoryblocks/advancement/pla_tiling.json diff --git a/src/main/resources/data/laboratoryblocks/advancements/ready_for_work.json b/src/main/resources/data/laboratoryblocks/advancement/ready_for_work.json similarity index 100% rename from src/main/resources/data/laboratoryblocks/advancements/ready_for_work.json rename to src/main/resources/data/laboratoryblocks/advancement/ready_for_work.json diff --git a/src/main/resources/data/laboratoryblocks/advancements/screen_time.json b/src/main/resources/data/laboratoryblocks/advancement/screen_time.json similarity index 100% rename from src/main/resources/data/laboratoryblocks/advancements/screen_time.json rename to src/main/resources/data/laboratoryblocks/advancement/screen_time.json diff --git a/src/main/resources/data/laboratoryblocks/advancements/show_me_the_real_tile.json b/src/main/resources/data/laboratoryblocks/advancement/show_me_the_real_tile.json similarity index 100% rename from src/main/resources/data/laboratoryblocks/advancements/show_me_the_real_tile.json rename to src/main/resources/data/laboratoryblocks/advancement/show_me_the_real_tile.json diff --git a/src/main/resources/data/laboratoryblocks/advancements/show_me_the_way.json b/src/main/resources/data/laboratoryblocks/advancement/show_me_the_way.json similarity index 100% rename from src/main/resources/data/laboratoryblocks/advancements/show_me_the_way.json rename to src/main/resources/data/laboratoryblocks/advancement/show_me_the_way.json diff --git a/src/main/resources/data/laboratoryblocks/advancements/this_is_the_way.json b/src/main/resources/data/laboratoryblocks/advancement/this_is_the_way.json similarity index 100% rename from src/main/resources/data/laboratoryblocks/advancements/this_is_the_way.json rename to src/main/resources/data/laboratoryblocks/advancement/this_is_the_way.json diff --git a/src/main/resources/data/laboratoryblocks/advancements/welcome_to_the_lab.json b/src/main/resources/data/laboratoryblocks/advancement/welcome_to_the_lab.json similarity index 100% rename from src/main/resources/data/laboratoryblocks/advancements/welcome_to_the_lab.json rename to src/main/resources/data/laboratoryblocks/advancement/welcome_to_the_lab.json diff --git a/src/main/resources/data/laboratoryblocks/advancements/you_spin_me_round.json b/src/main/resources/data/laboratoryblocks/advancement/you_spin_me_round.json similarity index 100% rename from src/main/resources/data/laboratoryblocks/advancements/you_spin_me_round.json rename to src/main/resources/data/laboratoryblocks/advancement/you_spin_me_round.json diff --git a/src/main/resources/data/laboratoryblocks/advancements/you_spin_me_round_in_controlled_manner.json b/src/main/resources/data/laboratoryblocks/advancement/you_spin_me_round_in_controlled_manner.json similarity index 100% rename from src/main/resources/data/laboratoryblocks/advancements/you_spin_me_round_in_controlled_manner.json rename to src/main/resources/data/laboratoryblocks/advancement/you_spin_me_round_in_controlled_manner.json diff --git a/src/main/resources/data/laboratoryblocks/loot_tables/blocks/chiseled_laboratory_bookshelf.json b/src/main/resources/data/laboratoryblocks/loot_table/blocks/chiseled_laboratory_bookshelf.json similarity index 100% rename from src/main/resources/data/laboratoryblocks/loot_tables/blocks/chiseled_laboratory_bookshelf.json rename to src/main/resources/data/laboratoryblocks/loot_table/blocks/chiseled_laboratory_bookshelf.json diff --git a/src/main/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_chiseled_laboratory_bookshelf.json b/src/main/resources/data/laboratoryblocks/loot_table/blocks/enlighted_chiseled_laboratory_bookshelf.json similarity index 100% rename from src/main/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_chiseled_laboratory_bookshelf.json rename to src/main/resources/data/laboratoryblocks/loot_table/blocks/enlighted_chiseled_laboratory_bookshelf.json From 825895b12a93bad555dc2b577b9ab3ae490e8075 Mon Sep 17 00:00:00 2001 From: EnderTurret <36442079+EnderTurret@users.noreply.github.com> Date: Tue, 26 Nov 2024 04:20:31 -0500 Subject: [PATCH 06/16] Fix all compile errors. --- .../laboratoryblocks/InventoryTab.java | 11 +- .../laboratoryblocks/LaboratoryBlocks.java | 11 +- .../client/event/ClientEvents.java | 10 +- ...hiseledLaboratoryBookShelfBlockEntity.java | 154 +----- .../ChiseledLaboratoryBookShelfBlock.java | 100 +--- .../common/blocks/LaboratoryBlock.java | 16 +- .../common/blocks/LaboratoryCarpetBlock.java | 16 +- .../common/blocks/LaboratoryGlassBlock.java | 20 +- .../RedstoneControlledLaboratoryBlock.java | 23 +- .../common/data/BlockLootTables.java | 7 +- .../common/data/BlockLootTablesProvider.java | 14 +- .../common/data/DataProvider.java | 14 +- .../common/data/FusionModelProvider.java | 460 +++++++++--------- .../common/data/ItemModelProvider.java | 110 ++--- .../common/data/LanguageProvider.java | 2 +- .../data/ModelAndBlockStateProvider.java | 114 ++--- .../common/data/RecipesProvider.java | 11 +- .../common/data/TagsProvider.java | 8 +- .../common/event/ModEvents.java | 10 +- .../common/items/ConfigurationToolItem.java | 7 +- .../common/registration/ModBlockEntities.java | 5 +- .../common/registration/ModBlocks.java | 193 ++++---- .../registration/ModCreativeModeTabs.java | 4 +- .../common/registration/ModFoods.java | 2 +- .../common/registration/ModItems.java | 16 +- .../common/registration/ModKeyBindings.java | 4 +- .../common/registration/ModParticles.java | 9 +- .../common/registration/ModSoundEvents.java | 18 +- .../common/registration/ModSoundType.java | 5 +- .../common/registration/ModTags.java | 6 +- .../common/registration/Registration.java | 24 +- .../common/util/KeyBindingUtil.java | 2 +- 32 files changed, 582 insertions(+), 824 deletions(-) diff --git a/src/main/java/de/artemis/laboratoryblocks/InventoryTab.java b/src/main/java/de/artemis/laboratoryblocks/InventoryTab.java index a22043d..d1140ea 100644 --- a/src/main/java/de/artemis/laboratoryblocks/InventoryTab.java +++ b/src/main/java/de/artemis/laboratoryblocks/InventoryTab.java @@ -1,22 +1,19 @@ package de.artemis.laboratoryblocks; import de.artemis.laboratoryblocks.common.registration.ModBlocks; -import de.artemis.laboratoryblocks.common.registration.ModItems; +import de.artemis.laboratoryblocks.common.registration.Registration; import net.minecraft.network.chat.Component; import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.Item; - -import java.util.Arrays; +import net.neoforged.neoforge.registries.DeferredHolder; public class InventoryTab { public static void createInventoryTab(CreativeModeTab.Builder builder) { builder.displayItems((set, out) -> { - Item[] inventoryTabItems = { - ModItems.CONFIGURATION_TOOL.get(), ModItems.STARCH.get(), ModItems.COMPRESSED_STARCH.get(), ModItems.PLA_SHEETS.get(), ModItems.IRON_SCREW.get(), ModItems.GLOWSTONE_PARTICLES.get(), ModItems.REDSTONE_PARTICLES.get(), ModBlocks.PLA_BLOCK.get().asItem(), ModBlocks.ENLIGHTED_PLA_BLOCK.get().asItem(), ModBlocks.PLA_TILES.get().asItem(), ModBlocks.ENLIGHTED_PLA_TILES.get().asItem(), ModBlocks.PLA_FLOORING.get().asItem(), ModBlocks.ENLIGHTED_PLA_FLOORING.get().asItem(), ModBlocks.TILED_PLA_FLOORING.get().asItem(), ModBlocks.ENLIGHTED_TILED_PLA_FLOORING.get().asItem(), ModBlocks.LABORATORY_BLOCK.get().asItem(), ModBlocks.ENLIGHTED_LABORATORY_BLOCK.get().asItem(), ModBlocks.SCREWED_LABORATORY_BLOCK.get().asItem(), ModBlocks.ENLIGHTED_SCREWED_LABORATORY_BLOCK.get().asItem(), ModBlocks.LABORATORY_TILES.get().asItem(), ModBlocks.ENLIGHTED_LABORATORY_TILES.get().asItem(), ModBlocks.GRAY_LABORATORY_TILES.get().asItem(), ModBlocks.ENLIGHTED_GRAY_LABORATORY_TILES.get().asItem(), ModBlocks.MIXED_LABORATORY_TILES.get().asItem(), ModBlocks.ENLIGHTED_MIXED_LABORATORY_TILES.get().asItem(), ModBlocks.OAK_LABORATORY_TILES.get().asItem(), ModBlocks.ENLIGHTED_OAK_LABORATORY_TILES.get().asItem(), ModBlocks.SPRUCE_LABORATORY_TILES.get().asItem(), ModBlocks.ENLIGHTED_SPRUCE_LABORATORY_TILES.get().asItem(), ModBlocks.BIRCH_LABORATORY_TILES.get().asItem(), ModBlocks.ENLIGHTED_BIRCH_LABORATORY_TILES.get().asItem(), ModBlocks.DARK_OAK_LABORATORY_TILES.get().asItem(), ModBlocks.ENLIGHTED_DARK_OAK_LABORATORY_TILES.get().asItem(), ModBlocks.JUNGLE_LABORATORY_TILES.get().asItem(), ModBlocks.ENLIGHTED_JUNGLE_LABORATORY_TILES.get().asItem(), ModBlocks.ACACIA_LABORATORY_TILES.get().asItem(), ModBlocks.ENLIGHTED_ACACIA_LABORATORY_TILES.get().asItem(), ModBlocks.MANGROVE_LABORATORY_TILES.get().asItem(), ModBlocks.ENLIGHTED_MANGROVE_LABORATORY_TILES.get().asItem(), ModBlocks.CHERRY_LABORATORY_TILES.get().asItem(), ModBlocks.ENLIGHTED_CHERRY_LABORATORY_TILES.get().asItem(), ModBlocks.BAMBOO_LABORATORY_TILES.get().asItem(), ModBlocks.ENLIGHTED_BAMBOO_LABORATORY_TILES.get().asItem(), ModBlocks.CRIMSON_LABORATORY_TILES.get().asItem(), ModBlocks.ENLIGHTED_CRIMSON_LABORATORY_TILES.get().asItem(), ModBlocks.WARPED_LABORATORY_TILES.get().asItem(), ModBlocks.ENLIGHTED_WARPED_LABORATORY_TILES.get().asItem(), ModBlocks.OAK_LABORATORY_FLOOR.get().asItem(), ModBlocks.ENLIGHTED_OAK_LABORATORY_FLOOR.get().asItem(), ModBlocks.SPRUCE_LABORATORY_FLOOR.get().asItem(), ModBlocks.ENLIGHTED_SPRUCE_LABORATORY_FLOOR.get().asItem(), ModBlocks.BIRCH_LABORATORY_FLOOR.get().asItem(), ModBlocks.ENLIGHTED_BIRCH_LABORATORY_FLOOR.get().asItem(), ModBlocks.DARK_OAK_LABORATORY_FLOOR.get().asItem(), ModBlocks.ENLIGHTED_DARK_OAK_LABORATORY_FLOOR.get().asItem(), ModBlocks.JUNGLE_LABORATORY_FLOOR.get().asItem(), ModBlocks.ENLIGHTED_JUNGLE_LABORATORY_FLOOR.get().asItem(), ModBlocks.ACACIA_LABORATORY_FLOOR.get().asItem(), ModBlocks.ENLIGHTED_ACACIA_LABORATORY_FLOOR.get().asItem(), ModBlocks.MANGROVE_LABORATORY_FLOOR.get().asItem(), ModBlocks.ENLIGHTED_MANGROVE_LABORATORY_FLOOR.get().asItem(), ModBlocks.CHERRY_LABORATORY_FLOOR.get().asItem(), ModBlocks.ENLIGHTED_CHERRY_LABORATORY_FLOOR.get().asItem(), ModBlocks.BAMBOO_LABORATORY_FLOOR.get().asItem(), ModBlocks.ENLIGHTED_BAMBOO_LABORATORY_FLOOR.get().asItem(), ModBlocks.CRIMSON_LABORATORY_FLOOR.get().asItem(), ModBlocks.ENLIGHTED_CRIMSON_LABORATORY_FLOOR.get().asItem(), ModBlocks.WARPED_LABORATORY_FLOOR.get().asItem(), ModBlocks.ENLIGHTED_WARPED_LABORATORY_FLOOR.get().asItem(), ModBlocks.LABORATORY_GLASS.get().asItem(), ModBlocks.ENLIGHTED_LABORATORY_GLASS.get().asItem(), ModBlocks.LABORATORY_BOOKSHELF.get().asItem(), ModBlocks.ENLIGHTED_LABORATORY_BOOKSHELF.get().asItem(), ModBlocks.CHISELED_LABORATORY_BOOKSHELF.get().asItem(), ModBlocks.ENLIGHTED_CHISELED_LABORATORY_BOOKSHELF.get().asItem(), ModBlocks.LABORATORY_VENT.get().asItem(), ModBlocks.ENLIGHTED_LABORATORY_VENT.get().asItem(), ModBlocks.LABORATORY_VENT_CONNECTING.get().asItem(), ModBlocks.ENLIGHTED_LABORATORY_VENT_CONNECTING.get().asItem(), ModBlocks.LEFT_FACED_BLUE_SIGNALING_LABORATORY_BLOCK.get().asItem(), ModBlocks.ENLIGHTED_LEFT_FACED_BLUE_SIGNALING_LABORATORY_BLOCK.get().asItem(), ModBlocks.RIGHT_FACED_BLUE_SIGNALING_LABORATORY_BLOCK.get().asItem(), ModBlocks.ENLIGHTED_RIGHT_FACED_BLUE_SIGNALING_LABORATORY_BLOCK.get().asItem(), ModBlocks.LEFT_FACED_RED_SIGNALING_LABORATORY_BLOCK.get().asItem(), ModBlocks.ENLIGHTED_LEFT_FACED_RED_SIGNALING_LABORATORY_BLOCK.get().asItem(), ModBlocks.RIGHT_FACED_RED_SIGNALING_LABORATORY_BLOCK.get().asItem(), ModBlocks.ENLIGHTED_RIGHT_FACED_RED_SIGNALING_LABORATORY_BLOCK.get().asItem(), ModBlocks.LEFT_FACED_GREEN_SIGNALING_LABORATORY_BLOCK.get().asItem(), ModBlocks.ENLIGHTED_LEFT_FACED_GREEN_SIGNALING_LABORATORY_BLOCK.get().asItem(), ModBlocks.RIGHT_FACED_GREEN_SIGNALING_LABORATORY_BLOCK.get().asItem(), ModBlocks.ENLIGHTED_RIGHT_FACED_GREEN_SIGNALING_LABORATORY_BLOCK.get().asItem(), ModBlocks.LABORATORY_FAN.get().asItem(), ModBlocks.ENLIGHTED_LABORATORY_FAN.get().asItem(), ModBlocks.LABORATORY_FAN_REDSTONE_CONTROLLED.get().asItem(), ModBlocks.ENLIGHTED_LABORATORY_FAN_REDSTONE_CONTROLLED.get().asItem(), ModBlocks.CLEAR_LABORATORY_SCREEN.get().asItem(), ModBlocks.ENLIGHTED_CLEAR_LABORATORY_SCREEN.get().asItem(), ModBlocks.LABORATORY_PILLAR.get().asItem(), ModBlocks.ENLIGHTED_LABORATORY_PILLAR.get().asItem(), ModBlocks.GRAY_LABORATORY_PILLAR.get().asItem(), ModBlocks.ENLIGHTED_GRAY_LABORATORY_PILLAR.get().asItem() - }; - Arrays.stream(inventoryTabItems).forEach(out::accept); + out.acceptAll(Registration.ITEMS.getEntries().stream().map(DeferredHolder::value).map(Item::getDefaultInstance).toList()); + //out.acceptAll(Registration.BLOCKS.getEntries().stream().map(DeferredHolder::value).map(Block::asItem).map(Item::getDefaultInstance).toList()); }); builder.icon(() -> ModBlocks.LABORATORY_BLOCK.get().asItem().getDefaultInstance()); diff --git a/src/main/java/de/artemis/laboratoryblocks/LaboratoryBlocks.java b/src/main/java/de/artemis/laboratoryblocks/LaboratoryBlocks.java index 4cea89d..0134e50 100644 --- a/src/main/java/de/artemis/laboratoryblocks/LaboratoryBlocks.java +++ b/src/main/java/de/artemis/laboratoryblocks/LaboratoryBlocks.java @@ -1,18 +1,15 @@ package de.artemis.laboratoryblocks; -import com.mojang.logging.LogUtils; import de.artemis.laboratoryblocks.common.registration.Registration; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fml.common.Mod; -import org.slf4j.Logger; +import net.neoforged.bus.api.IEventBus; +import net.neoforged.fml.common.Mod; @Mod(LaboratoryBlocks.MOD_ID) public class LaboratoryBlocks { public static final String MOD_ID = "laboratoryblocks"; - public LaboratoryBlocks() { - MinecraftForge.EVENT_BUS.register(this); - Registration.register(); + public LaboratoryBlocks(IEventBus modBus) { + Registration.register(modBus); } } \ No newline at end of file diff --git a/src/main/java/de/artemis/laboratoryblocks/client/event/ClientEvents.java b/src/main/java/de/artemis/laboratoryblocks/client/event/ClientEvents.java index cb043ca..4fc09b3 100644 --- a/src/main/java/de/artemis/laboratoryblocks/client/event/ClientEvents.java +++ b/src/main/java/de/artemis/laboratoryblocks/client/event/ClientEvents.java @@ -2,12 +2,12 @@ import de.artemis.laboratoryblocks.LaboratoryBlocks; import de.artemis.laboratoryblocks.common.registration.ModKeyBindings; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.client.event.RegisterKeyMappingsEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; +import net.neoforged.api.distmarker.Dist; +import net.neoforged.bus.api.SubscribeEvent; +import net.neoforged.fml.common.EventBusSubscriber; +import net.neoforged.neoforge.client.event.RegisterKeyMappingsEvent; -@Mod.EventBusSubscriber(modid = LaboratoryBlocks.MOD_ID, value = Dist.CLIENT, bus = Mod.EventBusSubscriber.Bus.MOD) +@EventBusSubscriber(modid = LaboratoryBlocks.MOD_ID, value = Dist.CLIENT, bus = EventBusSubscriber.Bus.MOD) public class ClientEvents { @SubscribeEvent diff --git a/src/main/java/de/artemis/laboratoryblocks/common/blockentities/ChiseledLaboratoryBookShelfBlockEntity.java b/src/main/java/de/artemis/laboratoryblocks/common/blockentities/ChiseledLaboratoryBookShelfBlockEntity.java index a616362..7ebdb0e 100644 --- a/src/main/java/de/artemis/laboratoryblocks/common/blockentities/ChiseledLaboratoryBookShelfBlockEntity.java +++ b/src/main/java/de/artemis/laboratoryblocks/common/blockentities/ChiseledLaboratoryBookShelfBlockEntity.java @@ -1,158 +1,20 @@ package de.artemis.laboratoryblocks.common.blockentities; -import com.mojang.logging.LogUtils; -import de.artemis.laboratoryblocks.common.blocks.ChiseledLaboratoryBookShelfBlock; import de.artemis.laboratoryblocks.common.registration.ModBlockEntities; import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.core.NonNullList; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.tags.ItemTags; import net.minecraft.world.Container; -import net.minecraft.world.ContainerHelper; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.entity.ChiseledBookShelfBlockEntity; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.state.properties.BooleanProperty; -import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.common.capabilities.ForgeCapabilities; -import net.minecraftforge.common.util.LazyOptional; -import net.minecraftforge.items.IItemHandler; -import net.minecraftforge.items.wrapper.InvWrapper; -import org.jetbrains.annotations.Nullable; -import org.slf4j.Logger; -import java.util.Objects; -import java.util.function.Predicate; - -public class ChiseledLaboratoryBookShelfBlockEntity extends BlockEntity implements Container { - public static final int MAX_BOOKS_IN_STORAGE = 6; - private static final Logger LOGGER = LogUtils.getLogger(); - private final NonNullList items; - private int lastInteractedSlot; - private LazyOptional itemHandler; +public class ChiseledLaboratoryBookShelfBlockEntity extends ChiseledBookShelfBlockEntity implements Container { public ChiseledLaboratoryBookShelfBlockEntity(BlockPos blockPos, BlockState blockState) { - super(ModBlockEntities.CHISELED_LABORATORY_BOOKSHELF_BLOCK_ENTITY.get(), blockPos, blockState); - this.items = NonNullList.withSize(6, ItemStack.EMPTY); - this.lastInteractedSlot = -1; - this.itemHandler = LazyOptional.of(this::createUnSidedHandler); - } - - private void updateState(int slot) { - if (slot >= 0 && slot < 6) { - this.lastInteractedSlot = slot; - BlockState blockstate = this.getBlockState(); - - for(int i = 0; i < ChiseledLaboratoryBookShelfBlock.SLOT_OCCUPIED_PROPERTIES.size(); ++i) { - boolean flag = !this.getItem(i).isEmpty(); - BooleanProperty booleanproperty = (BooleanProperty)ChiseledLaboratoryBookShelfBlock.SLOT_OCCUPIED_PROPERTIES.get(i); - blockstate = (BlockState)blockstate.setValue(booleanproperty, flag); - } - - ((Level)Objects.requireNonNull(this.level)).setBlock(this.worldPosition, blockstate, 3); - } else { - LOGGER.error("Expected slot 0-5, got {}", slot); - } - - } - - public void load(CompoundTag pTag) { - this.items.clear(); - ContainerHelper.loadAllItems(pTag, this.items); - this.lastInteractedSlot = pTag.getInt("last_interacted_slot"); - } - - protected void saveAdditional(CompoundTag pTag) { - ContainerHelper.saveAllItems(pTag, this.items, true); - pTag.putInt("last_interacted_slot", this.lastInteractedSlot); - } - - public int count() { - return (int)this.items.stream().filter(Predicate.not(ItemStack::isEmpty)).count(); - } - - public void clearContent() { - this.items.clear(); - } - - public int getContainerSize() { - return 6; - } - - public boolean isEmpty() { - return this.items.stream().allMatch(ItemStack::isEmpty); - } - - public ItemStack getItem(int pSlot) { - return (ItemStack)this.items.get(pSlot); - } - - public ItemStack removeItem(int pSlot, int pAmount) { - ItemStack itemstack = (ItemStack)Objects.requireNonNullElse((ItemStack)this.items.get(pSlot), ItemStack.EMPTY); - this.items.set(pSlot, ItemStack.EMPTY); - if (!itemstack.isEmpty()) { - this.updateState(pSlot); - } - - return itemstack; + super(blockPos, blockState); } - - public ItemStack removeItemNoUpdate(int pSlot) { - return this.removeItem(pSlot, 1); - } - - public void setItem(int pSlot, ItemStack pStack) { - if (pStack.is(ItemTags.BOOKSHELF_BOOKS)) { - this.items.set(pSlot, pStack); - this.updateState(pSlot); - } - - } - - public boolean canTakeItem(Container pTarget, int pIndex, ItemStack pStack) { - return pTarget.hasAnyMatching((p_281577_) -> { - if (p_281577_.isEmpty()) { - return true; - } else { - return ItemStack.isSameItemSameTags(pStack, p_281577_) && p_281577_.getCount() + pStack.getCount() <= Math.min(p_281577_.getMaxStackSize(), pTarget.getMaxStackSize()); - } - }); - } - - public int getMaxStackSize() { - return 1; - } - - public boolean stillValid(Player pPlayer) { - return Container.stillValidBlockEntity(this, pPlayer); - } - - public boolean canPlaceItem(int pIndex, ItemStack pStack) { - return pStack.is(ItemTags.BOOKSHELF_BOOKS) && this.getItem(pIndex).isEmpty(); - } - - public int getLastInteractedSlot() { - return this.lastInteractedSlot; - } - - protected IItemHandler createUnSidedHandler() { - return new InvWrapper(this); - } - - public LazyOptional getCapability(Capability cap, @Nullable Direction side) { - return !this.remove && cap == ForgeCapabilities.ITEM_HANDLER ? this.itemHandler.cast() : super.getCapability(cap, side); - } - - public void invalidateCaps() { - super.invalidateCaps(); - this.itemHandler.invalidate(); - } - - public void reviveCaps() { - super.reviveCaps(); - this.itemHandler = LazyOptional.of(this::createUnSidedHandler); + + @Override + public BlockEntityType getType() { + return ModBlockEntities.CHISELED_LABORATORY_BOOKSHELF_BLOCK_ENTITY.get(); } } diff --git a/src/main/java/de/artemis/laboratoryblocks/common/blocks/ChiseledLaboratoryBookShelfBlock.java b/src/main/java/de/artemis/laboratoryblocks/common/blocks/ChiseledLaboratoryBookShelfBlock.java index 8dba45a..1fbcd8e 100644 --- a/src/main/java/de/artemis/laboratoryblocks/common/blocks/ChiseledLaboratoryBookShelfBlock.java +++ b/src/main/java/de/artemis/laboratoryblocks/common/blocks/ChiseledLaboratoryBookShelfBlock.java @@ -1,41 +1,26 @@ package de.artemis.laboratoryblocks.common.blocks; import de.artemis.laboratoryblocks.common.blockentities.ChiseledLaboratoryBookShelfBlockEntity; -import de.artemis.laboratoryblocks.common.registration.ModItems; -import de.artemis.laboratoryblocks.common.registration.ModKeyBindings; -import de.artemis.laboratoryblocks.common.registration.ModParticles; -import de.artemis.laboratoryblocks.common.util.KeyBindingUtil; import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; import net.minecraft.sounds.SoundEvent; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; import net.minecraft.stats.Stats; -import net.minecraft.tags.ItemTags; -import net.minecraft.util.RandomSource; import net.minecraft.world.Containers; import net.minecraft.world.InteractionHand; -import net.minecraft.world.InteractionResult; -import net.minecraft.world.entity.item.ItemEntity; +import net.minecraft.world.ItemInteractionResult; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.ChiseledBookShelfBlock; -import net.minecraft.world.level.block.HorizontalDirectionalBlock; import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.block.entity.ChiseledBookShelfBlockEntity; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.state.properties.BlockStateProperties; -import net.minecraft.world.level.block.state.properties.Property; import net.minecraft.world.level.gameevent.GameEvent; import net.minecraft.world.phys.BlockHitResult; -import net.minecraft.world.phys.Vec2; -import net.minecraft.world.phys.Vec3; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.Optional; import java.util.function.Supplier; public class ChiseledLaboratoryBookShelfBlock extends ChiseledBookShelfBlock { @@ -47,34 +32,14 @@ public ChiseledLaboratoryBookShelfBlock(Supplier getRelativeHitCoordinatesForBlockFace(BlockHitResult blockHitResult, Direction direction) { - Direction blockHitResultDirection = blockHitResult.getDirection(); - if (direction != blockHitResultDirection) { - return Optional.empty(); - } else { - BlockPos blockPos = blockHitResult.getBlockPos().relative(blockHitResultDirection); - Vec3 vec3 = blockHitResult.getLocation().subtract((double) blockPos.getX(), (double) blockPos.getY(), (double) blockPos.getZ()); - double x = vec3.x(); - double y = vec3.y(); - double z = vec3.z(); - Optional optional; - switch (blockHitResultDirection) { - case NORTH: - optional = Optional.of(new Vec2((float) (1.0 - x), (float) y)); - break; - case SOUTH: - optional = Optional.of(new Vec2((float) x, (float) y)); - break; - case WEST: - optional = Optional.of(new Vec2((float) z, (float) y)); - break; - case EAST: - optional = Optional.of(new Vec2((float) (1.0 - z), (float) y)); - break; - case DOWN: - case UP: - optional = Optional.empty(); - break; - default: - throw new IncompatibleClassChangeError(); - } - - return optional; - } - } - - private static int getHitSlot(Vec2 pHitPos) { - int $$1 = pHitPos.y >= 0.5F ? 0 : 1; - int $$2 = getSection(pHitPos.x); - return $$2 + $$1 * 3; - } - - private static int getSection(float pX) { - float $$1 = 0.0625F; - float $$2 = 0.375F; - if (pX < 0.375F) { - return 0; - } else { - float $$3 = 0.6875F; - return pX < 0.6875F ? 1 : 2; - } + return result; } private static void addBook(Level level, BlockPos blockPos, Player player, ChiseledLaboratoryBookShelfBlockEntity blockEntity, ItemStack books, int slot) { diff --git a/src/main/java/de/artemis/laboratoryblocks/common/blocks/LaboratoryBlock.java b/src/main/java/de/artemis/laboratoryblocks/common/blocks/LaboratoryBlock.java index 956b60b..4279188 100644 --- a/src/main/java/de/artemis/laboratoryblocks/common/blocks/LaboratoryBlock.java +++ b/src/main/java/de/artemis/laboratoryblocks/common/blocks/LaboratoryBlock.java @@ -8,9 +8,9 @@ import net.minecraft.core.BlockPos; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; -import net.minecraft.util.RandomSource; import net.minecraft.world.InteractionHand; -import net.minecraft.world.InteractionResult; +import net.minecraft.world.ItemInteractionResult; +import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.item.ItemEntity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; @@ -32,9 +32,7 @@ public LaboratoryBlock(Supplier block, Properties properties) { @SuppressWarnings("deprecation") @Override - public @NotNull InteractionResult use(@NotNull BlockState blockState, @NotNull Level level, @NotNull BlockPos blockPos, Player player, @NotNull InteractionHand interactionHand, @NotNull BlockHitResult blockHitResult) { - ItemStack itemStackInHand = player.getItemInHand(interactionHand); - + protected @NotNull ItemInteractionResult useItemOn(ItemStack itemStackInHand, BlockState blockState, Level level, BlockPos blockPos, Player player, InteractionHand hand, BlockHitResult hitResult) { if (itemStackInHand.is(ModItems.GLOWSTONE_PARTICLES.get()) || itemStackInHand.is(ModItems.CONFIGURATION_TOOL.get())) { // Applying Glowstone @@ -60,7 +58,7 @@ public LaboratoryBlock(Supplier block, Properties properties) { level.addParticle(ModParticles.APPLYING_GLOWSTONE_PARTICLE.get(), blockPos.getX() + 1, blockPos.getY() + 1, blockPos.getZ() + i, 0, 0, 0); } - return InteractionResult.SUCCESS; + return ItemInteractionResult.SUCCESS; } // Removing Glowstone @@ -72,7 +70,7 @@ else if (itemStackInHand.is(ModItems.CONFIGURATION_TOOL.get()) && blockState.get level.addFreshEntity(itemEntity); } - itemStackInHand.hurt(1, RandomSource.create(), null); + itemStackInHand.hurtAndBreak(1, player, hand == InteractionHand.MAIN_HAND ? EquipmentSlot.MAINHAND : EquipmentSlot.OFFHAND); } level.setBlock(blockPos, block.get().defaultBlockState(), 3); level.playSound(player, blockPos, SoundEvents.AXE_WAX_OFF, SoundSource.BLOCKS, 1.0F, 1.0F); @@ -93,9 +91,9 @@ else if (itemStackInHand.is(ModItems.CONFIGURATION_TOOL.get()) && blockState.get level.addParticle(ModParticles.REMOVING_MODIFIER_PARTICLE.get(), blockPos.getX() + 1, blockPos.getY() + 1, blockPos.getZ() + i, 0, 0, 0); } - return InteractionResult.SUCCESS; + return ItemInteractionResult.SUCCESS; } } - return InteractionResult.FAIL; + return ItemInteractionResult.FAIL; } } diff --git a/src/main/java/de/artemis/laboratoryblocks/common/blocks/LaboratoryCarpetBlock.java b/src/main/java/de/artemis/laboratoryblocks/common/blocks/LaboratoryCarpetBlock.java index 714f373..acb91f3 100644 --- a/src/main/java/de/artemis/laboratoryblocks/common/blocks/LaboratoryCarpetBlock.java +++ b/src/main/java/de/artemis/laboratoryblocks/common/blocks/LaboratoryCarpetBlock.java @@ -8,9 +8,9 @@ import net.minecraft.core.BlockPos; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; -import net.minecraft.util.RandomSource; import net.minecraft.world.InteractionHand; -import net.minecraft.world.InteractionResult; +import net.minecraft.world.ItemInteractionResult; +import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.item.ItemEntity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; @@ -32,9 +32,7 @@ public LaboratoryCarpetBlock(Supplier block, Properties p @SuppressWarnings("deprecation") @Override - public @NotNull InteractionResult use(@NotNull BlockState blockState, @NotNull Level level, @NotNull BlockPos blockPos, Player player, @NotNull InteractionHand interactionHand, @NotNull BlockHitResult blockHitResult) { - ItemStack itemStackInHand = player.getItemInHand(interactionHand); - + protected @NotNull ItemInteractionResult useItemOn(ItemStack itemStackInHand, BlockState blockState, Level level, BlockPos blockPos, Player player, InteractionHand hand, BlockHitResult hitResult) { if (itemStackInHand.is(ModItems.GLOWSTONE_PARTICLES.get()) || itemStackInHand.is(ModItems.CONFIGURATION_TOOL.get())) { // Applying Glowstone @@ -52,7 +50,7 @@ public LaboratoryCarpetBlock(Supplier block, Properties p level.addParticle(ModParticles.APPLYING_GLOWSTONE_PARTICLE.get(), blockPos.getX() + 1, blockPos.getY() + 0.0625F, blockPos.getZ() + i, 0, 0, 0); } - return InteractionResult.SUCCESS; + return ItemInteractionResult.SUCCESS; } // Removing Glowstone @@ -64,7 +62,7 @@ else if (itemStackInHand.is(ModItems.CONFIGURATION_TOOL.get()) && blockState.get level.addFreshEntity(itemEntity); } - itemStackInHand.hurt(1, RandomSource.create(), null); + itemStackInHand.hurtAndBreak(1, player, hand == InteractionHand.MAIN_HAND ? EquipmentSlot.MAINHAND : EquipmentSlot.OFFHAND); } level.setBlock(blockPos, block.get().defaultBlockState(), 3); level.playSound(player, blockPos, SoundEvents.AXE_WAX_OFF, SoundSource.BLOCKS, 1.0F, 1.0F); @@ -77,10 +75,10 @@ else if (itemStackInHand.is(ModItems.CONFIGURATION_TOOL.get()) && blockState.get level.addParticle(ModParticles.REMOVING_MODIFIER_PARTICLE.get(), blockPos.getX() + 1, blockPos.getY() + 0.0625F, blockPos.getZ() + i, 0, 0, 0); } - return InteractionResult.SUCCESS; + return ItemInteractionResult.SUCCESS; } } - return InteractionResult.FAIL; + return ItemInteractionResult.FAIL; } } diff --git a/src/main/java/de/artemis/laboratoryblocks/common/blocks/LaboratoryGlassBlock.java b/src/main/java/de/artemis/laboratoryblocks/common/blocks/LaboratoryGlassBlock.java index 4fd92e9..1fd9c68 100644 --- a/src/main/java/de/artemis/laboratoryblocks/common/blocks/LaboratoryGlassBlock.java +++ b/src/main/java/de/artemis/laboratoryblocks/common/blocks/LaboratoryGlassBlock.java @@ -8,21 +8,21 @@ import net.minecraft.core.BlockPos; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; -import net.minecraft.util.RandomSource; import net.minecraft.world.InteractionHand; -import net.minecraft.world.InteractionResult; +import net.minecraft.world.ItemInteractionResult; +import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.item.ItemEntity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.GlassBlock; +import net.minecraft.world.level.block.TransparentBlock; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.BlockHitResult; import org.jetbrains.annotations.NotNull; import java.util.function.Supplier; -public class LaboratoryGlassBlock extends GlassBlock { +public class LaboratoryGlassBlock extends TransparentBlock { private final Supplier block; public LaboratoryGlassBlock(Supplier block, Properties properties) { @@ -32,9 +32,7 @@ public LaboratoryGlassBlock(Supplier block, Properties pro @SuppressWarnings("deprecation") @Override - public @NotNull InteractionResult use(@NotNull BlockState blockState, @NotNull Level level, @NotNull BlockPos blockPos, Player player, @NotNull InteractionHand interactionHand, @NotNull BlockHitResult blockHitResult) { - ItemStack itemStackInHand = player.getItemInHand(interactionHand); - + protected @NotNull ItemInteractionResult useItemOn(ItemStack itemStackInHand, BlockState blockState, Level level, BlockPos blockPos, Player player, InteractionHand hand, BlockHitResult hitResult) { if (itemStackInHand.is(ModItems.GLOWSTONE_PARTICLES.get()) || itemStackInHand.is(ModItems.CONFIGURATION_TOOL.get())) { //Applying Glowstone @@ -60,7 +58,7 @@ public LaboratoryGlassBlock(Supplier block, Properties pro level.addParticle(ModParticles.APPLYING_GLOWSTONE_PARTICLE.get(), blockPos.getX() + 1, blockPos.getY() + 1, blockPos.getZ() + i, 0, 0, 0); } - return InteractionResult.SUCCESS; + return ItemInteractionResult.SUCCESS; } // Removing Glowstone @@ -71,7 +69,7 @@ else if (itemStackInHand.is(ModItems.CONFIGURATION_TOOL.get()) && blockState.get itemEntity.setDefaultPickUpDelay(); level.addFreshEntity(itemEntity); } - itemStackInHand.hurt(1, RandomSource.create(), null); + itemStackInHand.hurtAndBreak(1, player, hand == InteractionHand.MAIN_HAND ? EquipmentSlot.MAINHAND : EquipmentSlot.OFFHAND); } level.setBlock(blockPos, block.get().defaultBlockState(), 3); level.playSound(player, blockPos, SoundEvents.AXE_WAX_OFF, SoundSource.BLOCKS, 1.0F, 1.0F); @@ -92,9 +90,9 @@ else if (itemStackInHand.is(ModItems.CONFIGURATION_TOOL.get()) && blockState.get level.addParticle(ModParticles.REMOVING_MODIFIER_PARTICLE.get(), blockPos.getX() + 1, blockPos.getY() + 1, blockPos.getZ() + i, 0, 0, 0); } - return InteractionResult.SUCCESS; + return ItemInteractionResult.SUCCESS; } } - return InteractionResult.FAIL; + return ItemInteractionResult.FAIL; } } \ No newline at end of file diff --git a/src/main/java/de/artemis/laboratoryblocks/common/blocks/RedstoneControlledLaboratoryBlock.java b/src/main/java/de/artemis/laboratoryblocks/common/blocks/RedstoneControlledLaboratoryBlock.java index f09171c..1791987 100644 --- a/src/main/java/de/artemis/laboratoryblocks/common/blocks/RedstoneControlledLaboratoryBlock.java +++ b/src/main/java/de/artemis/laboratoryblocks/common/blocks/RedstoneControlledLaboratoryBlock.java @@ -11,7 +11,8 @@ import net.minecraft.sounds.SoundSource; import net.minecraft.util.RandomSource; import net.minecraft.world.InteractionHand; -import net.minecraft.world.InteractionResult; +import net.minecraft.world.ItemInteractionResult; +import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.item.ItemEntity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; @@ -77,9 +78,7 @@ public void tick(BlockState blockState, @NotNull ServerLevel serverLevel, @NotNu @SuppressWarnings("deprecation") @Override - public @NotNull InteractionResult use(@NotNull BlockState blockState, @NotNull Level level, @NotNull BlockPos blockPos, Player player, @NotNull InteractionHand interactionHand, @NotNull BlockHitResult blockHitResult) { - ItemStack itemStackInHand = player.getItemInHand(interactionHand); - + protected @NotNull ItemInteractionResult useItemOn(ItemStack itemStackInHand, BlockState blockState, Level level, BlockPos blockPos, Player player, InteractionHand hand, BlockHitResult hitResult) { if (itemStackInHand.is(ModItems.GLOWSTONE_PARTICLES.get()) || itemStackInHand.is(ModItems.CONFIGURATION_TOOL.get()) || itemStackInHand.is(ModItems.REDSTONE_PARTICLES.get())) { // Reversing Redstone Control @@ -105,7 +104,7 @@ public void tick(BlockState blockState, @NotNull ServerLevel serverLevel, @NotNu level.addParticle(ModParticles.APPLYING_REDSTONE_PARTICLE.get(), blockPos.getX() + 1, blockPos.getY() + 1, blockPos.getZ() + i, 0, 0, 0); } - return InteractionResult.SUCCESS; + return ItemInteractionResult.SUCCESS; } @@ -132,7 +131,7 @@ public void tick(BlockState blockState, @NotNull ServerLevel serverLevel, @NotNu level.addParticle(ModParticles.APPLYING_GLOWSTONE_PARTICLE.get(), blockPos.getX() + 1, blockPos.getY() + 1, blockPos.getZ() + i, 0, 0, 0); } - return InteractionResult.SUCCESS; + return ItemInteractionResult.SUCCESS; } //Applying Redstone @@ -158,7 +157,7 @@ public void tick(BlockState blockState, @NotNull ServerLevel serverLevel, @NotNu level.addParticle(ModParticles.APPLYING_REDSTONE_PARTICLE.get(), blockPos.getX() + 1, blockPos.getY() + 1, blockPos.getZ() + i, 0, 0, 0); } - return InteractionResult.SUCCESS; + return ItemInteractionResult.SUCCESS; } // Removing Glowstone @@ -170,7 +169,7 @@ public void tick(BlockState blockState, @NotNull ServerLevel serverLevel, @NotNu level.addFreshEntity(itemEntity); } - itemStackInHand.hurt(1, RandomSource.create(), null); + itemStackInHand.hurtAndBreak(1, player, hand == InteractionHand.MAIN_HAND ? EquipmentSlot.MAINHAND : EquipmentSlot.OFFHAND); } level.setBlock(blockPos, glowstone_block.get().defaultBlockState(), 3); level.playSound(player, blockPos, SoundEvents.AXE_WAX_OFF, SoundSource.BLOCKS, 1.0F, 1.0F); @@ -191,7 +190,7 @@ public void tick(BlockState blockState, @NotNull ServerLevel serverLevel, @NotNu level.addParticle(ModParticles.REMOVING_MODIFIER_PARTICLE.get(), blockPos.getX() + 1, blockPos.getY() + 1, blockPos.getZ() + i, 0, 0, 0); } - return InteractionResult.SUCCESS; + return ItemInteractionResult.SUCCESS; } // Removing Redstone @@ -203,7 +202,7 @@ public void tick(BlockState blockState, @NotNull ServerLevel serverLevel, @NotNu level.addFreshEntity(itemEntity); } - itemStackInHand.hurt(1, RandomSource.create(), null); + itemStackInHand.hurtAndBreak(1, player, hand == InteractionHand.MAIN_HAND ? EquipmentSlot.MAINHAND : EquipmentSlot.OFFHAND); } level.setBlock(blockPos, redstone_block.get().defaultBlockState(), 3); level.playSound(player, blockPos, SoundEvents.BONE_BLOCK_BREAK, SoundSource.BLOCKS, 1.0F, 1.0F); @@ -224,12 +223,12 @@ public void tick(BlockState blockState, @NotNull ServerLevel serverLevel, @NotNu level.addParticle(ModParticles.REMOVING_MODIFIER_PARTICLE.get(), blockPos.getX() + 1, blockPos.getY() + 1, blockPos.getZ() + i, 0, 0, 0); } - return InteractionResult.SUCCESS; + return ItemInteractionResult.SUCCESS; } } - return InteractionResult.FAIL; + return ItemInteractionResult.FAIL; } @Override diff --git a/src/main/java/de/artemis/laboratoryblocks/common/data/BlockLootTables.java b/src/main/java/de/artemis/laboratoryblocks/common/data/BlockLootTables.java index 90d5403..52ff803 100644 --- a/src/main/java/de/artemis/laboratoryblocks/common/data/BlockLootTables.java +++ b/src/main/java/de/artemis/laboratoryblocks/common/data/BlockLootTables.java @@ -2,13 +2,12 @@ import de.artemis.laboratoryblocks.common.registration.ModBlocks; import de.artemis.laboratoryblocks.common.registration.ModItems; -import de.artemis.laboratoryblocks.common.registration.Registration; +import net.minecraft.core.HolderLookup; import net.minecraft.data.loot.BlockLootSubProvider; import net.minecraft.world.flag.FeatureFlags; import net.minecraft.world.item.Items; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.storage.loot.providers.number.ConstantValue; -import net.minecraftforge.registries.RegistryObject; import org.jetbrains.annotations.NotNull; import java.util.ArrayList; @@ -16,8 +15,8 @@ public class BlockLootTables extends BlockLootSubProvider { - protected BlockLootTables() { - super(Set.of(), FeatureFlags.REGISTRY.allFlags()); + protected BlockLootTables(HolderLookup.Provider registries) { + super(Set.of(), FeatureFlags.REGISTRY.allFlags(), registries); } @Override diff --git a/src/main/java/de/artemis/laboratoryblocks/common/data/BlockLootTablesProvider.java b/src/main/java/de/artemis/laboratoryblocks/common/data/BlockLootTablesProvider.java index 1102190..6a40ce9 100644 --- a/src/main/java/de/artemis/laboratoryblocks/common/data/BlockLootTablesProvider.java +++ b/src/main/java/de/artemis/laboratoryblocks/common/data/BlockLootTablesProvider.java @@ -1,21 +1,23 @@ package de.artemis.laboratoryblocks.common.data; import com.google.common.collect.ImmutableList; +import net.minecraft.core.HolderLookup; +import net.minecraft.core.WritableRegistry; import net.minecraft.data.PackOutput; import net.minecraft.data.loot.LootTableProvider; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.util.ProblemReporter; import net.minecraft.world.level.storage.loot.LootTable; import net.minecraft.world.level.storage.loot.ValidationContext; import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets; import org.jetbrains.annotations.NotNull; import java.util.List; -import java.util.Map; import java.util.Set; +import java.util.concurrent.CompletableFuture; public class BlockLootTablesProvider extends LootTableProvider { - public BlockLootTablesProvider(PackOutput packOutput) { - super(packOutput, Set.of(), ImmutableList.of(new SubProviderEntry(BlockLootTables::new, LootContextParamSets.BLOCK))); + public BlockLootTablesProvider(PackOutput packOutput, CompletableFuture provider) { + super(packOutput, Set.of(), ImmutableList.of(new SubProviderEntry(BlockLootTables::new, LootContextParamSets.BLOCK)), provider); } @NotNull @@ -25,7 +27,7 @@ public List getTables() { } @Override - protected void validate(Map map, @NotNull ValidationContext validationtracker) { - map.forEach((id, table) -> table.validate(validationtracker)); + protected void validate(WritableRegistry writableregistry, @NotNull ValidationContext validationtracker, ProblemReporter.Collector collector) { + writableregistry.holders().forEach(table -> table.value().validate(validationtracker)); } } diff --git a/src/main/java/de/artemis/laboratoryblocks/common/data/DataProvider.java b/src/main/java/de/artemis/laboratoryblocks/common/data/DataProvider.java index ffea2f3..fba2de1 100644 --- a/src/main/java/de/artemis/laboratoryblocks/common/data/DataProvider.java +++ b/src/main/java/de/artemis/laboratoryblocks/common/data/DataProvider.java @@ -5,14 +5,14 @@ import net.minecraft.data.DataGenerator; import net.minecraft.world.item.Item; import net.minecraft.world.level.block.Block; -import net.minecraftforge.common.data.ExistingFileHelper; -import net.minecraftforge.data.event.GatherDataEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; +import net.neoforged.bus.api.SubscribeEvent; +import net.neoforged.fml.common.EventBusSubscriber; +import net.neoforged.neoforge.common.data.ExistingFileHelper; +import net.neoforged.neoforge.data.event.GatherDataEvent; import java.util.concurrent.CompletableFuture; -@Mod.EventBusSubscriber(modid = LaboratoryBlocks.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) +@EventBusSubscriber(modid = LaboratoryBlocks.MOD_ID, bus = EventBusSubscriber.Bus.MOD) public class DataProvider { @SubscribeEvent @@ -24,8 +24,8 @@ public static void onDataGen(GatherDataEvent event) { generator.addProvider(true, new ModelAndBlockStateProvider(generator.getPackOutput(), existingFileHelper)); generator.addProvider(true, new ItemModelProvider(generator.getPackOutput(), existingFileHelper)); generator.addProvider(true, new LanguageProvider(generator.getPackOutput(), "en_us")); - generator.addProvider(true, new BlockLootTablesProvider(generator.getPackOutput())); - generator.addProvider(true, new RecipesProvider(generator.getPackOutput())); + generator.addProvider(true, new BlockLootTablesProvider(generator.getPackOutput(), future)); + generator.addProvider(true, new RecipesProvider(generator.getPackOutput(), future)); generator.addProvider(true, new TagsProvider.BlockTagsProvider(generator.getPackOutput(), future, existingFileHelper)); generator.addProvider(true, new TagsProvider.ItemTagsProvider(generator.getPackOutput(), future, existingFileHelper)); generator.addProvider(true, new FusionModelProvider(generator.getPackOutput())); diff --git a/src/main/java/de/artemis/laboratoryblocks/common/data/FusionModelProvider.java b/src/main/java/de/artemis/laboratoryblocks/common/data/FusionModelProvider.java index 30fb6fd..d8615d5 100644 --- a/src/main/java/de/artemis/laboratoryblocks/common/data/FusionModelProvider.java +++ b/src/main/java/de/artemis/laboratoryblocks/common/data/FusionModelProvider.java @@ -18,666 +18,666 @@ public FusionModelProvider(PackOutput output) { protected void generate() { var modelDataLaboratoryBlock = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/laboratory_block-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/laboratory_block-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.ENLIGHTED_LABORATORY_BLOCK.get()))) .build(); var modelInstanceLaboratoryBlock = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataLaboratoryBlock); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/laboratory_block"), modelInstanceLaboratoryBlock); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/laboratory_block"), modelInstanceLaboratoryBlock); var modelDataEnlightedLaboratoryBlock = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/laboratory_block-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/laboratory_block-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.LABORATORY_BLOCK.get()))) .build(); var modelInstanceEnlightedLaboratoryBlock = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataEnlightedLaboratoryBlock); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_laboratory_block"), modelInstanceEnlightedLaboratoryBlock); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_laboratory_block"), modelInstanceEnlightedLaboratoryBlock); var modelDataLaboratoryVent = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/laboratory_vent-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/laboratory_vent-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.ENLIGHTED_LABORATORY_VENT.get()))) .build(); var modelInstanceLaboratoryVent = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataLaboratoryVent); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/laboratory_vent"), modelInstanceLaboratoryVent); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/laboratory_vent"), modelInstanceLaboratoryVent); var modelDataEnlightedLaboratoryVent = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/laboratory_vent-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/laboratory_vent-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.LABORATORY_VENT.get()))) .build(); var modelInstanceEnlightedLaboratoryVent = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataEnlightedLaboratoryVent); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_laboratory_vent"), modelInstanceEnlightedLaboratoryVent); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_laboratory_vent"), modelInstanceEnlightedLaboratoryVent); var modelDataLaboratoryVentConnecting = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/laboratory_vent_connecting-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/laboratory_vent_connecting-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.ENLIGHTED_LABORATORY_VENT_CONNECTING.get())).or(DefaultConnectionPredicates.matchBlock(ModBlocks.LABORATORY_BLOCK.get())).or(DefaultConnectionPredicates.matchBlock(ModBlocks.ENLIGHTED_LABORATORY_BLOCK.get()))) .build(); var modelInstanceLaboratoryVentConnecting = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataLaboratoryVentConnecting); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/laboratory_vent_connecting"), modelInstanceLaboratoryVentConnecting); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/laboratory_vent_connecting"), modelInstanceLaboratoryVentConnecting); var modelDataEnlightedLaboratoryVentConnecting = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/laboratory_vent_connecting-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/laboratory_vent_connecting-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.LABORATORY_VENT_CONNECTING.get())).or(DefaultConnectionPredicates.matchBlock(ModBlocks.LABORATORY_BLOCK.get())).or(DefaultConnectionPredicates.matchBlock(ModBlocks.ENLIGHTED_LABORATORY_BLOCK.get()))) .build(); var modelInstanceEnlightedLaboratoryVentConnecting = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataEnlightedLaboratoryVentConnecting); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_laboratory_vent_connecting"), modelInstanceEnlightedLaboratoryVentConnecting); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_laboratory_vent_connecting"), modelInstanceEnlightedLaboratoryVentConnecting); var modelDataLaboratoryBookshelf = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_column")) - .texture("side", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/laboratory_bookshelf-fusion")) - .texture("end", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/laboratory_bookshelf_top-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_column")) + .texture("side", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/laboratory_bookshelf-fusion")) + .texture("end", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/laboratory_bookshelf_top-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.ENLIGHTED_LABORATORY_BOOKSHELF.get()))) .build(); var modelInstanceLaboratoryBookshelf = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataLaboratoryBookshelf); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/laboratory_bookshelf"), modelInstanceLaboratoryBookshelf); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/laboratory_bookshelf"), modelInstanceLaboratoryBookshelf); var modelDataEnlightedLaboratoryBookshelf = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_column")) - .texture("side", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/laboratory_bookshelf-fusion")) - .texture("end", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/laboratory_bookshelf_top-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_column")) + .texture("side", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/laboratory_bookshelf-fusion")) + .texture("end", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/laboratory_bookshelf_top-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.LABORATORY_BOOKSHELF.get()))) .build(); var modelInstanceEnlightedLaboratoryBookshelf = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataEnlightedLaboratoryBookshelf); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_laboratory_bookshelf"), modelInstanceEnlightedLaboratoryBookshelf); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_laboratory_bookshelf"), modelInstanceEnlightedLaboratoryBookshelf); var modelDataClearLaboratoryScreen = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/clear_laboratory_screen-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/clear_laboratory_screen-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.ENLIGHTED_CLEAR_LABORATORY_SCREEN.get()))) .build(); var modelInstanceClearLaboratoryScreen = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataClearLaboratoryScreen); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/clear_laboratory_screen"), modelInstanceClearLaboratoryScreen); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/clear_laboratory_screen"), modelInstanceClearLaboratoryScreen); var modelDataEnlightedClearLaboratoryScreen = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/clear_laboratory_screen-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/clear_laboratory_screen-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.CLEAR_LABORATORY_SCREEN.get()))) .build(); var modelInstanceEnlightedClearLaboratoryScreen = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataEnlightedClearLaboratoryScreen); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_clear_laboratory_screen"), modelInstanceEnlightedClearLaboratoryScreen); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_clear_laboratory_screen"), modelInstanceEnlightedClearLaboratoryScreen); var modelDataLeftFacedBlueSignalingLaboratoryBlock = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/left-faced_blue_signaling_laboratory_block-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/left-faced_blue_signaling_laboratory_block-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.ENLIGHTED_LEFT_FACED_BLUE_SIGNALING_LABORATORY_BLOCK.get()))) .build(); var modelInstanceLeftFacedBlueSignalingLaboratoryBlock = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataLeftFacedBlueSignalingLaboratoryBlock); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/left-faced_blue_signaling_laboratory_block"), modelInstanceLeftFacedBlueSignalingLaboratoryBlock); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/left-faced_blue_signaling_laboratory_block"), modelInstanceLeftFacedBlueSignalingLaboratoryBlock); var modelDataEnlightedLeftFacedBlueSignalingLaboratoryBlock = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/left-faced_blue_signaling_laboratory_block-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/left-faced_blue_signaling_laboratory_block-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.LEFT_FACED_BLUE_SIGNALING_LABORATORY_BLOCK.get()))) .build(); var modelInstanceEnlightedLeftFacedBlueSignalingLaboratoryBlock = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataEnlightedLeftFacedBlueSignalingLaboratoryBlock); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_left-faced_blue_signaling_laboratory_block"), modelInstanceEnlightedLeftFacedBlueSignalingLaboratoryBlock); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_left-faced_blue_signaling_laboratory_block"), modelInstanceEnlightedLeftFacedBlueSignalingLaboratoryBlock); var modelDataLeftFacedGreenSignalingLaboratoryBlock = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/left-faced_green_signaling_laboratory_block-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/left-faced_green_signaling_laboratory_block-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.ENLIGHTED_LEFT_FACED_GREEN_SIGNALING_LABORATORY_BLOCK.get()))) .build(); var modelInstanceLeftFacedGreenSignalingLaboratoryBlock = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataLeftFacedGreenSignalingLaboratoryBlock); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/left-faced_green_signaling_laboratory_block"), modelInstanceLeftFacedGreenSignalingLaboratoryBlock); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/left-faced_green_signaling_laboratory_block"), modelInstanceLeftFacedGreenSignalingLaboratoryBlock); var modelDataEnlightedLeftFacedGreenSignalingLaboratoryBlock = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/left-faced_green_signaling_laboratory_block-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/left-faced_green_signaling_laboratory_block-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.LEFT_FACED_GREEN_SIGNALING_LABORATORY_BLOCK.get()))) .build(); var modelInstanceEnlightedLeftFacedGreenSignalingLaboratoryBlock = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataEnlightedLeftFacedGreenSignalingLaboratoryBlock); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_left-faced_green_signaling_laboratory_block"), modelInstanceEnlightedLeftFacedGreenSignalingLaboratoryBlock); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_left-faced_green_signaling_laboratory_block"), modelInstanceEnlightedLeftFacedGreenSignalingLaboratoryBlock); var modelDataLeftFacedRedSignalingLaboratoryBlock = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/left-faced_red_signaling_laboratory_block-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/left-faced_red_signaling_laboratory_block-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.ENLIGHTED_LEFT_FACED_RED_SIGNALING_LABORATORY_BLOCK.get()))) .build(); var modelInstanceLeftFacedRedSignalingLaboratoryBlock = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataLeftFacedRedSignalingLaboratoryBlock); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/left-faced_red_signaling_laboratory_block"), modelInstanceLeftFacedRedSignalingLaboratoryBlock); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/left-faced_red_signaling_laboratory_block"), modelInstanceLeftFacedRedSignalingLaboratoryBlock); var modelDataEnlightedLeftFacedRedSignalingLaboratoryBlock = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/left-faced_red_signaling_laboratory_block-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/left-faced_red_signaling_laboratory_block-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.LEFT_FACED_RED_SIGNALING_LABORATORY_BLOCK.get()))) .build(); var modelInstanceEnlightedLeftFacedRedSignalingLaboratoryBlock = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataEnlightedLeftFacedRedSignalingLaboratoryBlock); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_left-faced_red_signaling_laboratory_block"), modelInstanceEnlightedLeftFacedRedSignalingLaboratoryBlock); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_left-faced_red_signaling_laboratory_block"), modelInstanceEnlightedLeftFacedRedSignalingLaboratoryBlock); var modelDataRightFacedBlueSignalingLaboratoryBlock = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/right-faced_blue_signaling_laboratory_block-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/right-faced_blue_signaling_laboratory_block-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.ENLIGHTED_RIGHT_FACED_BLUE_SIGNALING_LABORATORY_BLOCK.get()))) .build(); var modelInstanceRightFacedBlueSignalingLaboratoryBlock = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataRightFacedBlueSignalingLaboratoryBlock); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/right-faced_blue_signaling_laboratory_block"), modelInstanceRightFacedBlueSignalingLaboratoryBlock); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/right-faced_blue_signaling_laboratory_block"), modelInstanceRightFacedBlueSignalingLaboratoryBlock); var modelDataEnlightedRightFacedBlueSignalingLaboratoryBlock = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/right-faced_blue_signaling_laboratory_block-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/right-faced_blue_signaling_laboratory_block-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.RIGHT_FACED_BLUE_SIGNALING_LABORATORY_BLOCK.get()))) .build(); var modelInstanceEnlightedRightFacedBlueSignalingLaboratoryBlock = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataEnlightedRightFacedBlueSignalingLaboratoryBlock); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_right-faced_blue_signaling_laboratory_block"), modelInstanceEnlightedRightFacedBlueSignalingLaboratoryBlock); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_right-faced_blue_signaling_laboratory_block"), modelInstanceEnlightedRightFacedBlueSignalingLaboratoryBlock); var modelDataRightFacedGreenSignalingLaboratoryBlock = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/right-faced_green_signaling_laboratory_block-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/right-faced_green_signaling_laboratory_block-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.ENLIGHTED_RIGHT_FACED_GREEN_SIGNALING_LABORATORY_BLOCK.get()))) .build(); var modelInstanceRightFacedGreenSignalingLaboratoryBlock = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataRightFacedGreenSignalingLaboratoryBlock); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/right-faced_green_signaling_laboratory_block"), modelInstanceRightFacedGreenSignalingLaboratoryBlock); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/right-faced_green_signaling_laboratory_block"), modelInstanceRightFacedGreenSignalingLaboratoryBlock); var modelDataEnlightedRightFacedGreenSignalingLaboratoryBlock = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/right-faced_green_signaling_laboratory_block-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/right-faced_green_signaling_laboratory_block-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.RIGHT_FACED_GREEN_SIGNALING_LABORATORY_BLOCK.get()))) .build(); var modelInstanceEnlightedRightFacedGreenSignalingLaboratoryBlock = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataEnlightedRightFacedGreenSignalingLaboratoryBlock); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_right-faced_green_signaling_laboratory_block"), modelInstanceEnlightedRightFacedGreenSignalingLaboratoryBlock); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_right-faced_green_signaling_laboratory_block"), modelInstanceEnlightedRightFacedGreenSignalingLaboratoryBlock); var modelDataRightFacedRedSignalingLaboratoryBlock = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/right-faced_red_signaling_laboratory_block-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/right-faced_red_signaling_laboratory_block-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.ENLIGHTED_RIGHT_FACED_RED_SIGNALING_LABORATORY_BLOCK.get()))) .build(); var modelInstanceRightFacedRedSignalingLaboratoryBlock = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataRightFacedRedSignalingLaboratoryBlock); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/right-faced_red_signaling_laboratory_block"), modelInstanceRightFacedRedSignalingLaboratoryBlock); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/right-faced_red_signaling_laboratory_block"), modelInstanceRightFacedRedSignalingLaboratoryBlock); var modelDataEnlightedRightFacedRedSignalingLaboratoryBlock = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/right-faced_red_signaling_laboratory_block-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/right-faced_red_signaling_laboratory_block-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.RIGHT_FACED_RED_SIGNALING_LABORATORY_BLOCK.get()))) .build(); var modelInstanceEnlightedRightFacedRedSignalingLaboratoryBlock = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataEnlightedRightFacedRedSignalingLaboratoryBlock); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_right-faced_red_signaling_laboratory_block"), modelInstanceEnlightedRightFacedRedSignalingLaboratoryBlock); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_right-faced_red_signaling_laboratory_block"), modelInstanceEnlightedRightFacedRedSignalingLaboratoryBlock); var modelDataScrewedLaboratoryBlock = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/screwed_laboratory_block-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/screwed_laboratory_block-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.ENLIGHTED_SCREWED_LABORATORY_BLOCK.get()))) .build(); var modelInstanceScrewedLaboratoryBlock = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataScrewedLaboratoryBlock); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/screwed_laboratory_block"), modelInstanceScrewedLaboratoryBlock); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/screwed_laboratory_block"), modelInstanceScrewedLaboratoryBlock); var modelDataEnlightedScrewedLaboratoryBlock = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/screwed_laboratory_block-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/screwed_laboratory_block-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.SCREWED_LABORATORY_BLOCK.get()))) .build(); var modelInstanceEnlightedScrewedLaboratoryBlock = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataEnlightedScrewedLaboratoryBlock); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_screwed_laboratory_block"), modelInstanceEnlightedScrewedLaboratoryBlock); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_screwed_laboratory_block"), modelInstanceEnlightedScrewedLaboratoryBlock); var modelDataLaboratoryTiles = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/laboratory_tiles-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/laboratory_tiles-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.ENLIGHTED_LABORATORY_TILES.get()))) .build(); var modelInstanceLaboratoryTiles = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataLaboratoryTiles); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/laboratory_tiles"), modelInstanceLaboratoryTiles); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/laboratory_tiles"), modelInstanceLaboratoryTiles); var modelDataEnlightedLaboratoryTiles = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/laboratory_tiles-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/laboratory_tiles-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.LABORATORY_TILES.get()))) .build(); var modelInstanceEnlightedLaboratoryTiles = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataEnlightedLaboratoryTiles); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_laboratory_tiles"), modelInstanceEnlightedLaboratoryTiles); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_laboratory_tiles"), modelInstanceEnlightedLaboratoryTiles); var modelDataGrayLaboratoryTiles = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/gray_laboratory_tiles-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/gray_laboratory_tiles-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.ENLIGHTED_GRAY_LABORATORY_TILES.get()))) .build(); var modelInstanceGrayLaboratoryTiles = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataGrayLaboratoryTiles); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/gray_laboratory_tiles"), modelInstanceGrayLaboratoryTiles); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/gray_laboratory_tiles"), modelInstanceGrayLaboratoryTiles); var modelDataEnlightedGrayLaboratoryTiles = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/gray_laboratory_tiles-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/gray_laboratory_tiles-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.GRAY_LABORATORY_TILES.get()))) .build(); var modelInstanceEnlightedGrayLaboratoryTiles = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataEnlightedGrayLaboratoryTiles); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_gray_laboratory_tiles"), modelInstanceEnlightedGrayLaboratoryTiles); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_gray_laboratory_tiles"), modelInstanceEnlightedGrayLaboratoryTiles); var modelDataMixedLaboratoryTiles = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/mixed_laboratory_tiles-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/mixed_laboratory_tiles-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.ENLIGHTED_MIXED_LABORATORY_TILES.get()))) .build(); var modelInstanceMixedLaboratoryTiles = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataMixedLaboratoryTiles); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/mixed_laboratory_tiles"), modelInstanceMixedLaboratoryTiles); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/mixed_laboratory_tiles"), modelInstanceMixedLaboratoryTiles); var modelDataEnlightedMixedLaboratoryTiles = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/mixed_laboratory_tiles-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/mixed_laboratory_tiles-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.MIXED_LABORATORY_TILES.get()))) .build(); var modelInstanceEnlightedMixedLaboratoryTiles = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataEnlightedMixedLaboratoryTiles); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_mixed_laboratory_tiles"), modelInstanceEnlightedMixedLaboratoryTiles); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_mixed_laboratory_tiles"), modelInstanceEnlightedMixedLaboratoryTiles); var modelDataLaboratoryGlass = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/laboratory_glass-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/laboratory_glass-fusion")) .connection(DefaultConnectionPredicates.isSameBlock()) .build(); var modelInstanceLaboratoryGlass = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataLaboratoryGlass); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/laboratory_glass"), modelInstanceLaboratoryGlass); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/laboratory_glass"), modelInstanceLaboratoryGlass); var modelDataEnlightedLaboratoryGlass = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/laboratory_glass-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/laboratory_glass-fusion")) .connection(DefaultConnectionPredicates.isSameBlock()) .build(); var modelInstanceEnlightedLaboratoryGlass = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataEnlightedLaboratoryGlass); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_laboratory_glass"), modelInstanceEnlightedLaboratoryGlass); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_laboratory_glass"), modelInstanceEnlightedLaboratoryGlass); var modelDataOakLaboratoryFloor = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/oak_laboratory_floor-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/oak_laboratory_floor-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.ENLIGHTED_OAK_LABORATORY_FLOOR.get()))) .build(); var modelInstanceOakLaboratoryFloor = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataOakLaboratoryFloor); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/oak_laboratory_floor"), modelInstanceOakLaboratoryFloor); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/oak_laboratory_floor"), modelInstanceOakLaboratoryFloor); var modelDataEnlightedOakLaboratoryFloor = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/oak_laboratory_floor-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/oak_laboratory_floor-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.OAK_LABORATORY_FLOOR.get()))) .build(); var modelInstanceEnlightedOakLaboratoryFloor = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataEnlightedOakLaboratoryFloor); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_oak_laboratory_floor"), modelInstanceEnlightedOakLaboratoryFloor); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_oak_laboratory_floor"), modelInstanceEnlightedOakLaboratoryFloor); var modelDataOakLaboratoryTiles = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/oak_laboratory_tiles-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/oak_laboratory_tiles-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.ENLIGHTED_OAK_LABORATORY_TILES.get()))) .build(); var modelInstanceOakLaboratoryTiles = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataOakLaboratoryTiles); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/oak_laboratory_tiles"), modelInstanceOakLaboratoryTiles); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/oak_laboratory_tiles"), modelInstanceOakLaboratoryTiles); var modelDataEnlightedOakLaboratoryTiles = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/oak_laboratory_tiles-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/oak_laboratory_tiles-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.OAK_LABORATORY_TILES.get()))) .build(); var modelInstanceEnlightedOakLaboratoryTiles = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataEnlightedOakLaboratoryTiles); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_oak_laboratory_tiles"), modelInstanceEnlightedOakLaboratoryTiles); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_oak_laboratory_tiles"), modelInstanceEnlightedOakLaboratoryTiles); var modelDataSpruceLaboratoryFloor = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/spruce_laboratory_floor-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/spruce_laboratory_floor-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.ENLIGHTED_SPRUCE_LABORATORY_FLOOR.get()))) .build(); var modelInstanceSpruceLaboratoryFloor = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataSpruceLaboratoryFloor); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/spruce_laboratory_floor"), modelInstanceSpruceLaboratoryFloor); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/spruce_laboratory_floor"), modelInstanceSpruceLaboratoryFloor); var modelDataEnlightedSpruceLaboratoryFloor = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/spruce_laboratory_floor-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/spruce_laboratory_floor-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.SPRUCE_LABORATORY_FLOOR.get()))) .build(); var modelInstanceEnlightedSpruceLaboratoryFloor = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataEnlightedSpruceLaboratoryFloor); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_spruce_laboratory_floor"), modelInstanceEnlightedSpruceLaboratoryFloor); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_spruce_laboratory_floor"), modelInstanceEnlightedSpruceLaboratoryFloor); var modelDataSpruceLaboratoryTiles = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/spruce_laboratory_tiles-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/spruce_laboratory_tiles-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.ENLIGHTED_SPRUCE_LABORATORY_TILES.get()))) .build(); var modelInstanceSpruceLaboratoryTiles = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataSpruceLaboratoryTiles); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/spruce_laboratory_tiles"), modelInstanceSpruceLaboratoryTiles); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/spruce_laboratory_tiles"), modelInstanceSpruceLaboratoryTiles); var modelDataEnlightedSpruceLaboratoryTiles = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/spruce_laboratory_tiles-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/spruce_laboratory_tiles-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.SPRUCE_LABORATORY_TILES.get()))) .build(); var modelInstanceEnlightedSpruceLaboratoryTiles = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataEnlightedSpruceLaboratoryTiles); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_spruce_laboratory_tiles"), modelInstanceEnlightedSpruceLaboratoryTiles); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_spruce_laboratory_tiles"), modelInstanceEnlightedSpruceLaboratoryTiles); var modelDataBirchLaboratoryFloor = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/birch_laboratory_floor-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/birch_laboratory_floor-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.ENLIGHTED_BIRCH_LABORATORY_FLOOR.get()))) .build(); var modelInstanceBirchLaboratoryFloor = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataBirchLaboratoryFloor); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/birch_laboratory_floor"), modelInstanceBirchLaboratoryFloor); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/birch_laboratory_floor"), modelInstanceBirchLaboratoryFloor); var modelDataEnlightedBirchLaboratoryFloor = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/birch_laboratory_floor-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/birch_laboratory_floor-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.BIRCH_LABORATORY_FLOOR.get()))) .build(); var modelInstanceEnlightedBirchLaboratoryFloor = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataEnlightedBirchLaboratoryFloor); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_birch_laboratory_floor"), modelInstanceEnlightedBirchLaboratoryFloor); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_birch_laboratory_floor"), modelInstanceEnlightedBirchLaboratoryFloor); var modelDataBirchLaboratoryTiles = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/birch_laboratory_tiles-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/birch_laboratory_tiles-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.ENLIGHTED_BIRCH_LABORATORY_TILES.get()))) .build(); var modelInstanceBirchLaboratoryTiles = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataBirchLaboratoryTiles); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/birch_laboratory_tiles"), modelInstanceBirchLaboratoryTiles); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/birch_laboratory_tiles"), modelInstanceBirchLaboratoryTiles); var modelDataEnlightedBirchLaboratoryTiles = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/birch_laboratory_tiles-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/birch_laboratory_tiles-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.BIRCH_LABORATORY_TILES.get()))) .build(); var modelInstanceEnlightedBirchLaboratoryTiles = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataEnlightedBirchLaboratoryTiles); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_birch_laboratory_tiles"), modelInstanceEnlightedBirchLaboratoryTiles); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_birch_laboratory_tiles"), modelInstanceEnlightedBirchLaboratoryTiles); var modelDataDarkOakLaboratoryFloor = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/dark_oak_laboratory_floor-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/dark_oak_laboratory_floor-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.ENLIGHTED_DARK_OAK_LABORATORY_FLOOR.get()))) .build(); var modelInstanceDarkOakLaboratoryFloor = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataDarkOakLaboratoryFloor); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/dark_oak_laboratory_floor"), modelInstanceDarkOakLaboratoryFloor); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/dark_oak_laboratory_floor"), modelInstanceDarkOakLaboratoryFloor); var modelDataEnlightedDarkOakLaboratoryFloor = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/dark_oak_laboratory_floor-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/dark_oak_laboratory_floor-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.DARK_OAK_LABORATORY_FLOOR.get()))) .build(); var modelInstanceEnlightedDarkOakLaboratoryFloor = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataEnlightedDarkOakLaboratoryFloor); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_dark_oak_laboratory_floor"), modelInstanceEnlightedDarkOakLaboratoryFloor); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_dark_oak_laboratory_floor"), modelInstanceEnlightedDarkOakLaboratoryFloor); var modelDataDarkOakLaboratoryTiles = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/dark_oak_laboratory_tiles-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/dark_oak_laboratory_tiles-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.ENLIGHTED_DARK_OAK_LABORATORY_TILES.get()))) .build(); var modelInstanceDarkOakLaboratoryTiles = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataDarkOakLaboratoryTiles); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/dark_oak_laboratory_tiles"), modelInstanceDarkOakLaboratoryTiles); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/dark_oak_laboratory_tiles"), modelInstanceDarkOakLaboratoryTiles); var modelDataEnlightedDarkOakLaboratoryTiles = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/dark_oak_laboratory_tiles-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/dark_oak_laboratory_tiles-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.DARK_OAK_LABORATORY_TILES.get()))) .build(); var modelInstanceEnlightedDarkOakLaboratoryTiles = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataEnlightedDarkOakLaboratoryTiles); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_dark_oak_laboratory_tiles"), modelInstanceEnlightedDarkOakLaboratoryTiles); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_dark_oak_laboratory_tiles"), modelInstanceEnlightedDarkOakLaboratoryTiles); var modelDataAcaciaLaboratoryFloor = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/acacia_laboratory_floor-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/acacia_laboratory_floor-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.ENLIGHTED_ACACIA_LABORATORY_FLOOR.get()))) .build(); var modelInstanceAcaciaLaboratoryFloor = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataAcaciaLaboratoryFloor); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/acacia_laboratory_floor"), modelInstanceAcaciaLaboratoryFloor); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/acacia_laboratory_floor"), modelInstanceAcaciaLaboratoryFloor); var modelDataEnlightedAcaciaLaboratoryFloor = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/acacia_laboratory_floor-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/acacia_laboratory_floor-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.ACACIA_LABORATORY_FLOOR.get()))) .build(); var modelInstanceEnlightedAcaciaLaboratoryFloor = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataEnlightedAcaciaLaboratoryFloor); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_acacia_laboratory_floor"), modelInstanceEnlightedAcaciaLaboratoryFloor); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_acacia_laboratory_floor"), modelInstanceEnlightedAcaciaLaboratoryFloor); var modelDataAcaciaLaboratoryTiles = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/acacia_laboratory_tiles-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/acacia_laboratory_tiles-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.ENLIGHTED_ACACIA_LABORATORY_TILES.get()))) .build(); var modelInstanceAcaciaLaboratoryTiles = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataAcaciaLaboratoryTiles); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/acacia_laboratory_tiles"), modelInstanceAcaciaLaboratoryTiles); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/acacia_laboratory_tiles"), modelInstanceAcaciaLaboratoryTiles); var modelDataEnlightedAcaciaLaboratoryTiles = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/acacia_laboratory_tiles-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/acacia_laboratory_tiles-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.ACACIA_LABORATORY_TILES.get()))) .build(); var modelInstanceEnlightedAcaciaLaboratoryTiles = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataEnlightedAcaciaLaboratoryTiles); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_acacia_laboratory_tiles"), modelInstanceEnlightedAcaciaLaboratoryTiles); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_acacia_laboratory_tiles"), modelInstanceEnlightedAcaciaLaboratoryTiles); var modelDataJungleLaboratoryFloor = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/jungle_laboratory_floor-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/jungle_laboratory_floor-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.ENLIGHTED_JUNGLE_LABORATORY_FLOOR.get()))) .build(); var modelInstanceJungleLaboratoryFloor = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataJungleLaboratoryFloor); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/jungle_laboratory_floor"), modelInstanceJungleLaboratoryFloor); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/jungle_laboratory_floor"), modelInstanceJungleLaboratoryFloor); var modelDataEnlightedJungleLaboratoryFloor = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/jungle_laboratory_floor-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/jungle_laboratory_floor-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.JUNGLE_LABORATORY_FLOOR.get()))) .build(); var modelInstanceEnlightedJungleLaboratoryFloor = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataEnlightedJungleLaboratoryFloor); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_jungle_laboratory_floor"), modelInstanceEnlightedJungleLaboratoryFloor); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_jungle_laboratory_floor"), modelInstanceEnlightedJungleLaboratoryFloor); var modelDataJungleLaboratoryTiles = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/jungle_laboratory_tiles-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/jungle_laboratory_tiles-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.ENLIGHTED_JUNGLE_LABORATORY_TILES.get()))) .build(); var modelInstanceJungleLaboratoryTiles = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataJungleLaboratoryTiles); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/jungle_laboratory_tiles"), modelInstanceJungleLaboratoryTiles); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/jungle_laboratory_tiles"), modelInstanceJungleLaboratoryTiles); var modelDataEnlightedJungleLaboratoryTiles = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/jungle_laboratory_tiles-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/jungle_laboratory_tiles-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.JUNGLE_LABORATORY_TILES.get()))) .build(); var modelInstanceEnlightedJungleLaboratoryTiles = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataEnlightedJungleLaboratoryTiles); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_jungle_laboratory_tiles"), modelInstanceEnlightedJungleLaboratoryTiles); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_jungle_laboratory_tiles"), modelInstanceEnlightedJungleLaboratoryTiles); var modelDataMangroveLaboratoryFloor = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/mangrove_laboratory_floor-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/mangrove_laboratory_floor-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.ENLIGHTED_MANGROVE_LABORATORY_FLOOR.get()))) .build(); var modelInstanceMangroveLaboratoryFloor = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataMangroveLaboratoryFloor); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/mangrove_laboratory_floor"), modelInstanceMangroveLaboratoryFloor); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/mangrove_laboratory_floor"), modelInstanceMangroveLaboratoryFloor); var modelDataEnlightedMangroveLaboratoryFloor = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/mangrove_laboratory_floor-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/mangrove_laboratory_floor-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.MANGROVE_LABORATORY_FLOOR.get()))) .build(); var modelInstanceEnlightedMangroveLaboratoryFloor = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataEnlightedMangroveLaboratoryFloor); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_mangrove_laboratory_floor"), modelInstanceEnlightedMangroveLaboratoryFloor); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_mangrove_laboratory_floor"), modelInstanceEnlightedMangroveLaboratoryFloor); var modelDataMangroveLaboratoryTiles = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/mangrove_laboratory_tiles-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/mangrove_laboratory_tiles-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.ENLIGHTED_MANGROVE_LABORATORY_TILES.get()))) .build(); var modelInstanceMangroveLaboratoryTiles = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataMangroveLaboratoryTiles); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/mangrove_laboratory_tiles"), modelInstanceMangroveLaboratoryTiles); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/mangrove_laboratory_tiles"), modelInstanceMangroveLaboratoryTiles); var modelDataEnlightedMangroveLaboratoryTiles = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/mangrove_laboratory_tiles-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/mangrove_laboratory_tiles-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.MANGROVE_LABORATORY_TILES.get()))) .build(); var modelInstanceEnlightedMangroveLaboratoryTiles = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataEnlightedMangroveLaboratoryTiles); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_mangrove_laboratory_tiles"), modelInstanceEnlightedMangroveLaboratoryTiles); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_mangrove_laboratory_tiles"), modelInstanceEnlightedMangroveLaboratoryTiles); var modelDataCrimsonLaboratoryFloor = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/crimson_laboratory_floor-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/crimson_laboratory_floor-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.ENLIGHTED_CRIMSON_LABORATORY_FLOOR.get()))) .build(); var modelInstanceCrimsonLaboratoryFloor = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataCrimsonLaboratoryFloor); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/crimson_laboratory_floor"), modelInstanceCrimsonLaboratoryFloor); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/crimson_laboratory_floor"), modelInstanceCrimsonLaboratoryFloor); var modelDataEnlightedCrimsonLaboratoryFloor = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/crimson_laboratory_floor-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/crimson_laboratory_floor-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.CRIMSON_LABORATORY_FLOOR.get()))) .build(); var modelInstanceEnlightedCrimsonLaboratoryFloor = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataEnlightedCrimsonLaboratoryFloor); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_crimson_laboratory_floor"), modelInstanceEnlightedCrimsonLaboratoryFloor); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_crimson_laboratory_floor"), modelInstanceEnlightedCrimsonLaboratoryFloor); var modelDataCrimsonLaboratoryTiles = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/crimson_laboratory_tiles-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/crimson_laboratory_tiles-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.ENLIGHTED_CRIMSON_LABORATORY_TILES.get()))) .build(); var modelInstanceCrimsonLaboratoryTiles = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataCrimsonLaboratoryTiles); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/crimson_laboratory_tiles"), modelInstanceCrimsonLaboratoryTiles); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/crimson_laboratory_tiles"), modelInstanceCrimsonLaboratoryTiles); var modelDataEnlightedCrimsonLaboratoryTiles = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/crimson_laboratory_tiles-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/crimson_laboratory_tiles-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.CRIMSON_LABORATORY_TILES.get()))) .build(); var modelInstanceEnlightedCrimsonLaboratoryTiles = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataEnlightedCrimsonLaboratoryTiles); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_crimson_laboratory_tiles"), modelInstanceEnlightedCrimsonLaboratoryTiles); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_crimson_laboratory_tiles"), modelInstanceEnlightedCrimsonLaboratoryTiles); var modelDataWarpedLaboratoryFloor = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/warped_laboratory_floor-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/warped_laboratory_floor-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.ENLIGHTED_WARPED_LABORATORY_FLOOR.get()))) .build(); var modelInstanceWarpedLaboratoryFloor = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataWarpedLaboratoryFloor); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/warped_laboratory_floor"), modelInstanceWarpedLaboratoryFloor); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/warped_laboratory_floor"), modelInstanceWarpedLaboratoryFloor); var modelDataEnlightedWarpedLaboratoryFloor = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/warped_laboratory_floor-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/warped_laboratory_floor-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.WARPED_LABORATORY_FLOOR.get()))) .build(); var modelInstanceEnlightedWarpedLaboratoryFloor = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataEnlightedWarpedLaboratoryFloor); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_warped_laboratory_floor"), modelInstanceEnlightedWarpedLaboratoryFloor); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_warped_laboratory_floor"), modelInstanceEnlightedWarpedLaboratoryFloor); var modelDataWarpedLaboratoryTiles = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/warped_laboratory_tiles-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/warped_laboratory_tiles-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.ENLIGHTED_WARPED_LABORATORY_TILES.get()))) .build(); var modelInstanceWarpedLaboratoryTiles = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataWarpedLaboratoryTiles); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/warped_laboratory_tiles"), modelInstanceWarpedLaboratoryTiles); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/warped_laboratory_tiles"), modelInstanceWarpedLaboratoryTiles); var modelDataEnlightedWarpedLaboratoryTiles = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/warped_laboratory_tiles-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/warped_laboratory_tiles-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.WARPED_LABORATORY_TILES.get()))) .build(); var modelInstanceEnlightedWarpedLaboratoryTiles = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataEnlightedWarpedLaboratoryTiles); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_warped_laboratory_tiles"), modelInstanceEnlightedWarpedLaboratoryTiles); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_warped_laboratory_tiles"), modelInstanceEnlightedWarpedLaboratoryTiles); var modelDataCherryLaboratoryFloor = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/cherry_laboratory_floor-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/cherry_laboratory_floor-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.ENLIGHTED_CHERRY_LABORATORY_FLOOR.get()))) .build(); var modelInstanceCherryLaboratoryFloor = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataCherryLaboratoryFloor); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/cherry_laboratory_floor"), modelInstanceCherryLaboratoryFloor); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/cherry_laboratory_floor"), modelInstanceCherryLaboratoryFloor); var modelDataEnlightedCherryLaboratoryFloor = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/cherry_laboratory_floor-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/cherry_laboratory_floor-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.CHERRY_LABORATORY_FLOOR.get()))) .build(); var modelInstanceEnlightedCherryLaboratoryFloor = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataEnlightedCherryLaboratoryFloor); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_cherry_laboratory_floor"), modelInstanceEnlightedCherryLaboratoryFloor); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_cherry_laboratory_floor"), modelInstanceEnlightedCherryLaboratoryFloor); var modelDataCherryLaboratoryTiles = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/cherry_laboratory_tiles-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/cherry_laboratory_tiles-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.ENLIGHTED_CHERRY_LABORATORY_TILES.get()))) .build(); var modelInstanceCherryLaboratoryTiles = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataCherryLaboratoryTiles); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/cherry_laboratory_tiles"), modelInstanceCherryLaboratoryTiles); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/cherry_laboratory_tiles"), modelInstanceCherryLaboratoryTiles); var modelDataEnlightedCherryLaboratoryTiles = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/cherry_laboratory_tiles-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/cherry_laboratory_tiles-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.CHERRY_LABORATORY_TILES.get()))) .build(); var modelInstanceEnlightedCherryLaboratoryTiles = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataEnlightedCherryLaboratoryTiles); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_cherry_laboratory_tiles"), modelInstanceEnlightedCherryLaboratoryTiles); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_cherry_laboratory_tiles"), modelInstanceEnlightedCherryLaboratoryTiles); var modelDataBambooLaboratoryFloor = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/bamboo_laboratory_floor-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/bamboo_laboratory_floor-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.ENLIGHTED_BAMBOO_LABORATORY_FLOOR.get()))) .build(); var modelInstanceBambooLaboratoryFloor = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataBambooLaboratoryFloor); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/bamboo_laboratory_floor"), modelInstanceBambooLaboratoryFloor); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/bamboo_laboratory_floor"), modelInstanceBambooLaboratoryFloor); var modelDataEnlightedBambooLaboratoryFloor = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/bamboo_laboratory_floor-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/bamboo_laboratory_floor-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.BAMBOO_LABORATORY_FLOOR.get()))) .build(); var modelInstanceEnlightedBambooLaboratoryFloor = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataEnlightedBambooLaboratoryFloor); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_bamboo_laboratory_floor"), modelInstanceEnlightedBambooLaboratoryFloor); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_bamboo_laboratory_floor"), modelInstanceEnlightedBambooLaboratoryFloor); var modelDataBambooLaboratoryTiles = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/bamboo_laboratory_tiles-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/bamboo_laboratory_tiles-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.ENLIGHTED_BAMBOO_LABORATORY_TILES.get()))) .build(); var modelInstanceBambooLaboratoryTiles = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataBambooLaboratoryTiles); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/bamboo_laboratory_tiles"), modelInstanceBambooLaboratoryTiles); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/bamboo_laboratory_tiles"), modelInstanceBambooLaboratoryTiles); var modelDataEnlightedBambooLaboratoryTiles = ConnectingModelDataBuilder.builder() - .parent(new ResourceLocation("minecraft", "block/cube_all")) - .texture("all", new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/bamboo_laboratory_tiles-fusion")) + .parent(ResourceLocation.fromNamespaceAndPath("minecraft", "block/cube_all")) + .texture("all", ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/bamboo_laboratory_tiles-fusion")) .connection(DefaultConnectionPredicates.isSameBlock().or(DefaultConnectionPredicates.matchBlock(ModBlocks.BAMBOO_LABORATORY_TILES.get()))) .build(); var modelInstanceEnlightedBambooLaboratoryTiles = ModelInstance.of(DefaultModelTypes.CONNECTING, modelDataEnlightedBambooLaboratoryTiles); - this.addModel(new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_bamboo_laboratory_tiles"), modelInstanceEnlightedBambooLaboratoryTiles); + this.addModel(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_bamboo_laboratory_tiles"), modelInstanceEnlightedBambooLaboratoryTiles); } } diff --git a/src/main/java/de/artemis/laboratoryblocks/common/data/ItemModelProvider.java b/src/main/java/de/artemis/laboratoryblocks/common/data/ItemModelProvider.java index d8964b4..c874f37 100644 --- a/src/main/java/de/artemis/laboratoryblocks/common/data/ItemModelProvider.java +++ b/src/main/java/de/artemis/laboratoryblocks/common/data/ItemModelProvider.java @@ -3,14 +3,14 @@ import de.artemis.laboratoryblocks.LaboratoryBlocks; import de.artemis.laboratoryblocks.common.registration.ModBlocks; import de.artemis.laboratoryblocks.common.registration.ModItems; +import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.data.PackOutput; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.Item; import net.minecraft.world.level.block.Block; -import net.minecraftforge.common.data.ExistingFileHelper; -import net.minecraftforge.registries.ForgeRegistries; +import net.neoforged.neoforge.common.data.ExistingFileHelper; -public class ItemModelProvider extends net.minecraftforge.client.model.generators.ItemModelProvider { +public class ItemModelProvider extends net.neoforged.neoforge.client.model.generators.ItemModelProvider { public ItemModelProvider(PackOutput packOutput, ExistingFileHelper existingFileHelper) { super(packOutput, LaboratoryBlocks.MOD_ID, existingFileHelper); } @@ -26,109 +26,109 @@ protected void registerModels() { simpleItem(ModItems.CONFIGURATION_TOOL.get()); simpleBlock(ModBlocks.PLA_BLOCK.get()); - cubeAll(ForgeRegistries.BLOCKS.getKey(ModBlocks.ENLIGHTED_PLA_BLOCK.get()).toString(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_pla_block")); + cubeAll(BuiltInRegistries.BLOCK.getKey(ModBlocks.ENLIGHTED_PLA_BLOCK.get()).toString(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_pla_block")); simpleBlock(ModBlocks.PLA_TILES.get()); - cubeAll(ForgeRegistries.BLOCKS.getKey(ModBlocks.ENLIGHTED_PLA_TILES.get()).toString(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_pla_tiles")); + cubeAll(BuiltInRegistries.BLOCK.getKey(ModBlocks.ENLIGHTED_PLA_TILES.get()).toString(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_pla_tiles")); simpleBlock(ModBlocks.LABORATORY_BLOCK.get()); - cubeAll(ForgeRegistries.BLOCKS.getKey(ModBlocks.ENLIGHTED_LABORATORY_BLOCK.get()).toString(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_laboratory_block")); + cubeAll(BuiltInRegistries.BLOCK.getKey(ModBlocks.ENLIGHTED_LABORATORY_BLOCK.get()).toString(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_laboratory_block")); simpleBlock(ModBlocks.LABORATORY_TILES.get()); - cubeAll(ForgeRegistries.BLOCKS.getKey(ModBlocks.ENLIGHTED_LABORATORY_TILES.get()).toString(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_laboratory_tiles")); + cubeAll(BuiltInRegistries.BLOCK.getKey(ModBlocks.ENLIGHTED_LABORATORY_TILES.get()).toString(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_laboratory_tiles")); simpleBlock(ModBlocks.GRAY_LABORATORY_TILES.get()); - cubeAll(ForgeRegistries.BLOCKS.getKey(ModBlocks.ENLIGHTED_GRAY_LABORATORY_TILES.get()).toString(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_gray_laboratory_tiles")); + cubeAll(BuiltInRegistries.BLOCK.getKey(ModBlocks.ENLIGHTED_GRAY_LABORATORY_TILES.get()).toString(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_gray_laboratory_tiles")); simpleBlock(ModBlocks.MIXED_LABORATORY_TILES.get()); - cubeAll(ForgeRegistries.BLOCKS.getKey(ModBlocks.ENLIGHTED_MIXED_LABORATORY_TILES.get()).toString(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_mixed_laboratory_tiles")); + cubeAll(BuiltInRegistries.BLOCK.getKey(ModBlocks.ENLIGHTED_MIXED_LABORATORY_TILES.get()).toString(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_mixed_laboratory_tiles")); simpleBlock(ModBlocks.OAK_LABORATORY_FLOOR.get()); - cubeAll(ForgeRegistries.BLOCKS.getKey(ModBlocks.ENLIGHTED_OAK_LABORATORY_FLOOR.get()).toString(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_oak_laboratory_floor")); + cubeAll(BuiltInRegistries.BLOCK.getKey(ModBlocks.ENLIGHTED_OAK_LABORATORY_FLOOR.get()).toString(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_oak_laboratory_floor")); simpleBlock(ModBlocks.SPRUCE_LABORATORY_FLOOR.get()); - cubeAll(ForgeRegistries.BLOCKS.getKey(ModBlocks.ENLIGHTED_SPRUCE_LABORATORY_FLOOR.get()).toString(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_spruce_laboratory_floor")); + cubeAll(BuiltInRegistries.BLOCK.getKey(ModBlocks.ENLIGHTED_SPRUCE_LABORATORY_FLOOR.get()).toString(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_spruce_laboratory_floor")); simpleBlock(ModBlocks.BIRCH_LABORATORY_FLOOR.get()); - cubeAll(ForgeRegistries.BLOCKS.getKey(ModBlocks.ENLIGHTED_BIRCH_LABORATORY_FLOOR.get()).toString(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_birch_laboratory_floor")); + cubeAll(BuiltInRegistries.BLOCK.getKey(ModBlocks.ENLIGHTED_BIRCH_LABORATORY_FLOOR.get()).toString(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_birch_laboratory_floor")); simpleBlock(ModBlocks.DARK_OAK_LABORATORY_FLOOR.get()); - cubeAll(ForgeRegistries.BLOCKS.getKey(ModBlocks.ENLIGHTED_DARK_OAK_LABORATORY_FLOOR.get()).toString(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_dark_oak_laboratory_floor")); + cubeAll(BuiltInRegistries.BLOCK.getKey(ModBlocks.ENLIGHTED_DARK_OAK_LABORATORY_FLOOR.get()).toString(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_dark_oak_laboratory_floor")); simpleBlock(ModBlocks.JUNGLE_LABORATORY_FLOOR.get()); - cubeAll(ForgeRegistries.BLOCKS.getKey(ModBlocks.ENLIGHTED_JUNGLE_LABORATORY_FLOOR.get()).toString(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_jungle_laboratory_floor")); + cubeAll(BuiltInRegistries.BLOCK.getKey(ModBlocks.ENLIGHTED_JUNGLE_LABORATORY_FLOOR.get()).toString(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_jungle_laboratory_floor")); simpleBlock(ModBlocks.ACACIA_LABORATORY_FLOOR.get()); - cubeAll(ForgeRegistries.BLOCKS.getKey(ModBlocks.ENLIGHTED_ACACIA_LABORATORY_FLOOR.get()).toString(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_acacia_laboratory_floor")); + cubeAll(BuiltInRegistries.BLOCK.getKey(ModBlocks.ENLIGHTED_ACACIA_LABORATORY_FLOOR.get()).toString(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_acacia_laboratory_floor")); simpleBlock(ModBlocks.MANGROVE_LABORATORY_FLOOR.get()); - cubeAll(ForgeRegistries.BLOCKS.getKey(ModBlocks.ENLIGHTED_MANGROVE_LABORATORY_FLOOR.get()).toString(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_mangrove_laboratory_floor")); + cubeAll(BuiltInRegistries.BLOCK.getKey(ModBlocks.ENLIGHTED_MANGROVE_LABORATORY_FLOOR.get()).toString(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_mangrove_laboratory_floor")); simpleBlock(ModBlocks.CRIMSON_LABORATORY_FLOOR.get()); - cubeAll(ForgeRegistries.BLOCKS.getKey(ModBlocks.ENLIGHTED_CRIMSON_LABORATORY_FLOOR.get()).toString(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_crimson_laboratory_floor")); + cubeAll(BuiltInRegistries.BLOCK.getKey(ModBlocks.ENLIGHTED_CRIMSON_LABORATORY_FLOOR.get()).toString(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_crimson_laboratory_floor")); simpleBlock(ModBlocks.WARPED_LABORATORY_FLOOR.get()); - cubeAll(ForgeRegistries.BLOCKS.getKey(ModBlocks.ENLIGHTED_WARPED_LABORATORY_FLOOR.get()).toString(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_warped_laboratory_floor")); + cubeAll(BuiltInRegistries.BLOCK.getKey(ModBlocks.ENLIGHTED_WARPED_LABORATORY_FLOOR.get()).toString(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_warped_laboratory_floor")); simpleBlock(ModBlocks.OAK_LABORATORY_TILES.get()); - cubeAll(ForgeRegistries.BLOCKS.getKey(ModBlocks.ENLIGHTED_OAK_LABORATORY_TILES.get()).toString(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_oak_laboratory_tiles")); + cubeAll(BuiltInRegistries.BLOCK.getKey(ModBlocks.ENLIGHTED_OAK_LABORATORY_TILES.get()).toString(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_oak_laboratory_tiles")); simpleBlock(ModBlocks.SPRUCE_LABORATORY_TILES.get()); - cubeAll(ForgeRegistries.BLOCKS.getKey(ModBlocks.ENLIGHTED_SPRUCE_LABORATORY_TILES.get()).toString(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_spruce_laboratory_tiles")); + cubeAll(BuiltInRegistries.BLOCK.getKey(ModBlocks.ENLIGHTED_SPRUCE_LABORATORY_TILES.get()).toString(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_spruce_laboratory_tiles")); simpleBlock(ModBlocks.BIRCH_LABORATORY_TILES.get()); - cubeAll(ForgeRegistries.BLOCKS.getKey(ModBlocks.ENLIGHTED_BIRCH_LABORATORY_TILES.get()).toString(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_birch_laboratory_tiles")); + cubeAll(BuiltInRegistries.BLOCK.getKey(ModBlocks.ENLIGHTED_BIRCH_LABORATORY_TILES.get()).toString(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_birch_laboratory_tiles")); simpleBlock(ModBlocks.DARK_OAK_LABORATORY_TILES.get()); - cubeAll(ForgeRegistries.BLOCKS.getKey(ModBlocks.ENLIGHTED_DARK_OAK_LABORATORY_TILES.get()).toString(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_dark_oak_laboratory_tiles")); + cubeAll(BuiltInRegistries.BLOCK.getKey(ModBlocks.ENLIGHTED_DARK_OAK_LABORATORY_TILES.get()).toString(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_dark_oak_laboratory_tiles")); simpleBlock(ModBlocks.JUNGLE_LABORATORY_TILES.get()); - cubeAll(ForgeRegistries.BLOCKS.getKey(ModBlocks.ENLIGHTED_JUNGLE_LABORATORY_TILES.get()).toString(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_jungle_laboratory_tiles")); + cubeAll(BuiltInRegistries.BLOCK.getKey(ModBlocks.ENLIGHTED_JUNGLE_LABORATORY_TILES.get()).toString(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_jungle_laboratory_tiles")); simpleBlock(ModBlocks.ACACIA_LABORATORY_TILES.get()); - cubeAll(ForgeRegistries.BLOCKS.getKey(ModBlocks.ENLIGHTED_ACACIA_LABORATORY_TILES.get()).toString(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_acacia_laboratory_tiles")); + cubeAll(BuiltInRegistries.BLOCK.getKey(ModBlocks.ENLIGHTED_ACACIA_LABORATORY_TILES.get()).toString(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_acacia_laboratory_tiles")); simpleBlock(ModBlocks.MANGROVE_LABORATORY_TILES.get()); - cubeAll(ForgeRegistries.BLOCKS.getKey(ModBlocks.ENLIGHTED_MANGROVE_LABORATORY_TILES.get()).toString(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_mangrove_laboratory_tiles")); + cubeAll(BuiltInRegistries.BLOCK.getKey(ModBlocks.ENLIGHTED_MANGROVE_LABORATORY_TILES.get()).toString(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_mangrove_laboratory_tiles")); simpleBlock(ModBlocks.CHERRY_LABORATORY_TILES.get()); - cubeAll(ForgeRegistries.BLOCKS.getKey(ModBlocks.ENLIGHTED_CHERRY_LABORATORY_TILES.get()).toString(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_cherry_laboratory_tiles")); + cubeAll(BuiltInRegistries.BLOCK.getKey(ModBlocks.ENLIGHTED_CHERRY_LABORATORY_TILES.get()).toString(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_cherry_laboratory_tiles")); simpleBlock(ModBlocks.CHERRY_LABORATORY_FLOOR.get()); - cubeAll(ForgeRegistries.BLOCKS.getKey(ModBlocks.ENLIGHTED_CHERRY_LABORATORY_FLOOR.get()).toString(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_cherry_laboratory_floor")); + cubeAll(BuiltInRegistries.BLOCK.getKey(ModBlocks.ENLIGHTED_CHERRY_LABORATORY_FLOOR.get()).toString(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_cherry_laboratory_floor")); simpleBlock(ModBlocks.BAMBOO_LABORATORY_TILES.get()); - cubeAll(ForgeRegistries.BLOCKS.getKey(ModBlocks.ENLIGHTED_BAMBOO_LABORATORY_TILES.get()).toString(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_bamboo_laboratory_tiles")); + cubeAll(BuiltInRegistries.BLOCK.getKey(ModBlocks.ENLIGHTED_BAMBOO_LABORATORY_TILES.get()).toString(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_bamboo_laboratory_tiles")); simpleBlock(ModBlocks.BAMBOO_LABORATORY_FLOOR.get()); - cubeAll(ForgeRegistries.BLOCKS.getKey(ModBlocks.ENLIGHTED_BAMBOO_LABORATORY_FLOOR.get()).toString(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_bamboo_laboratory_floor")); + cubeAll(BuiltInRegistries.BLOCK.getKey(ModBlocks.ENLIGHTED_BAMBOO_LABORATORY_FLOOR.get()).toString(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_bamboo_laboratory_floor")); simpleBlock(ModBlocks.CRIMSON_LABORATORY_TILES.get()); - cubeAll(ForgeRegistries.BLOCKS.getKey(ModBlocks.ENLIGHTED_CRIMSON_LABORATORY_TILES.get()).toString(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_crimson_laboratory_tiles")); + cubeAll(BuiltInRegistries.BLOCK.getKey(ModBlocks.ENLIGHTED_CRIMSON_LABORATORY_TILES.get()).toString(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_crimson_laboratory_tiles")); simpleBlock(ModBlocks.WARPED_LABORATORY_TILES.get()); - cubeAll(ForgeRegistries.BLOCKS.getKey(ModBlocks.ENLIGHTED_WARPED_LABORATORY_TILES.get()).toString(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_warped_laboratory_tiles")); + cubeAll(BuiltInRegistries.BLOCK.getKey(ModBlocks.ENLIGHTED_WARPED_LABORATORY_TILES.get()).toString(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_warped_laboratory_tiles")); simpleBlock(ModBlocks.LABORATORY_GLASS.get()); - cubeAll(ForgeRegistries.BLOCKS.getKey(ModBlocks.ENLIGHTED_LABORATORY_GLASS.get()).toString(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_laboratory_glass_inventory")); + cubeAll(BuiltInRegistries.BLOCK.getKey(ModBlocks.ENLIGHTED_LABORATORY_GLASS.get()).toString(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_laboratory_glass_inventory")); simpleBlock(ModBlocks.LABORATORY_FAN.get()); - cubeAll(ForgeRegistries.BLOCKS.getKey(ModBlocks.ENLIGHTED_LABORATORY_FAN.get()).toString(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_laboratory_fan")); - cubeAll(ForgeRegistries.BLOCKS.getKey(ModBlocks.LABORATORY_FAN_REDSTONE_CONTROLLED.get()).toString(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/laboratory_fan_redstone_controlled")); - cubeAll(ForgeRegistries.BLOCKS.getKey(ModBlocks.ENLIGHTED_LABORATORY_FAN_REDSTONE_CONTROLLED.get()).toString(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_laboratory_fan_redstone_controlled")); + cubeAll(BuiltInRegistries.BLOCK.getKey(ModBlocks.ENLIGHTED_LABORATORY_FAN.get()).toString(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_laboratory_fan")); + cubeAll(BuiltInRegistries.BLOCK.getKey(ModBlocks.LABORATORY_FAN_REDSTONE_CONTROLLED.get()).toString(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/laboratory_fan_redstone_controlled")); + cubeAll(BuiltInRegistries.BLOCK.getKey(ModBlocks.ENLIGHTED_LABORATORY_FAN_REDSTONE_CONTROLLED.get()).toString(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_laboratory_fan_redstone_controlled")); simpleBlock(ModBlocks.SCREWED_LABORATORY_BLOCK.get()); - cubeAll(ForgeRegistries.BLOCKS.getKey(ModBlocks.ENLIGHTED_SCREWED_LABORATORY_BLOCK.get()).toString(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_screwed_laboratory_block")); + cubeAll(BuiltInRegistries.BLOCK.getKey(ModBlocks.ENLIGHTED_SCREWED_LABORATORY_BLOCK.get()).toString(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_screwed_laboratory_block")); simpleBlock(ModBlocks.LABORATORY_VENT.get()); - cubeAll(ForgeRegistries.BLOCKS.getKey(ModBlocks.ENLIGHTED_LABORATORY_VENT.get()).toString(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_laboratory_vent")); - cubeAll(ForgeRegistries.BLOCKS.getKey(ModBlocks.LABORATORY_VENT_CONNECTING.get()).toString(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/laboratory_vent")); - cubeAll(ForgeRegistries.BLOCKS.getKey(ModBlocks.ENLIGHTED_LABORATORY_VENT_CONNECTING.get()).toString(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_laboratory_vent")); + cubeAll(BuiltInRegistries.BLOCK.getKey(ModBlocks.ENLIGHTED_LABORATORY_VENT.get()).toString(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_laboratory_vent")); + cubeAll(BuiltInRegistries.BLOCK.getKey(ModBlocks.LABORATORY_VENT_CONNECTING.get()).toString(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/laboratory_vent")); + cubeAll(BuiltInRegistries.BLOCK.getKey(ModBlocks.ENLIGHTED_LABORATORY_VENT_CONNECTING.get()).toString(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_laboratory_vent")); simpleBlock(ModBlocks.CLEAR_LABORATORY_SCREEN.get()); - cubeAll(ForgeRegistries.BLOCKS.getKey(ModBlocks.ENLIGHTED_CLEAR_LABORATORY_SCREEN.get()).toString(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_clear_laboratory_screen")); + cubeAll(BuiltInRegistries.BLOCK.getKey(ModBlocks.ENLIGHTED_CLEAR_LABORATORY_SCREEN.get()).toString(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_clear_laboratory_screen")); simpleBlock(ModBlocks.LEFT_FACED_BLUE_SIGNALING_LABORATORY_BLOCK.get()); - cubeAll(ForgeRegistries.BLOCKS.getKey(ModBlocks.ENLIGHTED_LEFT_FACED_BLUE_SIGNALING_LABORATORY_BLOCK.get()).toString(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_left-faced_blue_signaling_laboratory_block")); + cubeAll(BuiltInRegistries.BLOCK.getKey(ModBlocks.ENLIGHTED_LEFT_FACED_BLUE_SIGNALING_LABORATORY_BLOCK.get()).toString(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_left-faced_blue_signaling_laboratory_block")); simpleBlock(ModBlocks.RIGHT_FACED_BLUE_SIGNALING_LABORATORY_BLOCK.get()); - cubeAll(ForgeRegistries.BLOCKS.getKey(ModBlocks.ENLIGHTED_RIGHT_FACED_BLUE_SIGNALING_LABORATORY_BLOCK.get()).toString(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_right-faced_blue_signaling_laboratory_block")); + cubeAll(BuiltInRegistries.BLOCK.getKey(ModBlocks.ENLIGHTED_RIGHT_FACED_BLUE_SIGNALING_LABORATORY_BLOCK.get()).toString(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_right-faced_blue_signaling_laboratory_block")); simpleBlock(ModBlocks.LEFT_FACED_RED_SIGNALING_LABORATORY_BLOCK.get()); - cubeAll(ForgeRegistries.BLOCKS.getKey(ModBlocks.ENLIGHTED_LEFT_FACED_RED_SIGNALING_LABORATORY_BLOCK.get()).toString(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_left-faced_red_signaling_laboratory_block")); + cubeAll(BuiltInRegistries.BLOCK.getKey(ModBlocks.ENLIGHTED_LEFT_FACED_RED_SIGNALING_LABORATORY_BLOCK.get()).toString(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_left-faced_red_signaling_laboratory_block")); simpleBlock(ModBlocks.RIGHT_FACED_RED_SIGNALING_LABORATORY_BLOCK.get()); - cubeAll(ForgeRegistries.BLOCKS.getKey(ModBlocks.ENLIGHTED_RIGHT_FACED_RED_SIGNALING_LABORATORY_BLOCK.get()).toString(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_right-faced_red_signaling_laboratory_block")); + cubeAll(BuiltInRegistries.BLOCK.getKey(ModBlocks.ENLIGHTED_RIGHT_FACED_RED_SIGNALING_LABORATORY_BLOCK.get()).toString(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_right-faced_red_signaling_laboratory_block")); simpleBlock(ModBlocks.LEFT_FACED_GREEN_SIGNALING_LABORATORY_BLOCK.get()); - cubeAll(ForgeRegistries.BLOCKS.getKey(ModBlocks.ENLIGHTED_LEFT_FACED_GREEN_SIGNALING_LABORATORY_BLOCK.get()).toString(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_left-faced_green_signaling_laboratory_block")); + cubeAll(BuiltInRegistries.BLOCK.getKey(ModBlocks.ENLIGHTED_LEFT_FACED_GREEN_SIGNALING_LABORATORY_BLOCK.get()).toString(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_left-faced_green_signaling_laboratory_block")); simpleBlock(ModBlocks.RIGHT_FACED_GREEN_SIGNALING_LABORATORY_BLOCK.get()); - cubeAll(ForgeRegistries.BLOCKS.getKey(ModBlocks.ENLIGHTED_RIGHT_FACED_GREEN_SIGNALING_LABORATORY_BLOCK.get()).toString(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_right-faced_green_signaling_laboratory_block")); + cubeAll(BuiltInRegistries.BLOCK.getKey(ModBlocks.ENLIGHTED_RIGHT_FACED_GREEN_SIGNALING_LABORATORY_BLOCK.get()).toString(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_right-faced_green_signaling_laboratory_block")); simpleBlock(ModBlocks.LABORATORY_PILLAR.get()); - cubeColumn(ForgeRegistries.BLOCKS.getKey(ModBlocks.ENLIGHTED_LABORATORY_PILLAR.get()).toString(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_laboratory_pillar"), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_laboratory_pillar_top")); + cubeColumn(BuiltInRegistries.BLOCK.getKey(ModBlocks.ENLIGHTED_LABORATORY_PILLAR.get()).toString(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_laboratory_pillar"), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_laboratory_pillar_top")); simpleBlock(ModBlocks.GRAY_LABORATORY_PILLAR.get()); - cubeColumn(ForgeRegistries.BLOCKS.getKey(ModBlocks.ENLIGHTED_GRAY_LABORATORY_PILLAR.get()).toString(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_gray_laboratory_pillar"), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_gray_laboratory_pillar_top")); + cubeColumn(BuiltInRegistries.BLOCK.getKey(ModBlocks.ENLIGHTED_GRAY_LABORATORY_PILLAR.get()).toString(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_gray_laboratory_pillar"), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_gray_laboratory_pillar_top")); simpleBlock(ModBlocks.LABORATORY_BOOKSHELF.get()); - cubeColumn(ForgeRegistries.BLOCKS.getKey(ModBlocks.ENLIGHTED_LABORATORY_BOOKSHELF.get()).toString(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_laboratory_bookshelf"), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_laboratory_bookshelf_top")); + cubeColumn(BuiltInRegistries.BLOCK.getKey(ModBlocks.ENLIGHTED_LABORATORY_BOOKSHELF.get()).toString(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_laboratory_bookshelf"), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_laboratory_bookshelf_top")); - carpet(ForgeRegistries.BLOCKS.getKey(ModBlocks.PLA_FLOORING.get()).toString(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/pla_block")); - carpet(ForgeRegistries.BLOCKS.getKey(ModBlocks.ENLIGHTED_PLA_FLOORING.get()).toString(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_pla_block")); - carpet(ForgeRegistries.BLOCKS.getKey(ModBlocks.TILED_PLA_FLOORING.get()).toString(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/pla_tiles")); - carpet(ForgeRegistries.BLOCKS.getKey(ModBlocks.ENLIGHTED_TILED_PLA_FLOORING.get()).toString(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/enlighted_pla_tiles")); + carpet(BuiltInRegistries.BLOCK.getKey(ModBlocks.PLA_FLOORING.get()).toString(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/pla_block")); + carpet(BuiltInRegistries.BLOCK.getKey(ModBlocks.ENLIGHTED_PLA_FLOORING.get()).toString(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_pla_block")); + carpet(BuiltInRegistries.BLOCK.getKey(ModBlocks.TILED_PLA_FLOORING.get()).toString(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/pla_tiles")); + carpet(BuiltInRegistries.BLOCK.getKey(ModBlocks.ENLIGHTED_TILED_PLA_FLOORING.get()).toString(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/enlighted_pla_tiles")); } private void simpleItem(Item item) { - withExistingParent(DataProvider.getRegistryName(item), "item/generated").texture("layer0", new ResourceLocation(this.modid, "item/" + + withExistingParent(DataProvider.getRegistryName(item), "item/generated").texture("layer0", ResourceLocation.fromNamespaceAndPath(this.modid, "item/" + DataProvider.getRawRegistryName(item))); } private void simpleBlock(Block block) { - withExistingParent(DataProvider.getRegistryName(block), new ResourceLocation(this.modid, "block/" + DataProvider.getRawRegistryName(block))); + withExistingParent(DataProvider.getRegistryName(block), ResourceLocation.fromNamespaceAndPath(this.modid, "block/" + DataProvider.getRawRegistryName(block))); } } diff --git a/src/main/java/de/artemis/laboratoryblocks/common/data/LanguageProvider.java b/src/main/java/de/artemis/laboratoryblocks/common/data/LanguageProvider.java index 37c3e2a..353f1a7 100644 --- a/src/main/java/de/artemis/laboratoryblocks/common/data/LanguageProvider.java +++ b/src/main/java/de/artemis/laboratoryblocks/common/data/LanguageProvider.java @@ -5,7 +5,7 @@ import de.artemis.laboratoryblocks.common.registration.ModItems; import net.minecraft.data.PackOutput; -public class LanguageProvider extends net.minecraftforge.common.data.LanguageProvider { +public class LanguageProvider extends net.neoforged.neoforge.common.data.LanguageProvider { public LanguageProvider(PackOutput packOutput, String locale) { super(packOutput, LaboratoryBlocks.MOD_ID, locale); } diff --git a/src/main/java/de/artemis/laboratoryblocks/common/data/ModelAndBlockStateProvider.java b/src/main/java/de/artemis/laboratoryblocks/common/data/ModelAndBlockStateProvider.java index 3780367..c4862a1 100644 --- a/src/main/java/de/artemis/laboratoryblocks/common/data/ModelAndBlockStateProvider.java +++ b/src/main/java/de/artemis/laboratoryblocks/common/data/ModelAndBlockStateProvider.java @@ -2,14 +2,14 @@ import de.artemis.laboratoryblocks.LaboratoryBlocks; import de.artemis.laboratoryblocks.common.registration.ModBlocks; +import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.data.PackOutput; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.block.Block; -import net.minecraftforge.client.model.generators.BlockStateProvider; -import net.minecraftforge.client.model.generators.ConfiguredModel; -import net.minecraftforge.client.model.generators.ModelFile; -import net.minecraftforge.common.data.ExistingFileHelper; -import net.minecraftforge.registries.ForgeRegistries; +import net.neoforged.neoforge.client.model.generators.BlockStateProvider; +import net.neoforged.neoforge.client.model.generators.ConfiguredModel; +import net.neoforged.neoforge.client.model.generators.ModelFile; +import net.neoforged.neoforge.common.data.ExistingFileHelper; public class ModelAndBlockStateProvider extends BlockStateProvider { public ModelAndBlockStateProvider(PackOutput packOutput, ExistingFileHelper exFileHelper) { @@ -19,105 +19,105 @@ public ModelAndBlockStateProvider(PackOutput packOutput, ExistingFileHelper exFi @Override protected void registerStatesAndModels() { simpleBlock(ModBlocks.LABORATORY_BLOCK.get()); - block(ModBlocks.ENLIGHTED_LABORATORY_BLOCK.get(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/laboratory_block")); + block(ModBlocks.ENLIGHTED_LABORATORY_BLOCK.get(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/laboratory_block")); simpleBlock(ModBlocks.LABORATORY_TILES.get()); - block(ModBlocks.ENLIGHTED_LABORATORY_TILES.get(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/laboratory_tiles")); + block(ModBlocks.ENLIGHTED_LABORATORY_TILES.get(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/laboratory_tiles")); simpleBlock(ModBlocks.GRAY_LABORATORY_TILES.get()); - block(ModBlocks.ENLIGHTED_GRAY_LABORATORY_TILES.get(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/gray_laboratory_tiles")); + block(ModBlocks.ENLIGHTED_GRAY_LABORATORY_TILES.get(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/gray_laboratory_tiles")); simpleBlock(ModBlocks.MIXED_LABORATORY_TILES.get()); - block(ModBlocks.ENLIGHTED_MIXED_LABORATORY_TILES.get(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/mixed_laboratory_tiles")); + block(ModBlocks.ENLIGHTED_MIXED_LABORATORY_TILES.get(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/mixed_laboratory_tiles")); simpleBlock(ModBlocks.OAK_LABORATORY_FLOOR.get()); - block(ModBlocks.ENLIGHTED_OAK_LABORATORY_FLOOR.get(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/oak_laboratory_floor")); + block(ModBlocks.ENLIGHTED_OAK_LABORATORY_FLOOR.get(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/oak_laboratory_floor")); simpleBlock(ModBlocks.SPRUCE_LABORATORY_FLOOR.get()); - block(ModBlocks.ENLIGHTED_SPRUCE_LABORATORY_FLOOR.get(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/spruce_laboratory_floor")); + block(ModBlocks.ENLIGHTED_SPRUCE_LABORATORY_FLOOR.get(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/spruce_laboratory_floor")); simpleBlock(ModBlocks.BIRCH_LABORATORY_FLOOR.get()); - block(ModBlocks.ENLIGHTED_BIRCH_LABORATORY_FLOOR.get(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/birch_laboratory_floor")); + block(ModBlocks.ENLIGHTED_BIRCH_LABORATORY_FLOOR.get(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/birch_laboratory_floor")); simpleBlock(ModBlocks.DARK_OAK_LABORATORY_FLOOR.get()); - block(ModBlocks.ENLIGHTED_DARK_OAK_LABORATORY_FLOOR.get(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/dark_oak_laboratory_floor")); + block(ModBlocks.ENLIGHTED_DARK_OAK_LABORATORY_FLOOR.get(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/dark_oak_laboratory_floor")); simpleBlock(ModBlocks.JUNGLE_LABORATORY_FLOOR.get()); - block(ModBlocks.ENLIGHTED_JUNGLE_LABORATORY_FLOOR.get(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/jungle_laboratory_floor")); + block(ModBlocks.ENLIGHTED_JUNGLE_LABORATORY_FLOOR.get(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/jungle_laboratory_floor")); simpleBlock(ModBlocks.ACACIA_LABORATORY_FLOOR.get()); - block(ModBlocks.ENLIGHTED_ACACIA_LABORATORY_FLOOR.get(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/acacia_laboratory_floor")); + block(ModBlocks.ENLIGHTED_ACACIA_LABORATORY_FLOOR.get(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/acacia_laboratory_floor")); simpleBlock(ModBlocks.MANGROVE_LABORATORY_FLOOR.get()); - block(ModBlocks.ENLIGHTED_MANGROVE_LABORATORY_FLOOR.get(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/mangrove_laboratory_floor")); + block(ModBlocks.ENLIGHTED_MANGROVE_LABORATORY_FLOOR.get(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/mangrove_laboratory_floor")); simpleBlock(ModBlocks.CRIMSON_LABORATORY_FLOOR.get()); - block(ModBlocks.ENLIGHTED_CRIMSON_LABORATORY_FLOOR.get(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/crimson_laboratory_floor")); + block(ModBlocks.ENLIGHTED_CRIMSON_LABORATORY_FLOOR.get(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/crimson_laboratory_floor")); simpleBlock(ModBlocks.WARPED_LABORATORY_FLOOR.get()); - block(ModBlocks.ENLIGHTED_WARPED_LABORATORY_FLOOR.get(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/warped_laboratory_floor")); + block(ModBlocks.ENLIGHTED_WARPED_LABORATORY_FLOOR.get(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/warped_laboratory_floor")); simpleBlock(ModBlocks.CHERRY_LABORATORY_FLOOR.get()); - block(ModBlocks.ENLIGHTED_CHERRY_LABORATORY_FLOOR.get(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/cherry_laboratory_floor")); + block(ModBlocks.ENLIGHTED_CHERRY_LABORATORY_FLOOR.get(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/cherry_laboratory_floor")); simpleBlock(ModBlocks.BAMBOO_LABORATORY_FLOOR.get()); - block(ModBlocks.ENLIGHTED_BAMBOO_LABORATORY_FLOOR.get(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/bamboo_laboratory_floor")); + block(ModBlocks.ENLIGHTED_BAMBOO_LABORATORY_FLOOR.get(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/bamboo_laboratory_floor")); simpleBlock(ModBlocks.OAK_LABORATORY_TILES.get()); - block(ModBlocks.ENLIGHTED_OAK_LABORATORY_TILES.get(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/oak_laboratory_tiles")); + block(ModBlocks.ENLIGHTED_OAK_LABORATORY_TILES.get(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/oak_laboratory_tiles")); simpleBlock(ModBlocks.SPRUCE_LABORATORY_TILES.get()); - block(ModBlocks.ENLIGHTED_SPRUCE_LABORATORY_TILES.get(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/spruce_laboratory_tiles")); + block(ModBlocks.ENLIGHTED_SPRUCE_LABORATORY_TILES.get(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/spruce_laboratory_tiles")); simpleBlock(ModBlocks.BIRCH_LABORATORY_TILES.get()); - block(ModBlocks.ENLIGHTED_BIRCH_LABORATORY_TILES.get(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/birch_laboratory_tiles")); + block(ModBlocks.ENLIGHTED_BIRCH_LABORATORY_TILES.get(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/birch_laboratory_tiles")); simpleBlock(ModBlocks.DARK_OAK_LABORATORY_TILES.get()); - block(ModBlocks.ENLIGHTED_DARK_OAK_LABORATORY_TILES.get(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/dark_oak_laboratory_tiles")); + block(ModBlocks.ENLIGHTED_DARK_OAK_LABORATORY_TILES.get(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/dark_oak_laboratory_tiles")); simpleBlock(ModBlocks.JUNGLE_LABORATORY_TILES.get()); - block(ModBlocks.ENLIGHTED_JUNGLE_LABORATORY_TILES.get(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/jungle_laboratory_tiles")); + block(ModBlocks.ENLIGHTED_JUNGLE_LABORATORY_TILES.get(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/jungle_laboratory_tiles")); simpleBlock(ModBlocks.ACACIA_LABORATORY_TILES.get()); - block(ModBlocks.ENLIGHTED_ACACIA_LABORATORY_TILES.get(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/acacia_laboratory_tiles")); + block(ModBlocks.ENLIGHTED_ACACIA_LABORATORY_TILES.get(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/acacia_laboratory_tiles")); simpleBlock(ModBlocks.MANGROVE_LABORATORY_TILES.get()); - block(ModBlocks.ENLIGHTED_MANGROVE_LABORATORY_TILES.get(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/mangrove_laboratory_tiles")); + block(ModBlocks.ENLIGHTED_MANGROVE_LABORATORY_TILES.get(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/mangrove_laboratory_tiles")); simpleBlock(ModBlocks.CRIMSON_LABORATORY_TILES.get()); - block(ModBlocks.ENLIGHTED_CRIMSON_LABORATORY_TILES.get(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/crimson_laboratory_tiles")); + block(ModBlocks.ENLIGHTED_CRIMSON_LABORATORY_TILES.get(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/crimson_laboratory_tiles")); simpleBlock(ModBlocks.WARPED_LABORATORY_TILES.get()); - block(ModBlocks.ENLIGHTED_WARPED_LABORATORY_TILES.get(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/warped_laboratory_tiles")); + block(ModBlocks.ENLIGHTED_WARPED_LABORATORY_TILES.get(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/warped_laboratory_tiles")); simpleBlock(ModBlocks.CHERRY_LABORATORY_TILES.get()); - block(ModBlocks.ENLIGHTED_CHERRY_LABORATORY_TILES.get(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/cherry_laboratory_tiles")); + block(ModBlocks.ENLIGHTED_CHERRY_LABORATORY_TILES.get(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/cherry_laboratory_tiles")); simpleBlock(ModBlocks.BAMBOO_LABORATORY_TILES.get()); - block(ModBlocks.ENLIGHTED_BAMBOO_LABORATORY_TILES.get(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/bamboo_laboratory_tiles")); + block(ModBlocks.ENLIGHTED_BAMBOO_LABORATORY_TILES.get(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/bamboo_laboratory_tiles")); simpleBlock(ModBlocks.LABORATORY_FAN.get()); - block(ModBlocks.ENLIGHTED_LABORATORY_FAN.get(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/laboratory_fan")); + block(ModBlocks.ENLIGHTED_LABORATORY_FAN.get(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/laboratory_fan")); simpleBlock(ModBlocks.SCREWED_LABORATORY_BLOCK.get()); - block(ModBlocks.ENLIGHTED_SCREWED_LABORATORY_BLOCK.get(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/screwed_laboratory_block")); + block(ModBlocks.ENLIGHTED_SCREWED_LABORATORY_BLOCK.get(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/screwed_laboratory_block")); simpleBlock(ModBlocks.LABORATORY_VENT.get()); - block(ModBlocks.ENLIGHTED_LABORATORY_VENT.get(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/laboratory_vent")); + block(ModBlocks.ENLIGHTED_LABORATORY_VENT.get(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/laboratory_vent")); simpleBlock(ModBlocks.LABORATORY_VENT_CONNECTING.get()); - block(ModBlocks.ENLIGHTED_LABORATORY_VENT_CONNECTING.get(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/laboratory_vent_connecting")); + block(ModBlocks.ENLIGHTED_LABORATORY_VENT_CONNECTING.get(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/laboratory_vent_connecting")); simpleBlock(ModBlocks.CLEAR_LABORATORY_SCREEN.get()); - block(ModBlocks.ENLIGHTED_CLEAR_LABORATORY_SCREEN.get(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/clear_laboratory_screen")); + block(ModBlocks.ENLIGHTED_CLEAR_LABORATORY_SCREEN.get(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/clear_laboratory_screen")); simpleBlock(ModBlocks.LEFT_FACED_BLUE_SIGNALING_LABORATORY_BLOCK.get()); - block(ModBlocks.ENLIGHTED_LEFT_FACED_BLUE_SIGNALING_LABORATORY_BLOCK.get(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/left-faced_blue_signaling_laboratory_block")); + block(ModBlocks.ENLIGHTED_LEFT_FACED_BLUE_SIGNALING_LABORATORY_BLOCK.get(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/left-faced_blue_signaling_laboratory_block")); simpleBlock(ModBlocks.RIGHT_FACED_BLUE_SIGNALING_LABORATORY_BLOCK.get()); - block(ModBlocks.ENLIGHTED_RIGHT_FACED_BLUE_SIGNALING_LABORATORY_BLOCK.get(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/right-faced_blue_signaling_laboratory_block")); + block(ModBlocks.ENLIGHTED_RIGHT_FACED_BLUE_SIGNALING_LABORATORY_BLOCK.get(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/right-faced_blue_signaling_laboratory_block")); simpleBlock(ModBlocks.LEFT_FACED_RED_SIGNALING_LABORATORY_BLOCK.get()); - block(ModBlocks.ENLIGHTED_LEFT_FACED_RED_SIGNALING_LABORATORY_BLOCK.get(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/left-faced_red_signaling_laboratory_block")); + block(ModBlocks.ENLIGHTED_LEFT_FACED_RED_SIGNALING_LABORATORY_BLOCK.get(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/left-faced_red_signaling_laboratory_block")); simpleBlock(ModBlocks.RIGHT_FACED_RED_SIGNALING_LABORATORY_BLOCK.get()); - block(ModBlocks.ENLIGHTED_RIGHT_FACED_RED_SIGNALING_LABORATORY_BLOCK.get(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/right-faced_red_signaling_laboratory_block")); + block(ModBlocks.ENLIGHTED_RIGHT_FACED_RED_SIGNALING_LABORATORY_BLOCK.get(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/right-faced_red_signaling_laboratory_block")); simpleBlock(ModBlocks.LEFT_FACED_GREEN_SIGNALING_LABORATORY_BLOCK.get()); - block(ModBlocks.ENLIGHTED_LEFT_FACED_GREEN_SIGNALING_LABORATORY_BLOCK.get(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/left-faced_green_signaling_laboratory_block")); + block(ModBlocks.ENLIGHTED_LEFT_FACED_GREEN_SIGNALING_LABORATORY_BLOCK.get(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/left-faced_green_signaling_laboratory_block")); simpleBlock(ModBlocks.RIGHT_FACED_GREEN_SIGNALING_LABORATORY_BLOCK.get()); - block(ModBlocks.ENLIGHTED_RIGHT_FACED_GREEN_SIGNALING_LABORATORY_BLOCK.get(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/right-faced_green_signaling_laboratory_block")); + block(ModBlocks.ENLIGHTED_RIGHT_FACED_GREEN_SIGNALING_LABORATORY_BLOCK.get(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/right-faced_green_signaling_laboratory_block")); simpleBlockWithRenderType(ModBlocks.LABORATORY_GLASS.get(), "cutout"); simpleBlockWithRenderType(ModBlocks.ENLIGHTED_LABORATORY_GLASS.get(), "cutout"); simpleBlock(ModBlocks.PLA_BLOCK.get()); - block(ModBlocks.ENLIGHTED_PLA_BLOCK.get(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/pla_block")); + block(ModBlocks.ENLIGHTED_PLA_BLOCK.get(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/pla_block")); simpleBlock(ModBlocks.PLA_TILES.get()); - block(ModBlocks.ENLIGHTED_PLA_TILES.get(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/pla_tiles")); + block(ModBlocks.ENLIGHTED_PLA_TILES.get(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/pla_tiles")); - pillarBlock(ModBlocks.LABORATORY_PILLAR.get(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/laboratory_pillar"), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/laboratory_pillar_top")); - pillarBlock(ModBlocks.ENLIGHTED_LABORATORY_PILLAR.get(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/laboratory_pillar"), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/laboratory_pillar_top")); - pillarBlock(ModBlocks.GRAY_LABORATORY_PILLAR.get(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/gray_laboratory_pillar"), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/gray_laboratory_pillar_top")); - pillarBlock(ModBlocks.ENLIGHTED_GRAY_LABORATORY_PILLAR.get(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/gray_laboratory_pillar"), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/gray_laboratory_pillar_top")); - pillarBlock(ModBlocks.LABORATORY_BOOKSHELF.get(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/laboratory_bookshelf"), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/laboratory_bookshelf_top")); - pillarBlock(ModBlocks.ENLIGHTED_LABORATORY_BOOKSHELF.get(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/laboratory_bookshelf"), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/laboratory_bookshelf_top")); + pillarBlock(ModBlocks.LABORATORY_PILLAR.get(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/laboratory_pillar"), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/laboratory_pillar_top")); + pillarBlock(ModBlocks.ENLIGHTED_LABORATORY_PILLAR.get(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/laboratory_pillar"), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/laboratory_pillar_top")); + pillarBlock(ModBlocks.GRAY_LABORATORY_PILLAR.get(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/gray_laboratory_pillar"), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/gray_laboratory_pillar_top")); + pillarBlock(ModBlocks.ENLIGHTED_GRAY_LABORATORY_PILLAR.get(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/gray_laboratory_pillar"), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/gray_laboratory_pillar_top")); + pillarBlock(ModBlocks.LABORATORY_BOOKSHELF.get(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/laboratory_bookshelf"), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/laboratory_bookshelf_top")); + pillarBlock(ModBlocks.ENLIGHTED_LABORATORY_BOOKSHELF.get(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/laboratory_bookshelf"), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/laboratory_bookshelf_top")); - carpetBlock(ModBlocks.PLA_FLOORING.get(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/pla_block")); - carpetBlock(ModBlocks.ENLIGHTED_PLA_FLOORING.get(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/pla_block")); - carpetBlock(ModBlocks.TILED_PLA_FLOORING.get(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/pla_tiles")); - carpetBlock(ModBlocks.ENLIGHTED_TILED_PLA_FLOORING.get(), new ResourceLocation(LaboratoryBlocks.MOD_ID, "block/pla_tiles")); + carpetBlock(ModBlocks.PLA_FLOORING.get(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/pla_block")); + carpetBlock(ModBlocks.ENLIGHTED_PLA_FLOORING.get(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/pla_block")); + carpetBlock(ModBlocks.TILED_PLA_FLOORING.get(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/pla_tiles")); + carpetBlock(ModBlocks.ENLIGHTED_TILED_PLA_FLOORING.get(), ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, "block/pla_tiles")); } public void block(Block block, ResourceLocation texture) { - simpleBlock(block, models().withExistingParent(ForgeRegistries.BLOCKS.getKey(block).toString(), new ResourceLocation("block/cube_all")) + simpleBlock(block, models().withExistingParent(BuiltInRegistries.BLOCK.getKey(block).toString(), ResourceLocation.withDefaultNamespace("block/cube_all")) .texture("all", texture)); } @@ -126,11 +126,11 @@ public void simpleBlockWithRenderType(Block block, String renderType) { } public ModelFile cubeAllWithRenderType(Block block, String renderType) { - return models().cubeAll(ForgeRegistries.BLOCKS.getKey(block).toString(), blockTexture(block)).renderType(renderType); + return models().cubeAll(BuiltInRegistries.BLOCK.getKey(block).toString(), blockTexture(block)).renderType(renderType); } public void blockWithRenderType(Block block, ResourceLocation texture, String renderType) { - simpleBlock(block, models().withExistingParent(ForgeRegistries.BLOCKS.getKey(block).toString(), new ResourceLocation("block/cube_all")) + simpleBlock(block, models().withExistingParent(BuiltInRegistries.BLOCK.getKey(block).toString(), ResourceLocation.withDefaultNamespace("block/cube_all")) .texture("all", texture).renderType(renderType)); } diff --git a/src/main/java/de/artemis/laboratoryblocks/common/data/RecipesProvider.java b/src/main/java/de/artemis/laboratoryblocks/common/data/RecipesProvider.java index ca50ea4..5f68a5a 100644 --- a/src/main/java/de/artemis/laboratoryblocks/common/data/RecipesProvider.java +++ b/src/main/java/de/artemis/laboratoryblocks/common/data/RecipesProvider.java @@ -3,24 +3,25 @@ import de.artemis.laboratoryblocks.common.registration.ModBlocks; import de.artemis.laboratoryblocks.common.registration.ModItems; import de.artemis.laboratoryblocks.common.registration.ModTags; +import net.minecraft.core.HolderLookup; import net.minecraft.data.PackOutput; import net.minecraft.data.recipes.*; import net.minecraft.tags.ItemTags; import net.minecraft.world.item.Items; import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.level.block.Blocks; -import net.minecraftforge.common.crafting.conditions.IConditionBuilder; +import net.neoforged.neoforge.common.conditions.IConditionBuilder; import org.jetbrains.annotations.NotNull; -import java.util.function.Consumer; +import java.util.concurrent.CompletableFuture; public class RecipesProvider extends RecipeProvider implements IConditionBuilder { - public RecipesProvider(PackOutput packOutput) { - super(packOutput); + public RecipesProvider(PackOutput packOutput, CompletableFuture registries) { + super(packOutput, registries); } @Override - protected void buildRecipes(@NotNull Consumer consumer) { + protected void buildRecipes(@NotNull RecipeOutput consumer) { ShapedRecipeBuilder.shaped(RecipeCategory.MISC, ModItems.CONFIGURATION_TOOL.get(), 1).define('A', Items.IRON_INGOT).define('B', Items.ORANGE_WOOL).define('C', ModItems.IRON_SCREW.get()).define('D', Items.IRON_NUGGET).pattern(" C").pattern("DB ").pattern("AD ").unlockedBy("has_iron_ingot", has(Items.IRON_INGOT)).unlockedBy("has_orange_wool", has(Items.ORANGE_WOOL)).unlockedBy("has_iron_screw", has(ModItems.IRON_SCREW.get())).unlockedBy("has_iron_nugget", has(Items.IRON_NUGGET)).save(consumer); ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, ModItems.STARCH.get(), 1).requires(Ingredient.of(ModTags.Item.STARCH_INGREDIENT), 4).unlockedBy("has_sugar", has(Items.SUGAR)).unlockedBy("has_sugar_cane", has(Items.SUGAR_CANE)).unlockedBy("has_beetroot", has(Items.BEETROOT)).unlockedBy("has_wheat", has(Items.WHEAT)).save(consumer); diff --git a/src/main/java/de/artemis/laboratoryblocks/common/data/TagsProvider.java b/src/main/java/de/artemis/laboratoryblocks/common/data/TagsProvider.java index ac40cd4..ce9a82a 100644 --- a/src/main/java/de/artemis/laboratoryblocks/common/data/TagsProvider.java +++ b/src/main/java/de/artemis/laboratoryblocks/common/data/TagsProvider.java @@ -4,6 +4,7 @@ import de.artemis.laboratoryblocks.common.registration.ModBlocks; import de.artemis.laboratoryblocks.common.registration.ModTags; import net.minecraft.core.HolderLookup; +import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.core.registries.Registries; import net.minecraft.data.PackOutput; import net.minecraft.resources.ResourceKey; @@ -12,8 +13,7 @@ import net.minecraft.world.item.Item; import net.minecraft.world.item.Items; import net.minecraft.world.level.block.Block; -import net.minecraftforge.common.data.ExistingFileHelper; -import net.minecraftforge.registries.ForgeRegistries; +import net.neoforged.neoforge.common.data.ExistingFileHelper; import org.jetbrains.annotations.NotNull; import java.nio.file.Path; @@ -36,7 +36,7 @@ protected void addTags(@NotNull HolderLookup.Provider provider) { } private ResourceKey getKey(Block block) { - return ForgeRegistries.BLOCKS.getResourceKey(block).get(); + return BuiltInRegistries.BLOCK.getResourceKey(block).get(); } @NotNull @@ -66,7 +66,7 @@ protected void addTags(@NotNull HolderLookup.Provider provider) { } private ResourceKey getKey(Item item) { - return ForgeRegistries.ITEMS.getResourceKey(item).get(); + return BuiltInRegistries.ITEM.getResourceKey(item).get(); } @NotNull diff --git a/src/main/java/de/artemis/laboratoryblocks/common/event/ModEvents.java b/src/main/java/de/artemis/laboratoryblocks/common/event/ModEvents.java index 46a6046..c1839da 100644 --- a/src/main/java/de/artemis/laboratoryblocks/common/event/ModEvents.java +++ b/src/main/java/de/artemis/laboratoryblocks/common/event/ModEvents.java @@ -5,12 +5,12 @@ import de.artemis.laboratoryblocks.client.particle.custom.ApplyingRedstoneParticle; import de.artemis.laboratoryblocks.client.particle.custom.RemovingModifierParticle; import de.artemis.laboratoryblocks.common.registration.ModParticles; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.client.event.RegisterParticleProvidersEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; +import net.neoforged.api.distmarker.Dist; +import net.neoforged.bus.api.SubscribeEvent; +import net.neoforged.fml.common.EventBusSubscriber; +import net.neoforged.neoforge.client.event.RegisterParticleProvidersEvent; -@Mod.EventBusSubscriber(modid = LaboratoryBlocks.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD, value = Dist.CLIENT) +@EventBusSubscriber(modid = LaboratoryBlocks.MOD_ID, bus = EventBusSubscriber.Bus.MOD, value = Dist.CLIENT) public class ModEvents { @SubscribeEvent diff --git a/src/main/java/de/artemis/laboratoryblocks/common/items/ConfigurationToolItem.java b/src/main/java/de/artemis/laboratoryblocks/common/items/ConfigurationToolItem.java index 789005e..f49d24c 100644 --- a/src/main/java/de/artemis/laboratoryblocks/common/items/ConfigurationToolItem.java +++ b/src/main/java/de/artemis/laboratoryblocks/common/items/ConfigurationToolItem.java @@ -8,10 +8,7 @@ import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; -import net.minecraft.world.level.Level; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - import java.util.List; public class ConfigurationToolItem extends Item { @@ -20,13 +17,13 @@ public ConfigurationToolItem(Properties properties) { } @Override - public void appendHoverText(@NotNull ItemStack itemStack, @Nullable Level level, @NotNull List tooltip, @NotNull TooltipFlag flag) { + public void appendHoverText(@NotNull ItemStack itemStack, @NotNull TooltipContext context, @NotNull List tooltip, @NotNull TooltipFlag flag) { if (KeyBindingUtil.isKeyPressed(ModKeyBindings.SHOW_INFORMATION)) { tooltip.add(Component.translatable("tooltip.laboratoryblocks.configuration_tool", Component.literal(ModKeyBindings.REMOVE_GLOWSTONE_CONFIGURATION_TOOL_ACTION.getKey().getDisplayName().getString()).withStyle(Style.EMPTY.withColor(0x549CFC)), Component.literal(ModKeyBindings.REMOVE_REDSTONE_CONFIGURATION_TOOL_ACTION.getKey().getDisplayName().getString()).withStyle(Style.EMPTY.withColor(0x549CFC))).withStyle(ChatFormatting.GRAY)); } else { tooltip.add(Component.translatable("tooltip.laboratoryblocks.configuration_tool_preview", Component.literal(ModKeyBindings.REMOVE_GLOWSTONE_CONFIGURATION_TOOL_ACTION.getKey().getDisplayName().getString()).withStyle(Style.EMPTY.withColor(0x549CFC))).withStyle(ChatFormatting.GRAY)); } - super.appendHoverText(itemStack, level, tooltip, flag); + super.appendHoverText(itemStack, context, tooltip, flag); } } diff --git a/src/main/java/de/artemis/laboratoryblocks/common/registration/ModBlockEntities.java b/src/main/java/de/artemis/laboratoryblocks/common/registration/ModBlockEntities.java index 20f0ecc..55ea46e 100644 --- a/src/main/java/de/artemis/laboratoryblocks/common/registration/ModBlockEntities.java +++ b/src/main/java/de/artemis/laboratoryblocks/common/registration/ModBlockEntities.java @@ -1,12 +1,13 @@ package de.artemis.laboratoryblocks.common.registration; +import java.util.function.Supplier; + import de.artemis.laboratoryblocks.common.blockentities.ChiseledLaboratoryBookShelfBlockEntity; import net.minecraft.world.level.block.entity.BlockEntityType; -import net.minecraftforge.registries.RegistryObject; public class ModBlockEntities { - public static final RegistryObject> CHISELED_LABORATORY_BOOKSHELF_BLOCK_ENTITY = + public static final Supplier> CHISELED_LABORATORY_BOOKSHELF_BLOCK_ENTITY = Registration.BLOCK_ENTITIES.register("chiseled_laboratory_bookshelf_block_entity", () -> BlockEntityType.Builder.of(ChiseledLaboratoryBookShelfBlockEntity::new, ModBlocks.CHISELED_LABORATORY_BOOKSHELF.get()).build(null)); diff --git a/src/main/java/de/artemis/laboratoryblocks/common/registration/ModBlocks.java b/src/main/java/de/artemis/laboratoryblocks/common/registration/ModBlocks.java index a046855..ca9edd0 100644 --- a/src/main/java/de/artemis/laboratoryblocks/common/registration/ModBlocks.java +++ b/src/main/java/de/artemis/laboratoryblocks/common/registration/ModBlocks.java @@ -10,14 +10,13 @@ import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockState; -import net.minecraftforge.registries.RegistryObject; import java.util.function.Supplier; public class ModBlocks { - private static RegistryObject register(String name, Supplier block) { - RegistryObject toReturn = Registration.BLOCKS.register(name, block); + private static Supplier register(String name, Supplier block) { + Supplier toReturn = Registration.BLOCKS.register(name, block); Registration.ITEMS.register(name, () -> new BlockItem(toReturn.get(), new Item.Properties())); @@ -35,286 +34,286 @@ private static boolean never(BlockState blockState, BlockGetter blockGetter, Blo public static void register() { } - public static final RegistryObject LABORATORY_PILLAR = register("laboratory_pillar", + public static final Supplier LABORATORY_PILLAR = register("laboratory_pillar", () -> new LaboratoryBlock(ModBlocks.ENLIGHTED_LABORATORY_PILLAR, BlockBehaviour.Properties.of().strength(2.5F, 3.0F).sound(ModSoundType.LABORATORY_BLOCK))); - public static final RegistryObject ENLIGHTED_LABORATORY_PILLAR = register("enlighted_laboratory_pillar", + public static final Supplier ENLIGHTED_LABORATORY_PILLAR = register("enlighted_laboratory_pillar", () -> new LaboratoryBlock(ModBlocks.LABORATORY_PILLAR, BlockBehaviour.Properties.of().strength(2.5F, 3.0F).sound(ModSoundType.LABORATORY_BLOCK).lightLevel((p_187433_) -> 14))); - public static final RegistryObject GRAY_LABORATORY_PILLAR = register("gray_laboratory_pillar", + public static final Supplier GRAY_LABORATORY_PILLAR = register("gray_laboratory_pillar", () -> new LaboratoryBlock(ModBlocks.ENLIGHTED_GRAY_LABORATORY_PILLAR, BlockBehaviour.Properties.of().strength(2.5F, 3.0F).sound(ModSoundType.LABORATORY_BLOCK))); - public static final RegistryObject ENLIGHTED_GRAY_LABORATORY_PILLAR = register("enlighted_gray_laboratory_pillar", + public static final Supplier ENLIGHTED_GRAY_LABORATORY_PILLAR = register("enlighted_gray_laboratory_pillar", () -> new LaboratoryBlock(ModBlocks.GRAY_LABORATORY_PILLAR, BlockBehaviour.Properties.of().strength(2.5F, 3.0F).sound(ModSoundType.LABORATORY_BLOCK).lightLevel((p_187433_) -> 14))); - public static final RegistryObject CLEAR_LABORATORY_SCREEN = register("clear_laboratory_screen", + public static final Supplier CLEAR_LABORATORY_SCREEN = register("clear_laboratory_screen", () -> new LaboratoryBlock(ModBlocks.ENLIGHTED_CLEAR_LABORATORY_SCREEN, BlockBehaviour.Properties.of().strength(1.25F, 1.5F).sound(ModSoundType.LABORATORY_BLOCK))); - public static final RegistryObject ENLIGHTED_CLEAR_LABORATORY_SCREEN = register("enlighted_clear_laboratory_screen", + public static final Supplier ENLIGHTED_CLEAR_LABORATORY_SCREEN = register("enlighted_clear_laboratory_screen", () -> new LaboratoryBlock(ModBlocks.CLEAR_LABORATORY_SCREEN, BlockBehaviour.Properties.of().strength(1.25F, 1.5F).sound(ModSoundType.LABORATORY_BLOCK).lightLevel((p_187433_) -> 14))); - public static final RegistryObject LABORATORY_FAN = register("laboratory_fan", + public static final Supplier LABORATORY_FAN = register("laboratory_fan", () -> new RedstoneControlledLaboratoryBlock(ModBlocks.ENLIGHTED_LABORATORY_FAN, ModBlocks.LABORATORY_FAN_REDSTONE_CONTROLLED, BlockBehaviour.Properties.of().strength(2.5F, 3.0F).sound(ModSoundType.LABORATORY_BLOCK))); - public static final RegistryObject ENLIGHTED_LABORATORY_FAN = register("enlighted_laboratory_fan", + public static final Supplier ENLIGHTED_LABORATORY_FAN = register("enlighted_laboratory_fan", () -> new RedstoneControlledLaboratoryBlock(ModBlocks.LABORATORY_FAN, ModBlocks.ENLIGHTED_LABORATORY_FAN_REDSTONE_CONTROLLED, BlockBehaviour.Properties.of().strength(2.5F, 3.0F).sound(ModSoundType.LABORATORY_BLOCK).lightLevel((p_187433_) -> 14))); - public static final RegistryObject LABORATORY_FAN_REDSTONE_CONTROLLED = register("laboratory_fan_redstone_controlled", + public static final Supplier LABORATORY_FAN_REDSTONE_CONTROLLED = register("laboratory_fan_redstone_controlled", () -> new RedstoneControlledLaboratoryBlock(ModBlocks.ENLIGHTED_LABORATORY_FAN_REDSTONE_CONTROLLED, ModBlocks.LABORATORY_FAN, BlockBehaviour.Properties.of().strength(2.5F, 3.0F).sound(ModSoundType.LABORATORY_BLOCK))); - public static final RegistryObject ENLIGHTED_LABORATORY_FAN_REDSTONE_CONTROLLED = register("enlighted_laboratory_fan_redstone_controlled", + public static final Supplier ENLIGHTED_LABORATORY_FAN_REDSTONE_CONTROLLED = register("enlighted_laboratory_fan_redstone_controlled", () -> new RedstoneControlledLaboratoryBlock(ModBlocks.LABORATORY_FAN_REDSTONE_CONTROLLED, ModBlocks.ENLIGHTED_LABORATORY_FAN, BlockBehaviour.Properties.of().strength(2.5F, 3.0F).sound(ModSoundType.LABORATORY_BLOCK).lightLevel((p_187433_) -> 14))); - public static final RegistryObject LEFT_FACED_BLUE_SIGNALING_LABORATORY_BLOCK = register("left-faced_blue_signaling_laboratory_block", + public static final Supplier LEFT_FACED_BLUE_SIGNALING_LABORATORY_BLOCK = register("left-faced_blue_signaling_laboratory_block", () -> new LaboratoryBlock(ModBlocks.ENLIGHTED_LEFT_FACED_BLUE_SIGNALING_LABORATORY_BLOCK, BlockBehaviour.Properties.of().strength(2.5F, 3.0F).sound(ModSoundType.LABORATORY_BLOCK))); - public static final RegistryObject ENLIGHTED_LEFT_FACED_BLUE_SIGNALING_LABORATORY_BLOCK = register("enlighted_left-faced_blue_signaling_laboratory_block", + public static final Supplier ENLIGHTED_LEFT_FACED_BLUE_SIGNALING_LABORATORY_BLOCK = register("enlighted_left-faced_blue_signaling_laboratory_block", () -> new LaboratoryBlock(ModBlocks.LEFT_FACED_BLUE_SIGNALING_LABORATORY_BLOCK, BlockBehaviour.Properties.of().strength(2.5F, 3.0F).sound(ModSoundType.LABORATORY_BLOCK).lightLevel((p_187433_) -> 14))); - public static final RegistryObject RIGHT_FACED_BLUE_SIGNALING_LABORATORY_BLOCK = register("right-faced_blue_signaling_laboratory_block", + public static final Supplier RIGHT_FACED_BLUE_SIGNALING_LABORATORY_BLOCK = register("right-faced_blue_signaling_laboratory_block", () -> new LaboratoryBlock(ModBlocks.ENLIGHTED_RIGHT_FACED_BLUE_SIGNALING_LABORATORY_BLOCK, BlockBehaviour.Properties.of().strength(2.5F, 3.0F).sound(ModSoundType.LABORATORY_BLOCK))); - public static final RegistryObject ENLIGHTED_RIGHT_FACED_BLUE_SIGNALING_LABORATORY_BLOCK = register("enlighted_right-faced_blue_signaling_laboratory_block", + public static final Supplier ENLIGHTED_RIGHT_FACED_BLUE_SIGNALING_LABORATORY_BLOCK = register("enlighted_right-faced_blue_signaling_laboratory_block", () -> new LaboratoryBlock(ModBlocks.RIGHT_FACED_BLUE_SIGNALING_LABORATORY_BLOCK, BlockBehaviour.Properties.of().strength(2.5F, 3.0F).sound(ModSoundType.LABORATORY_BLOCK).lightLevel((p_187433_) -> 14))); - public static final RegistryObject LEFT_FACED_RED_SIGNALING_LABORATORY_BLOCK = register("left-faced_red_signaling_laboratory_block", + public static final Supplier LEFT_FACED_RED_SIGNALING_LABORATORY_BLOCK = register("left-faced_red_signaling_laboratory_block", () -> new LaboratoryBlock(ModBlocks.ENLIGHTED_LEFT_FACED_RED_SIGNALING_LABORATORY_BLOCK, BlockBehaviour.Properties.of().strength(2.5F, 3.0F).sound(ModSoundType.LABORATORY_BLOCK))); - public static final RegistryObject ENLIGHTED_LEFT_FACED_RED_SIGNALING_LABORATORY_BLOCK = register("enlighted_left-faced_red_signaling_laboratory_block", + public static final Supplier ENLIGHTED_LEFT_FACED_RED_SIGNALING_LABORATORY_BLOCK = register("enlighted_left-faced_red_signaling_laboratory_block", () -> new LaboratoryBlock(ModBlocks.LEFT_FACED_RED_SIGNALING_LABORATORY_BLOCK, BlockBehaviour.Properties.of().strength(2.5F, 3.0F).sound(ModSoundType.LABORATORY_BLOCK).lightLevel((p_187433_) -> 14))); - public static final RegistryObject RIGHT_FACED_RED_SIGNALING_LABORATORY_BLOCK = register("right-faced_red_signaling_laboratory_block", + public static final Supplier RIGHT_FACED_RED_SIGNALING_LABORATORY_BLOCK = register("right-faced_red_signaling_laboratory_block", () -> new LaboratoryBlock(ModBlocks.ENLIGHTED_RIGHT_FACED_RED_SIGNALING_LABORATORY_BLOCK, BlockBehaviour.Properties.of().strength(2.5F, 3.0F).sound(ModSoundType.LABORATORY_BLOCK))); - public static final RegistryObject ENLIGHTED_RIGHT_FACED_RED_SIGNALING_LABORATORY_BLOCK = register("enlighted_right-faced_red_signaling_laboratory_block", + public static final Supplier ENLIGHTED_RIGHT_FACED_RED_SIGNALING_LABORATORY_BLOCK = register("enlighted_right-faced_red_signaling_laboratory_block", () -> new LaboratoryBlock(ModBlocks.RIGHT_FACED_RED_SIGNALING_LABORATORY_BLOCK, BlockBehaviour.Properties.of().strength(2.5F, 3.0F).sound(ModSoundType.LABORATORY_BLOCK).lightLevel((p_187433_) -> 14))); - public static final RegistryObject LEFT_FACED_GREEN_SIGNALING_LABORATORY_BLOCK = register("left-faced_green_signaling_laboratory_block", + public static final Supplier LEFT_FACED_GREEN_SIGNALING_LABORATORY_BLOCK = register("left-faced_green_signaling_laboratory_block", () -> new LaboratoryBlock(ModBlocks.ENLIGHTED_LEFT_FACED_GREEN_SIGNALING_LABORATORY_BLOCK, BlockBehaviour.Properties.of().strength(2.5F, 3.0F).sound(ModSoundType.LABORATORY_BLOCK))); - public static final RegistryObject ENLIGHTED_LEFT_FACED_GREEN_SIGNALING_LABORATORY_BLOCK = register("enlighted_left-faced_green_signaling_laboratory_block", + public static final Supplier ENLIGHTED_LEFT_FACED_GREEN_SIGNALING_LABORATORY_BLOCK = register("enlighted_left-faced_green_signaling_laboratory_block", () -> new LaboratoryBlock(ModBlocks.LEFT_FACED_GREEN_SIGNALING_LABORATORY_BLOCK, BlockBehaviour.Properties.of().strength(2.5F, 3.0F).sound(ModSoundType.LABORATORY_BLOCK).lightLevel((p_187433_) -> 14))); - public static final RegistryObject RIGHT_FACED_GREEN_SIGNALING_LABORATORY_BLOCK = register("right-faced_green_signaling_laboratory_block", + public static final Supplier RIGHT_FACED_GREEN_SIGNALING_LABORATORY_BLOCK = register("right-faced_green_signaling_laboratory_block", () -> new LaboratoryBlock(ModBlocks.ENLIGHTED_RIGHT_FACED_GREEN_SIGNALING_LABORATORY_BLOCK, BlockBehaviour.Properties.of().strength(2.5F, 3.0F).sound(ModSoundType.LABORATORY_BLOCK))); - public static final RegistryObject ENLIGHTED_RIGHT_FACED_GREEN_SIGNALING_LABORATORY_BLOCK = register("enlighted_right-faced_green_signaling_laboratory_block", + public static final Supplier ENLIGHTED_RIGHT_FACED_GREEN_SIGNALING_LABORATORY_BLOCK = register("enlighted_right-faced_green_signaling_laboratory_block", () -> new LaboratoryBlock(ModBlocks.RIGHT_FACED_GREEN_SIGNALING_LABORATORY_BLOCK, BlockBehaviour.Properties.of().strength(2.5F, 3.0F).sound(ModSoundType.LABORATORY_BLOCK).lightLevel((p_187433_) -> 14))); - public static final RegistryObject LABORATORY_BOOKSHELF = register("laboratory_bookshelf", + public static final Supplier LABORATORY_BOOKSHELF = register("laboratory_bookshelf", () -> new LaboratoryBlock(ModBlocks.ENLIGHTED_LABORATORY_BOOKSHELF, BlockBehaviour.Properties.of().strength(1.5F).sound(ModSoundType.LABORATORY_BLOCK))); - public static final RegistryObject ENLIGHTED_LABORATORY_BOOKSHELF = register("enlighted_laboratory_bookshelf", + public static final Supplier ENLIGHTED_LABORATORY_BOOKSHELF = register("enlighted_laboratory_bookshelf", () -> new LaboratoryBlock(ModBlocks.LABORATORY_BOOKSHELF, BlockBehaviour.Properties.of().strength(1.5F).sound(ModSoundType.LABORATORY_BLOCK).lightLevel((p_187433_) -> 14))); - public static final RegistryObject CHISELED_LABORATORY_BOOKSHELF = register("chiseled_laboratory_bookshelf", + public static final Supplier CHISELED_LABORATORY_BOOKSHELF = register("chiseled_laboratory_bookshelf", () -> new ChiseledLaboratoryBookShelfBlock(ModBlocks.ENLIGHTED_CHISELED_LABORATORY_BOOKSHELF, BlockBehaviour.Properties.of().strength(1.5F).sound(ModSoundType.LABORATORY_BLOCK))); - public static final RegistryObject ENLIGHTED_CHISELED_LABORATORY_BOOKSHELF = register("enlighted_chiseled_laboratory_bookshelf", + public static final Supplier ENLIGHTED_CHISELED_LABORATORY_BOOKSHELF = register("enlighted_chiseled_laboratory_bookshelf", () -> new ChiseledLaboratoryBookShelfBlock(ModBlocks.CHISELED_LABORATORY_BOOKSHELF, BlockBehaviour.Properties.of().strength(1.5F).sound(ModSoundType.LABORATORY_BLOCK).lightLevel((p_187433_) -> 14))); - public static final RegistryObject LABORATORY_VENT = register("laboratory_vent", + public static final Supplier LABORATORY_VENT = register("laboratory_vent", () -> new LaboratoryBlock(ModBlocks.ENLIGHTED_LABORATORY_VENT, BlockBehaviour.Properties.of().strength(2.5F, 3.0F).sound(ModSoundType.LABORATORY_BLOCK))); - public static final RegistryObject ENLIGHTED_LABORATORY_VENT = register("enlighted_laboratory_vent", + public static final Supplier ENLIGHTED_LABORATORY_VENT = register("enlighted_laboratory_vent", () -> new LaboratoryBlock(ModBlocks.LABORATORY_VENT, BlockBehaviour.Properties.of().strength(2.5F, 3.0F).sound(ModSoundType.LABORATORY_BLOCK).lightLevel((p_187433_) -> 14))); - public static final RegistryObject LABORATORY_VENT_CONNECTING = register("laboratory_vent_connecting", + public static final Supplier LABORATORY_VENT_CONNECTING = register("laboratory_vent_connecting", () -> new LaboratoryBlock(ModBlocks.ENLIGHTED_LABORATORY_VENT_CONNECTING, BlockBehaviour.Properties.of().strength(2.5F, 3.0F).sound(ModSoundType.LABORATORY_BLOCK))); - public static final RegistryObject ENLIGHTED_LABORATORY_VENT_CONNECTING = register("enlighted_laboratory_vent_connecting", + public static final Supplier ENLIGHTED_LABORATORY_VENT_CONNECTING = register("enlighted_laboratory_vent_connecting", () -> new LaboratoryBlock(ModBlocks.LABORATORY_VENT_CONNECTING, BlockBehaviour.Properties.of().strength(2.5F, 3.0F).sound(ModSoundType.LABORATORY_BLOCK).lightLevel((p_187433_) -> 14))); - public static final RegistryObject PLA_BLOCK = register("pla_block", + public static final Supplier PLA_BLOCK = register("pla_block", () -> new LaboratoryBlock(ModBlocks.ENLIGHTED_PLA_BLOCK, BlockBehaviour.Properties.of().strength(0.5F, 0.5F).sound(SoundType.BONE_BLOCK))); - public static final RegistryObject ENLIGHTED_PLA_BLOCK = register("enlighted_pla_block", + public static final Supplier ENLIGHTED_PLA_BLOCK = register("enlighted_pla_block", () -> new LaboratoryBlock(ModBlocks.PLA_BLOCK, BlockBehaviour.Properties.of().strength(0.5F, 0.5F).sound(SoundType.BONE_BLOCK).lightLevel((p_187433_) -> 14))); - public static final RegistryObject PLA_TILES = register("pla_tiles", + public static final Supplier PLA_TILES = register("pla_tiles", () -> new LaboratoryBlock(ModBlocks.ENLIGHTED_PLA_TILES, BlockBehaviour.Properties.of().strength(0.5F, 0.5F).sound(SoundType.BONE_BLOCK))); - public static final RegistryObject ENLIGHTED_PLA_TILES = register("enlighted_pla_tiles", + public static final Supplier ENLIGHTED_PLA_TILES = register("enlighted_pla_tiles", () -> new LaboratoryBlock(ModBlocks.PLA_TILES, BlockBehaviour.Properties.of().strength(0.5F, 0.5F).sound(SoundType.BONE_BLOCK).lightLevel((p_187433_) -> 14))); - public static final RegistryObject PLA_FLOORING = register("pla_flooring", + public static final Supplier PLA_FLOORING = register("pla_flooring", () -> new LaboratoryCarpetBlock(ModBlocks.ENLIGHTED_PLA_FLOORING, BlockBehaviour.Properties.of().ignitedByLava().strength(0.1F).sound(SoundType.BONE_BLOCK))); - public static final RegistryObject ENLIGHTED_PLA_FLOORING = register("enlighted_pla_flooring", + public static final Supplier ENLIGHTED_PLA_FLOORING = register("enlighted_pla_flooring", () -> new LaboratoryCarpetBlock(ModBlocks.PLA_FLOORING, BlockBehaviour.Properties.of().ignitedByLava().strength(0.1F).sound(SoundType.BONE_BLOCK).lightLevel((p_187433_) -> 14))); - public static final RegistryObject TILED_PLA_FLOORING = register("tiled_pla_flooring", + public static final Supplier TILED_PLA_FLOORING = register("tiled_pla_flooring", () -> new LaboratoryCarpetBlock(ModBlocks.ENLIGHTED_TILED_PLA_FLOORING, BlockBehaviour.Properties.of().ignitedByLava().strength(0.1F).sound(SoundType.BONE_BLOCK))); - public static final RegistryObject ENLIGHTED_TILED_PLA_FLOORING = register("enlighted_tiled_pla_flooring", + public static final Supplier ENLIGHTED_TILED_PLA_FLOORING = register("enlighted_tiled_pla_flooring", () -> new LaboratoryCarpetBlock(ModBlocks.TILED_PLA_FLOORING, BlockBehaviour.Properties.of().ignitedByLava().strength(0.1F).sound(SoundType.BONE_BLOCK).lightLevel((p_187433_) -> 14))); - public static final RegistryObject LABORATORY_BLOCK = register("laboratory_block", + public static final Supplier LABORATORY_BLOCK = register("laboratory_block", () -> new LaboratoryBlock(ModBlocks.ENLIGHTED_LABORATORY_BLOCK, BlockBehaviour.Properties.of().strength(2.5F, 3.0F).sound(ModSoundType.LABORATORY_BLOCK))); - public static final RegistryObject ENLIGHTED_LABORATORY_BLOCK = register("enlighted_laboratory_block", + public static final Supplier ENLIGHTED_LABORATORY_BLOCK = register("enlighted_laboratory_block", () -> new LaboratoryBlock(ModBlocks.LABORATORY_BLOCK, BlockBehaviour.Properties.of().strength(2.5F, 3.0F).sound(ModSoundType.LABORATORY_BLOCK).lightLevel((p_187433_) -> 14))); - public static final RegistryObject SCREWED_LABORATORY_BLOCK = register("screwed_laboratory_block", + public static final Supplier SCREWED_LABORATORY_BLOCK = register("screwed_laboratory_block", () -> new LaboratoryBlock(ModBlocks.ENLIGHTED_SCREWED_LABORATORY_BLOCK, BlockBehaviour.Properties.of().strength(2.5F, 3.0F).sound(ModSoundType.LABORATORY_BLOCK))); - public static final RegistryObject ENLIGHTED_SCREWED_LABORATORY_BLOCK = register("enlighted_screwed_laboratory_block", + public static final Supplier ENLIGHTED_SCREWED_LABORATORY_BLOCK = register("enlighted_screwed_laboratory_block", () -> new LaboratoryBlock(ModBlocks.SCREWED_LABORATORY_BLOCK, BlockBehaviour.Properties.of().strength(2.5F, 3.0F).sound(ModSoundType.LABORATORY_BLOCK).lightLevel((p_187433_) -> 14))); - public static final RegistryObject LABORATORY_TILES = register("laboratory_tiles", + public static final Supplier LABORATORY_TILES = register("laboratory_tiles", () -> new LaboratoryBlock(ModBlocks.ENLIGHTED_LABORATORY_TILES, BlockBehaviour.Properties.of().strength(2.5F, 3.0F).sound(ModSoundType.LABORATORY_BLOCK))); - public static final RegistryObject ENLIGHTED_LABORATORY_TILES = register("enlighted_laboratory_tiles", + public static final Supplier ENLIGHTED_LABORATORY_TILES = register("enlighted_laboratory_tiles", () -> new LaboratoryBlock(ModBlocks.LABORATORY_TILES, BlockBehaviour.Properties.of().strength(2.5F, 3.0F).sound(ModSoundType.LABORATORY_BLOCK).lightLevel((p_187433_) -> 14))); - public static final RegistryObject GRAY_LABORATORY_TILES = register("gray_laboratory_tiles", + public static final Supplier GRAY_LABORATORY_TILES = register("gray_laboratory_tiles", () -> new LaboratoryBlock(ModBlocks.ENLIGHTED_GRAY_LABORATORY_TILES, BlockBehaviour.Properties.of().strength(2.5F, 3.0F).sound(ModSoundType.LABORATORY_BLOCK))); - public static final RegistryObject ENLIGHTED_GRAY_LABORATORY_TILES = register("enlighted_gray_laboratory_tiles", + public static final Supplier ENLIGHTED_GRAY_LABORATORY_TILES = register("enlighted_gray_laboratory_tiles", () -> new LaboratoryBlock(ModBlocks.GRAY_LABORATORY_TILES, BlockBehaviour.Properties.of().strength(2.5F, 3.0F).sound(ModSoundType.LABORATORY_BLOCK).lightLevel((p_187433_) -> 14))); - public static final RegistryObject MIXED_LABORATORY_TILES = register("mixed_laboratory_tiles", + public static final Supplier MIXED_LABORATORY_TILES = register("mixed_laboratory_tiles", () -> new LaboratoryBlock(ModBlocks.ENLIGHTED_MIXED_LABORATORY_TILES, BlockBehaviour.Properties.of().strength(2.5F, 3.0F).sound(ModSoundType.LABORATORY_BLOCK))); - public static final RegistryObject ENLIGHTED_MIXED_LABORATORY_TILES = register("enlighted_mixed_laboratory_tiles", + public static final Supplier ENLIGHTED_MIXED_LABORATORY_TILES = register("enlighted_mixed_laboratory_tiles", () -> new LaboratoryBlock(ModBlocks.MIXED_LABORATORY_TILES, BlockBehaviour.Properties.of().strength(2.5F, 3.0F).sound(ModSoundType.LABORATORY_BLOCK).lightLevel((p_187433_) -> 14))); - public static final RegistryObject OAK_LABORATORY_FLOOR = register("oak_laboratory_floor", + public static final Supplier OAK_LABORATORY_FLOOR = register("oak_laboratory_floor", () -> new LaboratoryBlock(ModBlocks.ENLIGHTED_OAK_LABORATORY_FLOOR, BlockBehaviour.Properties.of().ignitedByLava().strength(2.5F, 3.0F).sound(SoundType.WOOD))); - public static final RegistryObject ENLIGHTED_OAK_LABORATORY_FLOOR = register("enlighted_oak_laboratory_floor", + public static final Supplier ENLIGHTED_OAK_LABORATORY_FLOOR = register("enlighted_oak_laboratory_floor", () -> new LaboratoryBlock(ModBlocks.OAK_LABORATORY_FLOOR, BlockBehaviour.Properties.of().ignitedByLava().strength(2.5F, 3.0F).sound(SoundType.WOOD).lightLevel((p_187433_) -> 14))); - public static final RegistryObject SPRUCE_LABORATORY_FLOOR = register("spruce_laboratory_floor", + public static final Supplier SPRUCE_LABORATORY_FLOOR = register("spruce_laboratory_floor", () -> new LaboratoryBlock(ModBlocks.ENLIGHTED_SPRUCE_LABORATORY_FLOOR, BlockBehaviour.Properties.of().ignitedByLava().strength(2.5F, 3.0F).sound(SoundType.WOOD))); - public static final RegistryObject ENLIGHTED_SPRUCE_LABORATORY_FLOOR = register("enlighted_spruce_laboratory_floor", + public static final Supplier ENLIGHTED_SPRUCE_LABORATORY_FLOOR = register("enlighted_spruce_laboratory_floor", () -> new LaboratoryBlock(ModBlocks.SPRUCE_LABORATORY_FLOOR, BlockBehaviour.Properties.of().ignitedByLava().strength(2.5F, 3.0F).sound(SoundType.WOOD).lightLevel((p_187433_) -> 14))); - public static final RegistryObject BIRCH_LABORATORY_FLOOR = register("birch_laboratory_floor", + public static final Supplier BIRCH_LABORATORY_FLOOR = register("birch_laboratory_floor", () -> new LaboratoryBlock(ModBlocks.ENLIGHTED_BIRCH_LABORATORY_FLOOR, BlockBehaviour.Properties.of().ignitedByLava().strength(2.5F, 3.0F).sound(SoundType.WOOD))); - public static final RegistryObject ENLIGHTED_BIRCH_LABORATORY_FLOOR = register("enlighted_birch_laboratory_floor", + public static final Supplier ENLIGHTED_BIRCH_LABORATORY_FLOOR = register("enlighted_birch_laboratory_floor", () -> new LaboratoryBlock(ModBlocks.BIRCH_LABORATORY_FLOOR, BlockBehaviour.Properties.of().ignitedByLava().strength(2.5F, 3.0F).sound(SoundType.WOOD).lightLevel((p_187433_) -> 14))); - public static final RegistryObject DARK_OAK_LABORATORY_FLOOR = register("dark_oak_laboratory_floor", + public static final Supplier DARK_OAK_LABORATORY_FLOOR = register("dark_oak_laboratory_floor", () -> new LaboratoryBlock(ModBlocks.ENLIGHTED_DARK_OAK_LABORATORY_FLOOR, BlockBehaviour.Properties.of().ignitedByLava().strength(2.5F, 3.0F).sound(SoundType.WOOD))); - public static final RegistryObject ENLIGHTED_DARK_OAK_LABORATORY_FLOOR = register("enlighted_dark_oak_laboratory_floor", + public static final Supplier ENLIGHTED_DARK_OAK_LABORATORY_FLOOR = register("enlighted_dark_oak_laboratory_floor", () -> new LaboratoryBlock(ModBlocks.DARK_OAK_LABORATORY_FLOOR, BlockBehaviour.Properties.of().ignitedByLava().strength(2.5F, 3.0F).sound(SoundType.WOOD).lightLevel((p_187433_) -> 14))); - public static final RegistryObject JUNGLE_LABORATORY_FLOOR = register("jungle_laboratory_floor", + public static final Supplier JUNGLE_LABORATORY_FLOOR = register("jungle_laboratory_floor", () -> new LaboratoryBlock(ModBlocks.ENLIGHTED_JUNGLE_LABORATORY_FLOOR, BlockBehaviour.Properties.of().ignitedByLava().strength(2.5F, 3.0F).sound(SoundType.WOOD))); - public static final RegistryObject ENLIGHTED_JUNGLE_LABORATORY_FLOOR = register("enlighted_jungle_laboratory_floor", + public static final Supplier ENLIGHTED_JUNGLE_LABORATORY_FLOOR = register("enlighted_jungle_laboratory_floor", () -> new LaboratoryBlock(ModBlocks.JUNGLE_LABORATORY_FLOOR, BlockBehaviour.Properties.of().ignitedByLava().strength(2.5F, 3.0F).sound(SoundType.WOOD).lightLevel((p_187433_) -> 14))); - public static final RegistryObject ACACIA_LABORATORY_FLOOR = register("acacia_laboratory_floor", + public static final Supplier ACACIA_LABORATORY_FLOOR = register("acacia_laboratory_floor", () -> new LaboratoryBlock(ModBlocks.ENLIGHTED_ACACIA_LABORATORY_FLOOR, BlockBehaviour.Properties.of().ignitedByLava().strength(2.5F, 3.0F).sound(SoundType.WOOD))); - public static final RegistryObject ENLIGHTED_ACACIA_LABORATORY_FLOOR = register("enlighted_acacia_laboratory_floor", + public static final Supplier ENLIGHTED_ACACIA_LABORATORY_FLOOR = register("enlighted_acacia_laboratory_floor", () -> new LaboratoryBlock(ModBlocks.ACACIA_LABORATORY_FLOOR, BlockBehaviour.Properties.of().ignitedByLava().strength(2.5F, 3.0F).sound(SoundType.WOOD).lightLevel((p_187433_) -> 14))); - public static final RegistryObject MANGROVE_LABORATORY_FLOOR = register("mangrove_laboratory_floor", + public static final Supplier MANGROVE_LABORATORY_FLOOR = register("mangrove_laboratory_floor", () -> new LaboratoryBlock(ModBlocks.ENLIGHTED_MANGROVE_LABORATORY_FLOOR, BlockBehaviour.Properties.of().ignitedByLava().strength(2.5F, 3.0F).sound(SoundType.WOOD))); - public static final RegistryObject ENLIGHTED_MANGROVE_LABORATORY_FLOOR = register("enlighted_mangrove_laboratory_floor", + public static final Supplier ENLIGHTED_MANGROVE_LABORATORY_FLOOR = register("enlighted_mangrove_laboratory_floor", () -> new LaboratoryBlock(ModBlocks.MANGROVE_LABORATORY_FLOOR, BlockBehaviour.Properties.of().ignitedByLava().strength(2.5F, 3.0F).sound(SoundType.WOOD).lightLevel((p_187433_) -> 14))); - public static final RegistryObject CHERRY_LABORATORY_FLOOR = register("cherry_laboratory_floor", + public static final Supplier CHERRY_LABORATORY_FLOOR = register("cherry_laboratory_floor", () -> new LaboratoryBlock(ModBlocks.ENLIGHTED_CHERRY_LABORATORY_FLOOR, BlockBehaviour.Properties.of().ignitedByLava().strength(2.5F, 3.0F).sound(SoundType.CHERRY_WOOD))); - public static final RegistryObject ENLIGHTED_CHERRY_LABORATORY_FLOOR = register("enlighted_cherry_laboratory_floor", + public static final Supplier ENLIGHTED_CHERRY_LABORATORY_FLOOR = register("enlighted_cherry_laboratory_floor", () -> new LaboratoryBlock(ModBlocks.CHERRY_LABORATORY_FLOOR, BlockBehaviour.Properties.of().ignitedByLava().strength(2.5F, 3.0F).sound(SoundType.CHERRY_WOOD).lightLevel((p_187433_) -> 14))); - public static final RegistryObject BAMBOO_LABORATORY_FLOOR = register("bamboo_laboratory_floor", + public static final Supplier BAMBOO_LABORATORY_FLOOR = register("bamboo_laboratory_floor", () -> new LaboratoryBlock(ModBlocks.ENLIGHTED_BAMBOO_LABORATORY_FLOOR, BlockBehaviour.Properties.of().ignitedByLava().strength(2.5F, 3.0F).sound(SoundType.BAMBOO_WOOD))); - public static final RegistryObject ENLIGHTED_BAMBOO_LABORATORY_FLOOR = register("enlighted_bamboo_laboratory_floor", + public static final Supplier ENLIGHTED_BAMBOO_LABORATORY_FLOOR = register("enlighted_bamboo_laboratory_floor", () -> new LaboratoryBlock(ModBlocks.BAMBOO_LABORATORY_FLOOR, BlockBehaviour.Properties.of().ignitedByLava().strength(2.5F, 3.0F).sound(SoundType.BAMBOO_WOOD).lightLevel((p_187433_) -> 14))); - public static final RegistryObject CRIMSON_LABORATORY_FLOOR = register("crimson_laboratory_floor", + public static final Supplier CRIMSON_LABORATORY_FLOOR = register("crimson_laboratory_floor", () -> new LaboratoryBlock(ModBlocks.ENLIGHTED_CRIMSON_LABORATORY_FLOOR, BlockBehaviour.Properties.of().ignitedByLava().strength(2.5F, 3.0F).sound(SoundType.WOOD))); - public static final RegistryObject ENLIGHTED_CRIMSON_LABORATORY_FLOOR = register("enlighted_crimson_laboratory_floor", + public static final Supplier ENLIGHTED_CRIMSON_LABORATORY_FLOOR = register("enlighted_crimson_laboratory_floor", () -> new LaboratoryBlock(ModBlocks.CRIMSON_LABORATORY_FLOOR, BlockBehaviour.Properties.of().ignitedByLava().strength(2.5F, 3.0F).sound(SoundType.WOOD).lightLevel((p_187433_) -> 14))); - public static final RegistryObject WARPED_LABORATORY_FLOOR = register("warped_laboratory_floor", + public static final Supplier WARPED_LABORATORY_FLOOR = register("warped_laboratory_floor", () -> new LaboratoryBlock(ModBlocks.ENLIGHTED_WARPED_LABORATORY_FLOOR, BlockBehaviour.Properties.of().ignitedByLava().strength(2.5F, 3.0F).sound(SoundType.WOOD))); - public static final RegistryObject ENLIGHTED_WARPED_LABORATORY_FLOOR = register("enlighted_warped_laboratory_floor", + public static final Supplier ENLIGHTED_WARPED_LABORATORY_FLOOR = register("enlighted_warped_laboratory_floor", () -> new LaboratoryBlock(ModBlocks.WARPED_LABORATORY_FLOOR, BlockBehaviour.Properties.of().ignitedByLava().strength(2.5F, 3.0F).sound(SoundType.WOOD).lightLevel((p_187433_) -> 14))); - public static final RegistryObject LABORATORY_GLASS = register("laboratory_glass", + public static final Supplier LABORATORY_GLASS = register("laboratory_glass", () -> new LaboratoryGlassBlock(ModBlocks.ENLIGHTED_LABORATORY_GLASS, BlockBehaviour.Properties.of().strength(0.3F).sound(SoundType.GLASS).noOcclusion().isValidSpawn(ModBlocks::never).isRedstoneConductor(ModBlocks::never).isSuffocating(ModBlocks::never).isViewBlocking(ModBlocks::never))); - public static final RegistryObject ENLIGHTED_LABORATORY_GLASS = register("enlighted_laboratory_glass", + public static final Supplier ENLIGHTED_LABORATORY_GLASS = register("enlighted_laboratory_glass", () -> new LaboratoryGlassBlock(ModBlocks.LABORATORY_GLASS, BlockBehaviour.Properties.of().strength(0.3F).sound(SoundType.GLASS).noOcclusion().isValidSpawn(ModBlocks::never).isRedstoneConductor(ModBlocks::never).isSuffocating(ModBlocks::never).isViewBlocking(ModBlocks::never).lightLevel((p_187433_) -> 14))); - public static final RegistryObject OAK_LABORATORY_TILES = register("oak_laboratory_tiles", + public static final Supplier OAK_LABORATORY_TILES = register("oak_laboratory_tiles", () -> new LaboratoryBlock(ModBlocks.ENLIGHTED_OAK_LABORATORY_TILES, BlockBehaviour.Properties.of().ignitedByLava().strength(2.5F, 3.0F).sound(SoundType.WOOD))); - public static final RegistryObject ENLIGHTED_OAK_LABORATORY_TILES = register("enlighted_oak_laboratory_tiles", + public static final Supplier ENLIGHTED_OAK_LABORATORY_TILES = register("enlighted_oak_laboratory_tiles", () -> new LaboratoryBlock(ModBlocks.OAK_LABORATORY_TILES, BlockBehaviour.Properties.of().ignitedByLava().strength(2.5F, 3.0F).sound(SoundType.WOOD).lightLevel((p_187433_) -> 14))); - public static final RegistryObject SPRUCE_LABORATORY_TILES = register("spruce_laboratory_tiles", + public static final Supplier SPRUCE_LABORATORY_TILES = register("spruce_laboratory_tiles", () -> new LaboratoryBlock(ModBlocks.ENLIGHTED_SPRUCE_LABORATORY_TILES, BlockBehaviour.Properties.of().ignitedByLava().strength(2.5F, 3.0F).sound(SoundType.WOOD))); - public static final RegistryObject ENLIGHTED_SPRUCE_LABORATORY_TILES = register("enlighted_spruce_laboratory_tiles", + public static final Supplier ENLIGHTED_SPRUCE_LABORATORY_TILES = register("enlighted_spruce_laboratory_tiles", () -> new LaboratoryBlock(ModBlocks.SPRUCE_LABORATORY_TILES, BlockBehaviour.Properties.of().ignitedByLava().strength(2.5F, 3.0F).sound(SoundType.WOOD).lightLevel((p_187433_) -> 14))); - public static final RegistryObject BIRCH_LABORATORY_TILES = register("birch_laboratory_tiles", + public static final Supplier BIRCH_LABORATORY_TILES = register("birch_laboratory_tiles", () -> new LaboratoryBlock(ModBlocks.ENLIGHTED_BIRCH_LABORATORY_TILES, BlockBehaviour.Properties.of().ignitedByLava().strength(2.5F, 3.0F).sound(SoundType.WOOD))); - public static final RegistryObject ENLIGHTED_BIRCH_LABORATORY_TILES = register("enlighted_birch_laboratory_tiles", + public static final Supplier ENLIGHTED_BIRCH_LABORATORY_TILES = register("enlighted_birch_laboratory_tiles", () -> new LaboratoryBlock(ModBlocks.BIRCH_LABORATORY_TILES, BlockBehaviour.Properties.of().ignitedByLava().strength(2.5F, 3.0F).sound(SoundType.WOOD).lightLevel((p_187433_) -> 14))); - public static final RegistryObject DARK_OAK_LABORATORY_TILES = register("dark_oak_laboratory_tiles", + public static final Supplier DARK_OAK_LABORATORY_TILES = register("dark_oak_laboratory_tiles", () -> new LaboratoryBlock(ModBlocks.ENLIGHTED_DARK_OAK_LABORATORY_TILES, BlockBehaviour.Properties.of().ignitedByLava().strength(2.5F, 3.0F).sound(SoundType.WOOD))); - public static final RegistryObject ENLIGHTED_DARK_OAK_LABORATORY_TILES = register("enlighted_dark_oak_laboratory_tiles", + public static final Supplier ENLIGHTED_DARK_OAK_LABORATORY_TILES = register("enlighted_dark_oak_laboratory_tiles", () -> new LaboratoryBlock(ModBlocks.DARK_OAK_LABORATORY_TILES, BlockBehaviour.Properties.of().ignitedByLava().strength(2.5F, 3.0F).sound(SoundType.WOOD).lightLevel((p_187433_) -> 14))); - public static final RegistryObject JUNGLE_LABORATORY_TILES = register("jungle_laboratory_tiles", + public static final Supplier JUNGLE_LABORATORY_TILES = register("jungle_laboratory_tiles", () -> new LaboratoryBlock(ModBlocks.ENLIGHTED_JUNGLE_LABORATORY_TILES, BlockBehaviour.Properties.of().ignitedByLava().strength(2.5F, 3.0F).sound(SoundType.WOOD))); - public static final RegistryObject ENLIGHTED_JUNGLE_LABORATORY_TILES = register("enlighted_jungle_laboratory_tiles", + public static final Supplier ENLIGHTED_JUNGLE_LABORATORY_TILES = register("enlighted_jungle_laboratory_tiles", () -> new LaboratoryBlock(ModBlocks.JUNGLE_LABORATORY_TILES, BlockBehaviour.Properties.of().ignitedByLava().strength(2.5F, 3.0F).sound(SoundType.WOOD).lightLevel((p_187433_) -> 14))); - public static final RegistryObject ACACIA_LABORATORY_TILES = register("acacia_laboratory_tiles", + public static final Supplier ACACIA_LABORATORY_TILES = register("acacia_laboratory_tiles", () -> new LaboratoryBlock(ModBlocks.ENLIGHTED_ACACIA_LABORATORY_TILES, BlockBehaviour.Properties.of().ignitedByLava().strength(2.5F, 3.0F).sound(SoundType.WOOD))); - public static final RegistryObject ENLIGHTED_ACACIA_LABORATORY_TILES = register("enlighted_acacia_laboratory_tiles", + public static final Supplier ENLIGHTED_ACACIA_LABORATORY_TILES = register("enlighted_acacia_laboratory_tiles", () -> new LaboratoryBlock(ModBlocks.ACACIA_LABORATORY_TILES, BlockBehaviour.Properties.of().ignitedByLava().strength(2.5F, 3.0F).sound(SoundType.WOOD).lightLevel((p_187433_) -> 14))); - public static final RegistryObject MANGROVE_LABORATORY_TILES = register("mangrove_laboratory_tiles", + public static final Supplier MANGROVE_LABORATORY_TILES = register("mangrove_laboratory_tiles", () -> new LaboratoryBlock(ModBlocks.ENLIGHTED_MANGROVE_LABORATORY_TILES, BlockBehaviour.Properties.of().ignitedByLava().strength(2.5F, 3.0F).sound(SoundType.WOOD))); - public static final RegistryObject ENLIGHTED_MANGROVE_LABORATORY_TILES = register("enlighted_mangrove_laboratory_tiles", + public static final Supplier ENLIGHTED_MANGROVE_LABORATORY_TILES = register("enlighted_mangrove_laboratory_tiles", () -> new LaboratoryBlock(ModBlocks.MANGROVE_LABORATORY_TILES, BlockBehaviour.Properties.of().ignitedByLava().strength(2.5F, 3.0F).sound(SoundType.WOOD).lightLevel((p_187433_) -> 14))); - public static final RegistryObject CHERRY_LABORATORY_TILES = register("cherry_laboratory_tiles", + public static final Supplier CHERRY_LABORATORY_TILES = register("cherry_laboratory_tiles", () -> new LaboratoryBlock(ModBlocks.ENLIGHTED_CHERRY_LABORATORY_TILES, BlockBehaviour.Properties.of().ignitedByLava().strength(2.5F, 3.0F).sound(SoundType.CHERRY_WOOD))); - public static final RegistryObject ENLIGHTED_CHERRY_LABORATORY_TILES = register("enlighted_cherry_laboratory_tiles", + public static final Supplier ENLIGHTED_CHERRY_LABORATORY_TILES = register("enlighted_cherry_laboratory_tiles", () -> new LaboratoryBlock(ModBlocks.CHERRY_LABORATORY_TILES, BlockBehaviour.Properties.of().ignitedByLava().strength(2.5F, 3.0F).sound(SoundType.CHERRY_WOOD).lightLevel((p_187433_) -> 14))); - public static final RegistryObject BAMBOO_LABORATORY_TILES = register("bamboo_laboratory_tiles", + public static final Supplier BAMBOO_LABORATORY_TILES = register("bamboo_laboratory_tiles", () -> new LaboratoryBlock(ModBlocks.ENLIGHTED_BAMBOO_LABORATORY_TILES, BlockBehaviour.Properties.of().ignitedByLava().strength(2.5F, 3.0F).sound(SoundType.BAMBOO_WOOD))); - public static final RegistryObject ENLIGHTED_BAMBOO_LABORATORY_TILES = register("enlighted_bamboo_laboratory_tiles", + public static final Supplier ENLIGHTED_BAMBOO_LABORATORY_TILES = register("enlighted_bamboo_laboratory_tiles", () -> new LaboratoryBlock(ModBlocks.BAMBOO_LABORATORY_TILES, BlockBehaviour.Properties.of().ignitedByLava().strength(2.5F, 3.0F).sound(SoundType.BAMBOO_WOOD).lightLevel((p_187433_) -> 14))); - public static final RegistryObject CRIMSON_LABORATORY_TILES = register("crimson_laboratory_tiles", + public static final Supplier CRIMSON_LABORATORY_TILES = register("crimson_laboratory_tiles", () -> new LaboratoryBlock(ModBlocks.ENLIGHTED_CRIMSON_LABORATORY_TILES, BlockBehaviour.Properties.of().ignitedByLava().strength(2.5F, 3.0F).sound(SoundType.WOOD))); - public static final RegistryObject ENLIGHTED_CRIMSON_LABORATORY_TILES = register("enlighted_crimson_laboratory_tiles", + public static final Supplier ENLIGHTED_CRIMSON_LABORATORY_TILES = register("enlighted_crimson_laboratory_tiles", () -> new LaboratoryBlock(ModBlocks.CRIMSON_LABORATORY_TILES, BlockBehaviour.Properties.of().ignitedByLava().strength(2.5F, 3.0F).sound(SoundType.WOOD).lightLevel((p_187433_) -> 14))); - public static final RegistryObject WARPED_LABORATORY_TILES = register("warped_laboratory_tiles", + public static final Supplier WARPED_LABORATORY_TILES = register("warped_laboratory_tiles", () -> new LaboratoryBlock(ModBlocks.ENLIGHTED_WARPED_LABORATORY_TILES, BlockBehaviour.Properties.of().ignitedByLava().strength(2.5F, 3.0F).sound(SoundType.WOOD))); - public static final RegistryObject ENLIGHTED_WARPED_LABORATORY_TILES = register("enlighted_warped_laboratory_tiles", + public static final Supplier ENLIGHTED_WARPED_LABORATORY_TILES = register("enlighted_warped_laboratory_tiles", () -> new LaboratoryBlock(ModBlocks.WARPED_LABORATORY_TILES, BlockBehaviour.Properties.of().ignitedByLava().strength(2.5F, 3.0F).sound(SoundType.WOOD).lightLevel((p_187433_) -> 14))); } diff --git a/src/main/java/de/artemis/laboratoryblocks/common/registration/ModCreativeModeTabs.java b/src/main/java/de/artemis/laboratoryblocks/common/registration/ModCreativeModeTabs.java index 1d02318..6ea4626 100644 --- a/src/main/java/de/artemis/laboratoryblocks/common/registration/ModCreativeModeTabs.java +++ b/src/main/java/de/artemis/laboratoryblocks/common/registration/ModCreativeModeTabs.java @@ -1,14 +1,14 @@ package de.artemis.laboratoryblocks.common.registration; import de.artemis.laboratoryblocks.InventoryTab; +import net.minecraft.core.Holder; import net.minecraft.world.item.CreativeModeTab; -import net.minecraftforge.registries.RegistryObject; import static de.artemis.laboratoryblocks.common.registration.Registration.CREATIVE_MODE_TABS; public class ModCreativeModeTabs { - public static RegistryObject INVENTORY_TAB = CREATIVE_MODE_TABS.register("inventory_tab", ModCreativeModeTabs::createInventoryTab); + public static final Holder INVENTORY_TAB = CREATIVE_MODE_TABS.register("inventory_tab", ModCreativeModeTabs::createInventoryTab); private static CreativeModeTab createInventoryTab() { CreativeModeTab.Builder builder = new CreativeModeTab.Builder(CreativeModeTab.Row.BOTTOM, -1); diff --git a/src/main/java/de/artemis/laboratoryblocks/common/registration/ModFoods.java b/src/main/java/de/artemis/laboratoryblocks/common/registration/ModFoods.java index 795173c..be09ba9 100644 --- a/src/main/java/de/artemis/laboratoryblocks/common/registration/ModFoods.java +++ b/src/main/java/de/artemis/laboratoryblocks/common/registration/ModFoods.java @@ -3,5 +3,5 @@ import net.minecraft.world.food.FoodProperties; public class ModFoods { - public static final FoodProperties STARCH = (new FoodProperties.Builder()).nutrition(4).saturationMod(0.1F).build(); + public static final FoodProperties STARCH = (new FoodProperties.Builder()).nutrition(4).saturationModifier(0.1F).build(); } diff --git a/src/main/java/de/artemis/laboratoryblocks/common/registration/ModItems.java b/src/main/java/de/artemis/laboratoryblocks/common/registration/ModItems.java index 855a5ea..29306f8 100644 --- a/src/main/java/de/artemis/laboratoryblocks/common/registration/ModItems.java +++ b/src/main/java/de/artemis/laboratoryblocks/common/registration/ModItems.java @@ -3,31 +3,31 @@ import de.artemis.laboratoryblocks.common.items.ConfigurationToolItem; import net.minecraft.world.item.Item; import net.minecraft.world.item.Rarity; -import net.minecraftforge.registries.RegistryObject; +import net.neoforged.neoforge.registries.DeferredHolder; public class ModItems { public static void register() { } - public static final RegistryObject STARCH = Registration.ITEMS.register("starch", + public static final DeferredHolder STARCH = Registration.ITEMS.register("starch", () -> new Item(new Item.Properties().food(ModFoods.STARCH))); - public static final RegistryObject COMPRESSED_STARCH = Registration.ITEMS.register("compressed_starch", + public static final DeferredHolder COMPRESSED_STARCH = Registration.ITEMS.register("compressed_starch", () -> new Item(new Item.Properties())); - public static final RegistryObject PLA_SHEETS = Registration.ITEMS.register("pla_sheets", + public static final DeferredHolder PLA_SHEETS = Registration.ITEMS.register("pla_sheets", () -> new Item(new Item.Properties())); - public static final RegistryObject IRON_SCREW = Registration.ITEMS.register("iron_screw", + public static final DeferredHolder IRON_SCREW = Registration.ITEMS.register("iron_screw", () -> new Item(new Item.Properties())); - public static final RegistryObject GLOWSTONE_PARTICLES = Registration.ITEMS.register("glowstone_particles", + public static final DeferredHolder GLOWSTONE_PARTICLES = Registration.ITEMS.register("glowstone_particles", () -> new Item(new Item.Properties())); - public static final RegistryObject REDSTONE_PARTICLES = Registration.ITEMS.register("redstone_particles", + public static final DeferredHolder REDSTONE_PARTICLES = Registration.ITEMS.register("redstone_particles", () -> new Item(new Item.Properties())); - public static final RegistryObject CONFIGURATION_TOOL = Registration.ITEMS.register("configuration_tool", + public static final DeferredHolder CONFIGURATION_TOOL = Registration.ITEMS.register("configuration_tool", () -> new ConfigurationToolItem(new Item.Properties().durability(640).rarity(Rarity.UNCOMMON))); } diff --git a/src/main/java/de/artemis/laboratoryblocks/common/registration/ModKeyBindings.java b/src/main/java/de/artemis/laboratoryblocks/common/registration/ModKeyBindings.java index 1001658..b467475 100644 --- a/src/main/java/de/artemis/laboratoryblocks/common/registration/ModKeyBindings.java +++ b/src/main/java/de/artemis/laboratoryblocks/common/registration/ModKeyBindings.java @@ -3,8 +3,8 @@ import com.mojang.blaze3d.platform.InputConstants; import de.artemis.laboratoryblocks.LaboratoryBlocks; import net.minecraft.client.KeyMapping; -import net.minecraftforge.client.settings.KeyConflictContext; -import net.minecraftforge.client.settings.KeyModifier; +import net.neoforged.neoforge.client.settings.KeyConflictContext; +import net.neoforged.neoforge.client.settings.KeyModifier; import org.lwjgl.glfw.GLFW; public class ModKeyBindings { diff --git a/src/main/java/de/artemis/laboratoryblocks/common/registration/ModParticles.java b/src/main/java/de/artemis/laboratoryblocks/common/registration/ModParticles.java index 56fc687..0cc6d1a 100644 --- a/src/main/java/de/artemis/laboratoryblocks/common/registration/ModParticles.java +++ b/src/main/java/de/artemis/laboratoryblocks/common/registration/ModParticles.java @@ -1,19 +1,20 @@ package de.artemis.laboratoryblocks.common.registration; import net.minecraft.core.particles.SimpleParticleType; -import net.minecraftforge.registries.RegistryObject; import static de.artemis.laboratoryblocks.common.registration.Registration.PARTICLE_TYPES; +import java.util.function.Supplier; + public class ModParticles { - public static final RegistryObject APPLYING_GLOWSTONE_PARTICLE = + public static final Supplier APPLYING_GLOWSTONE_PARTICLE = PARTICLE_TYPES.register("applying_glowstone_particle", () -> new SimpleParticleType(true)); - public static final RegistryObject APPLYING_REDSTONE_PARTICLE = + public static final Supplier APPLYING_REDSTONE_PARTICLE = PARTICLE_TYPES.register("applying_redstone_particle", () -> new SimpleParticleType(true)); - public static final RegistryObject REMOVING_MODIFIER_PARTICLE = + public static final Supplier REMOVING_MODIFIER_PARTICLE = PARTICLE_TYPES.register("removing_modifier_particle", () -> new SimpleParticleType(true)); public static void register() { diff --git a/src/main/java/de/artemis/laboratoryblocks/common/registration/ModSoundEvents.java b/src/main/java/de/artemis/laboratoryblocks/common/registration/ModSoundEvents.java index 33391de..1873bee 100644 --- a/src/main/java/de/artemis/laboratoryblocks/common/registration/ModSoundEvents.java +++ b/src/main/java/de/artemis/laboratoryblocks/common/registration/ModSoundEvents.java @@ -3,22 +3,22 @@ import de.artemis.laboratoryblocks.LaboratoryBlocks; import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvent; -import net.minecraftforge.registries.RegistryObject; +import net.neoforged.neoforge.registries.DeferredHolder; public class ModSoundEvents { public static void register() { } - private static RegistryObject register(String resourceLocation) { - return Registration.SOUND_EVENTS.register(resourceLocation, () -> SoundEvent.createVariableRangeEvent(new ResourceLocation(LaboratoryBlocks.MOD_ID, resourceLocation))); + private static DeferredHolder register(String resourceLocation) { + return Registration.SOUND_EVENTS.register(resourceLocation, () -> SoundEvent.createVariableRangeEvent(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, resourceLocation))); } - public static final RegistryObject LABORATORY_BLOCK_BREAK = register("laboratory_block_break"); - public static final RegistryObject LABORATORY_BLOCK_FALL = register("laboratory_block_fall"); - public static final RegistryObject LABORATORY_BLOCK_HIT = register("laboratory_block_hit"); - public static final RegistryObject LABORATORY_BLOCK_PLACE = register("laboratory_block_place"); - public static final RegistryObject LABORATORY_BLOCK_STEP = register("laboratory_block_step"); - public static final RegistryObject CONFIGURATION_TOOL_USE = register("configuration_tool_use"); + public static final DeferredHolder LABORATORY_BLOCK_BREAK = register("laboratory_block_break"); + public static final DeferredHolder LABORATORY_BLOCK_FALL = register("laboratory_block_fall"); + public static final DeferredHolder LABORATORY_BLOCK_HIT = register("laboratory_block_hit"); + public static final DeferredHolder LABORATORY_BLOCK_PLACE = register("laboratory_block_place"); + public static final DeferredHolder LABORATORY_BLOCK_STEP = register("laboratory_block_step"); + public static final DeferredHolder CONFIGURATION_TOOL_USE = register("configuration_tool_use"); } diff --git a/src/main/java/de/artemis/laboratoryblocks/common/registration/ModSoundType.java b/src/main/java/de/artemis/laboratoryblocks/common/registration/ModSoundType.java index 1a301c4..e90f0b6 100644 --- a/src/main/java/de/artemis/laboratoryblocks/common/registration/ModSoundType.java +++ b/src/main/java/de/artemis/laboratoryblocks/common/registration/ModSoundType.java @@ -1,10 +1,11 @@ package de.artemis.laboratoryblocks.common.registration; -import net.minecraftforge.common.util.ForgeSoundType; +import net.minecraft.world.level.block.SoundType; +import net.neoforged.neoforge.common.util.DeferredSoundType; public class ModSoundType { - public static final ForgeSoundType LABORATORY_BLOCK = new ForgeSoundType(1.0F, 1.0F, + public static final SoundType LABORATORY_BLOCK = new DeferredSoundType(1.0F, 1.0F, ModSoundEvents.LABORATORY_BLOCK_BREAK, ModSoundEvents.LABORATORY_BLOCK_STEP, ModSoundEvents.LABORATORY_BLOCK_PLACE, diff --git a/src/main/java/de/artemis/laboratoryblocks/common/registration/ModTags.java b/src/main/java/de/artemis/laboratoryblocks/common/registration/ModTags.java index 79ac935..af718ae 100644 --- a/src/main/java/de/artemis/laboratoryblocks/common/registration/ModTags.java +++ b/src/main/java/de/artemis/laboratoryblocks/common/registration/ModTags.java @@ -11,11 +11,11 @@ public static class Item { public static final TagKey STARCH_INGREDIENT = tag("starch_ingredient"); private static TagKey tag(String name) { - return ItemTags.create(new ResourceLocation(LaboratoryBlocks.MOD_ID, name)); + return ItemTags.create(ResourceLocation.fromNamespaceAndPath(LaboratoryBlocks.MOD_ID, name)); } - private static TagKey forgeTag(String name) { - return ItemTags.create(new ResourceLocation("forge", name)); + private static TagKey cTag(String name) { + return ItemTags.create(ResourceLocation.fromNamespaceAndPath("c", name)); } } } diff --git a/src/main/java/de/artemis/laboratoryblocks/common/registration/Registration.java b/src/main/java/de/artemis/laboratoryblocks/common/registration/Registration.java index fc9f9c2..c90d020 100644 --- a/src/main/java/de/artemis/laboratoryblocks/common/registration/Registration.java +++ b/src/main/java/de/artemis/laboratoryblocks/common/registration/Registration.java @@ -2,28 +2,24 @@ import de.artemis.laboratoryblocks.LaboratoryBlocks; import net.minecraft.core.particles.ParticleType; -import net.minecraft.core.registries.Registries; +import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.sounds.SoundEvent; import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.Item; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.entity.BlockEntityType; -import net.minecraftforge.eventbus.api.IEventBus; -import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; -import net.minecraftforge.registries.DeferredRegister; -import net.minecraftforge.registries.ForgeRegistries; +import net.neoforged.bus.api.IEventBus; +import net.neoforged.neoforge.registries.DeferredRegister; public class Registration { - public static final DeferredRegister BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, LaboratoryBlocks.MOD_ID); - public static final DeferredRegister ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, LaboratoryBlocks.MOD_ID); - public static final DeferredRegister SOUND_EVENTS = DeferredRegister.create(ForgeRegistries.SOUND_EVENTS, LaboratoryBlocks.MOD_ID); - public static final DeferredRegister> PARTICLE_TYPES = DeferredRegister.create(ForgeRegistries.PARTICLE_TYPES, LaboratoryBlocks.MOD_ID); - public static final DeferredRegister CREATIVE_MODE_TABS = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, LaboratoryBlocks.MOD_ID); - public static final DeferredRegister> BLOCK_ENTITIES = DeferredRegister.create(ForgeRegistries.BLOCK_ENTITY_TYPES, LaboratoryBlocks.MOD_ID); - - public static void register() { - IEventBus eventBus = FMLJavaModLoadingContext.get().getModEventBus(); + public static final DeferredRegister BLOCKS = DeferredRegister.create(BuiltInRegistries.BLOCK, LaboratoryBlocks.MOD_ID); + public static final DeferredRegister ITEMS = DeferredRegister.create(BuiltInRegistries.ITEM, LaboratoryBlocks.MOD_ID); + public static final DeferredRegister SOUND_EVENTS = DeferredRegister.create(BuiltInRegistries.SOUND_EVENT, LaboratoryBlocks.MOD_ID); + public static final DeferredRegister> PARTICLE_TYPES = DeferredRegister.create(BuiltInRegistries.PARTICLE_TYPE, LaboratoryBlocks.MOD_ID); + public static final DeferredRegister CREATIVE_MODE_TABS = DeferredRegister.create(BuiltInRegistries.CREATIVE_MODE_TAB, LaboratoryBlocks.MOD_ID); + public static final DeferredRegister> BLOCK_ENTITIES = DeferredRegister.create(BuiltInRegistries.BLOCK_ENTITY_TYPE, LaboratoryBlocks.MOD_ID); + public static void register(IEventBus eventBus) { BLOCKS.register(eventBus); ITEMS.register(eventBus); SOUND_EVENTS.register(eventBus); diff --git a/src/main/java/de/artemis/laboratoryblocks/common/util/KeyBindingUtil.java b/src/main/java/de/artemis/laboratoryblocks/common/util/KeyBindingUtil.java index 26e85af..60881a7 100644 --- a/src/main/java/de/artemis/laboratoryblocks/common/util/KeyBindingUtil.java +++ b/src/main/java/de/artemis/laboratoryblocks/common/util/KeyBindingUtil.java @@ -3,7 +3,7 @@ import com.mojang.blaze3d.platform.InputConstants; import net.minecraft.client.KeyMapping; import net.minecraft.client.Minecraft; -import net.minecraftforge.client.settings.KeyModifier; +import net.neoforged.neoforge.client.settings.KeyModifier; import org.lwjgl.glfw.GLFW; public class KeyBindingUtil { From e450e58adf6d208575372fd6fa44e248bb03733d Mon Sep 17 00:00:00 2001 From: EnderTurret <36442079+EnderTurret@users.noreply.github.com> Date: Tue, 26 Nov 2024 04:23:20 -0500 Subject: [PATCH 07/16] Clean up `ChiseledLaboratoryBookShelfBlock`. --- .../ChiseledLaboratoryBookShelfBlock.java | 75 +------------------ 1 file changed, 2 insertions(+), 73 deletions(-) diff --git a/src/main/java/de/artemis/laboratoryblocks/common/blocks/ChiseledLaboratoryBookShelfBlock.java b/src/main/java/de/artemis/laboratoryblocks/common/blocks/ChiseledLaboratoryBookShelfBlock.java index 1fbcd8e..3e14aa3 100644 --- a/src/main/java/de/artemis/laboratoryblocks/common/blocks/ChiseledLaboratoryBookShelfBlock.java +++ b/src/main/java/de/artemis/laboratoryblocks/common/blocks/ChiseledLaboratoryBookShelfBlock.java @@ -2,21 +2,14 @@ import de.artemis.laboratoryblocks.common.blockentities.ChiseledLaboratoryBookShelfBlockEntity; import net.minecraft.core.BlockPos; -import net.minecraft.sounds.SoundEvent; -import net.minecraft.sounds.SoundEvents; -import net.minecraft.sounds.SoundSource; -import net.minecraft.stats.Stats; -import net.minecraft.world.Containers; import net.minecraft.world.InteractionHand; import net.minecraft.world.ItemInteractionResult; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Items; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.ChiseledBookShelfBlock; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.gameevent.GameEvent; import net.minecraft.world.phys.BlockHitResult; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -109,72 +102,8 @@ else if (itemStackInHand.is(ModItems.CONFIGURATION_TOOL.get()) && blockState.get return result; } - private static void addBook(Level level, BlockPos blockPos, Player player, ChiseledLaboratoryBookShelfBlockEntity blockEntity, ItemStack books, int slot) { - if (!level.isClientSide) { - player.awardStat(Stats.ITEM_USED.get(books.getItem())); - SoundEvent soundEvent = books.is(Items.ENCHANTED_BOOK) ? SoundEvents.CHISELED_BOOKSHELF_INSERT_ENCHANTED : SoundEvents.CHISELED_BOOKSHELF_INSERT; - blockEntity.setItem(slot, books.split(1)); - level.playSound((Player) null, blockPos, soundEvent, SoundSource.BLOCKS, 1.0F, 1.0F); - if (player.isCreative()) { - books.grow(1); - } - - level.gameEvent(player, GameEvent.BLOCK_CHANGE, blockPos); - } - } - - private static void removeBook(Level pLevel, BlockPos pPos, Player pPlayer, ChiseledLaboratoryBookShelfBlockEntity pBlockEntity, int pSlot) { - if (!pLevel.isClientSide) { - ItemStack $$5 = pBlockEntity.removeItem(pSlot, 1); - SoundEvent $$6 = $$5.is(Items.ENCHANTED_BOOK) ? SoundEvents.CHISELED_BOOKSHELF_PICKUP_ENCHANTED : SoundEvents.CHISELED_BOOKSHELF_PICKUP; - pLevel.playSound((Player) null, pPos, $$6, SoundSource.BLOCKS, 1.0F, 1.0F); - if (!pPlayer.getInventory().add($$5)) { - pPlayer.drop($$5, false); - } - - pLevel.gameEvent(pPlayer, GameEvent.BLOCK_CHANGE, pPos); - } - } - - public @Nullable BlockEntity newBlockEntity(@NotNull BlockPos blockPos, @NotNull BlockState blockState) { - return new ChiseledLaboratoryBookShelfBlockEntity(blockPos, blockState); - } - @Override - public void onRemove(BlockState blockState, @NotNull Level level, @NotNull BlockPos blockPos, BlockState newBlockState, boolean movedByPiston) { - if (!blockState.is(newBlockState.getBlock())) { - BlockEntity blockEntity = level.getBlockEntity(blockPos); - if (blockEntity instanceof ChiseledLaboratoryBookShelfBlockEntity) { - ChiseledLaboratoryBookShelfBlockEntity bookShelfBlockEntity = (ChiseledLaboratoryBookShelfBlockEntity) blockEntity; - if (!bookShelfBlockEntity.isEmpty()) { - for (int i = 0; i < 6; ++i) { - ItemStack books = bookShelfBlockEntity.getItem(i); - if (!books.isEmpty()) { - Containers.dropItemStack(level, (double) blockPos.getX(), (double) blockPos.getY(), (double) blockPos.getZ(), books); - } - } - - bookShelfBlockEntity.clearContent(); - level.updateNeighbourForOutputSignal(blockPos, this); - } - } - - super.onRemove(blockState, level, blockPos, newBlockState, movedByPiston); - } - } - - @Override - public int getAnalogOutputSignal(@NotNull BlockState blockState, Level level, @NotNull BlockPos blockPos) { - if (level.isClientSide()) { - return 0; - } else { - BlockEntity blockEntity = level.getBlockEntity(blockPos); - if (blockEntity instanceof ChiseledLaboratoryBookShelfBlockEntity) { - ChiseledLaboratoryBookShelfBlockEntity bookShelfBlockEntity = (ChiseledLaboratoryBookShelfBlockEntity) blockEntity; - return bookShelfBlockEntity.getLastInteractedSlot() + 1; - } else { - return 0; - } - } + public @Nullable BlockEntity newBlockEntity(@NotNull BlockPos blockPos, @NotNull BlockState blockState) { + return new ChiseledLaboratoryBookShelfBlockEntity(blockPos, blockState); } } From b33502e6487aec7fa2000e67a8ddd86d8d11d94f Mon Sep 17 00:00:00 2001 From: EnderTurret <36442079+EnderTurret@users.noreply.github.com> Date: Tue, 26 Nov 2024 04:24:07 -0500 Subject: [PATCH 08/16] Fix missing override annotations. --- .../client/particle/custom/ApplyingGlowstoneParticle.java | 3 ++- .../client/particle/custom/ApplyingRedstoneParticle.java | 1 + .../client/particle/custom/RemovingModifierParticle.java | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/de/artemis/laboratoryblocks/client/particle/custom/ApplyingGlowstoneParticle.java b/src/main/java/de/artemis/laboratoryblocks/client/particle/custom/ApplyingGlowstoneParticle.java index 9b85a6a..e08f466 100644 --- a/src/main/java/de/artemis/laboratoryblocks/client/particle/custom/ApplyingGlowstoneParticle.java +++ b/src/main/java/de/artemis/laboratoryblocks/client/particle/custom/ApplyingGlowstoneParticle.java @@ -48,7 +48,8 @@ public Provider(SpriteSet spriteSet) { this.spriteSet = spriteSet; } - public Particle createParticle(@NotNull SimpleParticleType particleType, @NotNull ClientLevel level, double x, double y, double z, double dx, double dy, double dz) { + @Override + public Particle createParticle(@NotNull SimpleParticleType particleType, @NotNull ClientLevel level, double x, double y, double z, double dx, double dy, double dz) { ApplyingGlowstoneParticle applyingGlowstoneParticle = new ApplyingGlowstoneParticle(level, x, y, z, this.spriteSet, dx, dy, dz); applyingGlowstoneParticle.setColor(1F, 0.80F, 0.25F); diff --git a/src/main/java/de/artemis/laboratoryblocks/client/particle/custom/ApplyingRedstoneParticle.java b/src/main/java/de/artemis/laboratoryblocks/client/particle/custom/ApplyingRedstoneParticle.java index 2f44cb3..b57cc05 100644 --- a/src/main/java/de/artemis/laboratoryblocks/client/particle/custom/ApplyingRedstoneParticle.java +++ b/src/main/java/de/artemis/laboratoryblocks/client/particle/custom/ApplyingRedstoneParticle.java @@ -48,6 +48,7 @@ public Provider(SpriteSet spriteSet) { this.spriteSet = spriteSet; } + @Override public Particle createParticle(@NotNull SimpleParticleType particleType, @NotNull ClientLevel level, double x, double y, double z, double dx, double dy, double dz) { ApplyingRedstoneParticle applyingRedstoneParticle = new ApplyingRedstoneParticle(level, x, y, z, this.spriteSet, dx, dy, dz); applyingRedstoneParticle.setColor(0.67F, 0.06F, 0.004F); diff --git a/src/main/java/de/artemis/laboratoryblocks/client/particle/custom/RemovingModifierParticle.java b/src/main/java/de/artemis/laboratoryblocks/client/particle/custom/RemovingModifierParticle.java index f5a699f..c15ed4b 100644 --- a/src/main/java/de/artemis/laboratoryblocks/client/particle/custom/RemovingModifierParticle.java +++ b/src/main/java/de/artemis/laboratoryblocks/client/particle/custom/RemovingModifierParticle.java @@ -48,6 +48,7 @@ public Provider(SpriteSet spriteSet) { this.spriteSet = spriteSet; } + @Override public Particle createParticle(@NotNull SimpleParticleType particleType, @NotNull ClientLevel level, double x, double y, double z, double dx, double dy, double dz) { return new RemovingModifierParticle(level, x, y, z, this.spriteSet, dx, dy, dz); } From e8f65f27a4868ac47e83f7a92076e6d1fcc5f8f3 Mon Sep 17 00:00:00 2001 From: EnderTurret <36442079+EnderTurret@users.noreply.github.com> Date: Tue, 26 Nov 2024 04:26:28 -0500 Subject: [PATCH 09/16] Run data. --- build.gradle | 1 + .../550348c959e4076170dae2cb567a68e425dbdc9a | 2 +- .../59eb3dbb5f86130e09b3c62d89b9525ee01cf52d | 186 ++++---- .../658b4447709a913e7d207733571904cca1190a02 | 2 +- .../73115db2fadf9a5adb458c178689d36af3ada434 | 2 + .../9586aad834e893891bae2f65c3492b132aa839ed | 2 +- .../9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e | 418 +++++++++--------- .../c622617f6fabf890a00b9275cd5f643584a8a2c8 | 2 - .../f751b48f3773cf4dc85aeb52cf48d6ac806b7c33 | 2 +- .../f95c7003282837dabaa33e3ffceec4e6865b5218 | 2 +- .../acacia_laboratory_floor.json | 15 +- .../acacia_laboratory_tiles.json | 11 +- .../bamboo_laboratory_floor.json | 15 +- .../bamboo_laboratory_tiles.json | 11 +- .../birch_laboratory_floor.json | 15 +- .../birch_laboratory_tiles.json | 11 +- .../cherry_laboratory_floor.json | 15 +- .../cherry_laboratory_tiles.json | 11 +- .../chiseled_laboratory_bookshelf.json | 11 +- .../clear_laboratory_screen.json | 19 +- .../crimson_laboratory_floor.json | 15 +- .../crimson_laboratory_tiles.json | 11 +- .../dark_oak_laboratory_floor.json | 15 +- .../dark_oak_laboratory_tiles.json | 11 +- .../enlighted_acacia_laboratory_floor.json | 15 +- .../enlighted_acacia_laboratory_tiles.json | 15 +- .../enlighted_bamboo_laboratory_floor.json | 15 +- .../enlighted_bamboo_laboratory_tiles.json | 15 +- .../enlighted_birch_laboratory_floor.json | 15 +- .../enlighted_birch_laboratory_tiles.json | 15 +- .../enlighted_cherry_laboratory_floor.json | 15 +- .../enlighted_cherry_laboratory_tiles.json | 15 +- ...lighted_chiseled_laboratory_bookshelf.json | 15 +- .../enlighted_clear_laboratory_screen.json | 15 +- .../enlighted_crimson_laboratory_floor.json | 15 +- .../enlighted_crimson_laboratory_tiles.json | 15 +- .../enlighted_dark_oak_laboratory_floor.json | 15 +- .../enlighted_dark_oak_laboratory_tiles.json | 15 +- .../enlighted_gray_laboratory_pillar.json | 15 +- .../enlighted_gray_laboratory_tiles.json | 15 +- .../enlighted_jungle_laboratory_floor.json | 15 +- .../enlighted_jungle_laboratory_tiles.json | 15 +- .../enlighted_laboratory_block.json | 15 +- .../enlighted_laboratory_bookshelf.json | 15 +- .../enlighted_laboratory_fan.json | 15 +- ...ed_laboratory_fan_redstone_controlled.json | 15 +- .../enlighted_laboratory_glass.json | 15 +- .../enlighted_laboratory_pillar.json | 15 +- .../enlighted_laboratory_tiles.json | 15 +- .../enlighted_laboratory_vent.json | 15 +- .../enlighted_laboratory_vent_connecting.json | 11 +- ...faced_blue_signaling_laboratory_block.json | 15 +- ...aced_green_signaling_laboratory_block.json | 15 +- ...-faced_red_signaling_laboratory_block.json | 15 +- .../enlighted_mangrove_laboratory_floor.json | 15 +- .../enlighted_mangrove_laboratory_tiles.json | 15 +- .../enlighted_mixed_laboratory_tiles.json | 15 +- .../enlighted_oak_laboratory_floor.json | 15 +- .../enlighted_oak_laboratory_tiles.json | 15 +- .../building_blocks/enlighted_pla_block.json | 15 +- .../enlighted_pla_flooring.json | 15 +- .../building_blocks/enlighted_pla_tiles.json | 15 +- ...faced_blue_signaling_laboratory_block.json | 15 +- ...aced_green_signaling_laboratory_block.json | 15 +- ...-faced_red_signaling_laboratory_block.json | 15 +- .../enlighted_screwed_laboratory_block.json | 15 +- .../enlighted_spruce_laboratory_floor.json | 15 +- .../enlighted_spruce_laboratory_tiles.json | 15 +- .../enlighted_tiled_pla_flooring.json | 15 +- .../enlighted_warped_laboratory_floor.json | 15 +- .../enlighted_warped_laboratory_tiles.json | 15 +- .../gray_laboratory_pillar.json | 15 +- .../gray_laboratory_tiles.json | 15 +- .../jungle_laboratory_floor.json | 15 +- .../jungle_laboratory_tiles.json | 11 +- .../building_blocks/laboratory_block.json | 15 +- .../building_blocks/laboratory_bookshelf.json | 15 +- .../building_blocks/laboratory_fan.json | 19 +- .../laboratory_fan_redstone_controlled.json | 15 +- .../building_blocks/laboratory_glass.json | 15 +- .../building_blocks/laboratory_pillar.json | 11 +- .../building_blocks/laboratory_tiles.json | 11 +- .../building_blocks/laboratory_vent.json | 15 +- .../laboratory_vent_connecting.json | 11 +- ...faced_blue_signaling_laboratory_block.json | 11 +- ...aced_green_signaling_laboratory_block.json | 11 +- ...-faced_red_signaling_laboratory_block.json | 11 +- .../mangrove_laboratory_floor.json | 15 +- .../mangrove_laboratory_tiles.json | 11 +- .../mixed_laboratory_tiles.json | 15 +- .../building_blocks/oak_laboratory_floor.json | 15 +- .../building_blocks/oak_laboratory_tiles.json | 11 +- .../recipes/building_blocks/pla_block.json | 11 +- .../recipes/building_blocks/pla_flooring.json | 11 +- .../recipes/building_blocks/pla_tiles.json | 11 +- ...faced_blue_signaling_laboratory_block.json | 13 +- ...aced_green_signaling_laboratory_block.json | 13 +- ...-faced_red_signaling_laboratory_block.json | 13 +- .../screwed_laboratory_block.json | 15 +- .../spruce_laboratory_floor.json | 15 +- .../spruce_laboratory_tiles.json | 11 +- .../building_blocks/tiled_pla_flooring.json | 11 +- .../warped_laboratory_floor.json | 15 +- .../warped_laboratory_tiles.json | 11 +- .../recipes/misc/compressed_starch.json | 11 +- .../recipes/misc/configuration_tool.json | 23 +- .../recipes/misc/glowstone_particles.json | 11 +- .../recipes/misc/iron_screw.json | 15 +- .../recipes/misc/pla_sheets.json | 11 +- .../recipes/misc/redstone_particles.json | 11 +- .../recipes/misc/starch.json | 23 +- .../blocks/acacia_laboratory_floor.json | 0 .../blocks/acacia_laboratory_tiles.json | 0 .../blocks/bamboo_laboratory_floor.json | 0 .../blocks/bamboo_laboratory_tiles.json | 0 .../blocks/birch_laboratory_floor.json | 0 .../blocks/birch_laboratory_tiles.json | 0 .../blocks/cherry_laboratory_floor.json | 0 .../blocks/cherry_laboratory_tiles.json | 0 .../blocks/clear_laboratory_screen.json | 0 .../blocks/crimson_laboratory_floor.json | 0 .../blocks/crimson_laboratory_tiles.json | 0 .../blocks/dark_oak_laboratory_floor.json | 0 .../blocks/dark_oak_laboratory_tiles.json | 0 .../enlighted_acacia_laboratory_floor.json | 0 .../enlighted_acacia_laboratory_tiles.json | 0 .../enlighted_bamboo_laboratory_floor.json | 0 .../enlighted_bamboo_laboratory_tiles.json | 0 .../enlighted_birch_laboratory_floor.json | 0 .../enlighted_birch_laboratory_tiles.json | 0 .../enlighted_cherry_laboratory_floor.json | 0 .../enlighted_cherry_laboratory_tiles.json | 0 .../enlighted_clear_laboratory_screen.json | 0 .../enlighted_crimson_laboratory_floor.json | 0 .../enlighted_crimson_laboratory_tiles.json | 0 .../enlighted_dark_oak_laboratory_floor.json | 0 .../enlighted_dark_oak_laboratory_tiles.json | 0 .../enlighted_gray_laboratory_pillar.json | 0 .../enlighted_gray_laboratory_tiles.json | 0 .../enlighted_jungle_laboratory_floor.json | 0 .../enlighted_jungle_laboratory_tiles.json | 0 .../blocks/enlighted_laboratory_block.json | 0 .../enlighted_laboratory_bookshelf.json | 16 +- .../blocks/enlighted_laboratory_fan.json | 0 ...ed_laboratory_fan_redstone_controlled.json | 0 .../blocks/enlighted_laboratory_glass.json | 16 +- .../blocks/enlighted_laboratory_pillar.json | 0 .../blocks/enlighted_laboratory_tiles.json | 0 .../blocks/enlighted_laboratory_vent.json | 0 .../enlighted_laboratory_vent_connecting.json | 0 ...faced_blue_signaling_laboratory_block.json | 0 ...aced_green_signaling_laboratory_block.json | 0 ...-faced_red_signaling_laboratory_block.json | 0 .../enlighted_mangrove_laboratory_floor.json | 0 .../enlighted_mangrove_laboratory_tiles.json | 0 .../enlighted_mixed_laboratory_tiles.json | 0 .../enlighted_oak_laboratory_floor.json | 0 .../enlighted_oak_laboratory_tiles.json | 0 .../blocks/enlighted_pla_block.json | 0 .../blocks/enlighted_pla_flooring.json | 0 .../blocks/enlighted_pla_tiles.json | 0 ...faced_blue_signaling_laboratory_block.json | 0 ...aced_green_signaling_laboratory_block.json | 0 ...-faced_red_signaling_laboratory_block.json | 0 .../enlighted_screwed_laboratory_block.json | 0 .../enlighted_spruce_laboratory_floor.json | 0 .../enlighted_spruce_laboratory_tiles.json | 0 .../blocks/enlighted_tiled_pla_flooring.json | 0 .../enlighted_warped_laboratory_floor.json | 0 .../enlighted_warped_laboratory_tiles.json | 0 .../blocks/gray_laboratory_pillar.json | 0 .../blocks/gray_laboratory_tiles.json | 0 .../blocks/jungle_laboratory_floor.json | 0 .../blocks/jungle_laboratory_tiles.json | 0 .../blocks/laboratory_block.json | 0 .../blocks/laboratory_bookshelf.json | 16 +- .../blocks/laboratory_fan.json | 0 .../laboratory_fan_redstone_controlled.json | 0 .../blocks/laboratory_glass.json | 16 +- .../blocks/laboratory_pillar.json | 0 .../blocks/laboratory_tiles.json | 0 .../blocks/laboratory_vent.json | 0 .../blocks/laboratory_vent_connecting.json | 0 ...faced_blue_signaling_laboratory_block.json | 0 ...aced_green_signaling_laboratory_block.json | 0 ...-faced_red_signaling_laboratory_block.json | 0 .../blocks/mangrove_laboratory_floor.json | 0 .../blocks/mangrove_laboratory_tiles.json | 0 .../blocks/mixed_laboratory_tiles.json | 0 .../blocks/oak_laboratory_floor.json | 0 .../blocks/oak_laboratory_tiles.json | 0 .../blocks/pla_block.json | 0 .../blocks/pla_flooring.json | 0 .../blocks/pla_tiles.json | 0 ...faced_blue_signaling_laboratory_block.json | 0 ...aced_green_signaling_laboratory_block.json | 0 ...-faced_red_signaling_laboratory_block.json | 0 .../blocks/screwed_laboratory_block.json | 0 .../blocks/spruce_laboratory_floor.json | 0 .../blocks/spruce_laboratory_tiles.json | 0 .../blocks/tiled_pla_flooring.json | 0 .../blocks/warped_laboratory_floor.json | 0 .../blocks/warped_laboratory_tiles.json | 0 .../acacia_laboratory_floor.json | 5 +- .../acacia_laboratory_tiles.json | 5 +- .../bamboo_laboratory_floor.json | 5 +- .../bamboo_laboratory_tiles.json | 5 +- .../birch_laboratory_floor.json | 5 +- .../birch_laboratory_tiles.json | 5 +- .../cherry_laboratory_floor.json | 5 +- .../cherry_laboratory_tiles.json | 5 +- .../chiseled_laboratory_bookshelf.json | 6 +- .../clear_laboratory_screen.json | 5 +- .../compressed_starch.json | 6 +- .../configuration_tool.json | 6 +- .../crimson_laboratory_floor.json | 5 +- .../crimson_laboratory_tiles.json | 5 +- .../dark_oak_laboratory_floor.json | 5 +- .../dark_oak_laboratory_tiles.json | 5 +- .../enlighted_acacia_laboratory_floor.json | 3 +- .../enlighted_acacia_laboratory_tiles.json | 3 +- .../enlighted_bamboo_laboratory_floor.json | 3 +- .../enlighted_bamboo_laboratory_tiles.json | 3 +- .../enlighted_birch_laboratory_floor.json | 3 +- .../enlighted_birch_laboratory_tiles.json | 3 +- .../enlighted_cherry_laboratory_floor.json | 3 +- .../enlighted_cherry_laboratory_tiles.json | 3 +- ...lighted_chiseled_laboratory_bookshelf.json | 3 +- .../enlighted_clear_laboratory_screen.json | 3 +- .../enlighted_crimson_laboratory_floor.json | 3 +- .../enlighted_crimson_laboratory_tiles.json | 3 +- .../enlighted_dark_oak_laboratory_floor.json | 3 +- .../enlighted_dark_oak_laboratory_tiles.json | 3 +- .../enlighted_gray_laboratory_pillar.json | 3 +- .../enlighted_gray_laboratory_tiles.json | 3 +- .../enlighted_jungle_laboratory_floor.json | 3 +- .../enlighted_jungle_laboratory_tiles.json | 3 +- .../enlighted_laboratory_block.json | 3 +- .../enlighted_laboratory_bookshelf.json | 3 +- .../enlighted_laboratory_fan.json | 3 +- ...ed_laboratory_fan_redstone_controlled.json | 3 +- .../enlighted_laboratory_glass.json | 3 +- .../enlighted_laboratory_pillar.json | 3 +- .../enlighted_laboratory_tiles.json | 3 +- .../enlighted_laboratory_vent.json | 3 +- .../enlighted_laboratory_vent_connecting.json | 3 +- ...faced_blue_signaling_laboratory_block.json | 3 +- ...aced_green_signaling_laboratory_block.json | 3 +- ...-faced_red_signaling_laboratory_block.json | 3 +- .../enlighted_mangrove_laboratory_floor.json | 3 +- .../enlighted_mangrove_laboratory_tiles.json | 3 +- .../enlighted_mixed_laboratory_tiles.json | 3 +- .../enlighted_oak_laboratory_floor.json | 3 +- .../enlighted_oak_laboratory_tiles.json | 3 +- .../enlighted_pla_block.json | 3 +- .../enlighted_pla_flooring.json | 3 +- .../enlighted_pla_tiles.json | 3 +- ...faced_blue_signaling_laboratory_block.json | 3 +- ...aced_green_signaling_laboratory_block.json | 3 +- ...-faced_red_signaling_laboratory_block.json | 3 +- .../enlighted_screwed_laboratory_block.json | 3 +- .../enlighted_spruce_laboratory_floor.json | 3 +- .../enlighted_spruce_laboratory_tiles.json | 3 +- .../enlighted_tiled_pla_flooring.json | 3 +- .../enlighted_warped_laboratory_floor.json | 3 +- .../enlighted_warped_laboratory_tiles.json | 3 +- .../glowstone_particles.json | 2 +- .../gray_laboratory_pillar.json | 5 +- .../gray_laboratory_tiles.json | 5 +- .../{recipes => recipe}/iron_screw.json | 5 +- .../jungle_laboratory_floor.json | 5 +- .../jungle_laboratory_tiles.json | 5 +- .../{recipes => recipe}/laboratory_block.json | 5 +- .../laboratory_bookshelf.json | 6 +- .../{recipes => recipe}/laboratory_fan.json | 6 +- .../laboratory_fan_redstone_controlled.json | 3 +- .../{recipes => recipe}/laboratory_glass.json | 5 +- .../laboratory_pillar.json | 5 +- .../{recipes => recipe}/laboratory_tiles.json | 5 +- .../{recipes => recipe}/laboratory_vent.json | 6 +- .../laboratory_vent_connecting.json | 3 +- ...faced_blue_signaling_laboratory_block.json | 3 +- ...aced_green_signaling_laboratory_block.json | 3 +- ...-faced_red_signaling_laboratory_block.json | 3 +- .../mangrove_laboratory_floor.json | 5 +- .../mangrove_laboratory_tiles.json | 5 +- .../mixed_laboratory_tiles.json | 2 +- .../oak_laboratory_floor.json | 5 +- .../oak_laboratory_tiles.json | 5 +- .../{recipes => recipe}/pla_block.json | 6 +- .../{recipes => recipe}/pla_flooring.json | 5 +- .../{recipes => recipe}/pla_sheets.json | 5 +- .../{recipes => recipe}/pla_tiles.json | 5 +- .../redstone_particles.json | 2 +- ...faced_blue_signaling_laboratory_block.json | 5 +- ...aced_green_signaling_laboratory_block.json | 5 +- ...-faced_red_signaling_laboratory_block.json | 5 +- .../screwed_laboratory_block.json | 5 +- .../spruce_laboratory_floor.json | 5 +- .../spruce_laboratory_tiles.json | 5 +- .../{recipes => recipe}/starch.json | 3 +- .../tiled_pla_flooring.json | 5 +- .../warped_laboratory_floor.json | 5 +- .../warped_laboratory_tiles.json | 5 +- ...nt_connecting_and_glowstone_particles.json | 15 +- .../recipes/misc/from_redstone_particles.json | 11 +- .../recipes/misc/glowstone_dust.json | 11 +- ...nt_connecting_and_glowstone_particles.json | 3 +- .../from_redstone_particles.json | 3 +- .../{recipes => recipe}/glowstone_dust.json | 3 +- 310 files changed, 1057 insertions(+), 1494 deletions(-) create mode 100644 src/generated/resources/.cache/73115db2fadf9a5adb458c178689d36af3ada434 delete mode 100644 src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/acacia_laboratory_floor.json (73%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/acacia_laboratory_tiles.json (73%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/bamboo_laboratory_floor.json (73%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/bamboo_laboratory_tiles.json (73%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/birch_laboratory_floor.json (74%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/birch_laboratory_tiles.json (73%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/cherry_laboratory_floor.json (73%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/cherry_laboratory_tiles.json (73%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/chiseled_laboratory_bookshelf.json (74%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/clear_laboratory_screen.json (72%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/crimson_laboratory_floor.json (73%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/crimson_laboratory_tiles.json (73%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/dark_oak_laboratory_floor.json (73%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/dark_oak_laboratory_tiles.json (73%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/enlighted_acacia_laboratory_floor.json (73%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/enlighted_acacia_laboratory_tiles.json (73%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/enlighted_bamboo_laboratory_floor.json (73%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/enlighted_bamboo_laboratory_tiles.json (73%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/enlighted_birch_laboratory_floor.json (73%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/enlighted_birch_laboratory_tiles.json (73%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/enlighted_cherry_laboratory_floor.json (73%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/enlighted_cherry_laboratory_tiles.json (73%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/enlighted_chiseled_laboratory_bookshelf.json (73%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/enlighted_clear_laboratory_screen.json (73%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/enlighted_crimson_laboratory_floor.json (73%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/enlighted_crimson_laboratory_tiles.json (73%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/enlighted_dark_oak_laboratory_floor.json (73%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/enlighted_dark_oak_laboratory_tiles.json (73%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/enlighted_gray_laboratory_pillar.json (73%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/enlighted_gray_laboratory_tiles.json (73%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/enlighted_jungle_laboratory_floor.json (73%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/enlighted_jungle_laboratory_tiles.json (73%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/enlighted_laboratory_block.json (72%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/enlighted_laboratory_bookshelf.json (73%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/enlighted_laboratory_fan.json (72%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/enlighted_laboratory_fan_redstone_controlled.json (73%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/enlighted_laboratory_glass.json (72%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/enlighted_laboratory_pillar.json (72%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/enlighted_laboratory_tiles.json (72%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/enlighted_laboratory_vent.json (72%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/enlighted_laboratory_vent_connecting.json (73%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/enlighted_left-faced_blue_signaling_laboratory_block.json (73%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/enlighted_left-faced_green_signaling_laboratory_block.json (73%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/enlighted_left-faced_red_signaling_laboratory_block.json (73%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/enlighted_mangrove_laboratory_floor.json (73%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/enlighted_mangrove_laboratory_tiles.json (73%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/enlighted_mixed_laboratory_tiles.json (73%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/enlighted_oak_laboratory_floor.json (73%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/enlighted_oak_laboratory_tiles.json (73%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/enlighted_pla_block.json (72%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/enlighted_pla_flooring.json (72%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/enlighted_pla_tiles.json (72%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/enlighted_right-faced_blue_signaling_laboratory_block.json (73%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/enlighted_right-faced_green_signaling_laboratory_block.json (73%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/enlighted_right-faced_red_signaling_laboratory_block.json (73%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/enlighted_screwed_laboratory_block.json (73%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/enlighted_spruce_laboratory_floor.json (73%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/enlighted_spruce_laboratory_tiles.json (73%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/enlighted_tiled_pla_flooring.json (72%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/enlighted_warped_laboratory_floor.json (73%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/enlighted_warped_laboratory_tiles.json (73%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/gray_laboratory_pillar.json (74%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/gray_laboratory_tiles.json (74%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/jungle_laboratory_floor.json (73%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/jungle_laboratory_tiles.json (73%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/laboratory_block.json (75%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/laboratory_bookshelf.json (74%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/laboratory_fan.json (72%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/laboratory_fan_redstone_controlled.json (73%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/laboratory_glass.json (73%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/laboratory_pillar.json (74%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/laboratory_tiles.json (74%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/laboratory_vent.json (73%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/laboratory_vent_connecting.json (74%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/left-faced_blue_signaling_laboratory_block.json (71%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/left-faced_green_signaling_laboratory_block.json (71%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/left-faced_red_signaling_laboratory_block.json (71%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/mangrove_laboratory_floor.json (73%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/mangrove_laboratory_tiles.json (73%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/mixed_laboratory_tiles.json (72%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/oak_laboratory_floor.json (74%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/oak_laboratory_tiles.json (73%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/pla_block.json (74%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/pla_flooring.json (75%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/pla_tiles.json (74%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/right-faced_blue_signaling_laboratory_block.json (78%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/right-faced_green_signaling_laboratory_block.json (78%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/right-faced_red_signaling_laboratory_block.json (78%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/screwed_laboratory_block.json (73%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/spruce_laboratory_floor.json (73%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/spruce_laboratory_tiles.json (73%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/tiled_pla_flooring.json (75%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/warped_laboratory_floor.json (73%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/building_blocks/warped_laboratory_tiles.json (73%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/misc/compressed_starch.json (75%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/misc/configuration_tool.json (73%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/misc/glowstone_particles.json (75%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/misc/iron_screw.json (74%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/misc/pla_sheets.json (73%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/misc/redstone_particles.json (76%) rename src/generated/resources/data/laboratoryblocks/{advancements => advancement}/recipes/misc/starch.json (73%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/acacia_laboratory_floor.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/acacia_laboratory_tiles.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/bamboo_laboratory_floor.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/bamboo_laboratory_tiles.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/birch_laboratory_floor.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/birch_laboratory_tiles.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/cherry_laboratory_floor.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/cherry_laboratory_tiles.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/clear_laboratory_screen.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/crimson_laboratory_floor.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/crimson_laboratory_tiles.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/dark_oak_laboratory_floor.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/dark_oak_laboratory_tiles.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/enlighted_acacia_laboratory_floor.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/enlighted_acacia_laboratory_tiles.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/enlighted_bamboo_laboratory_floor.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/enlighted_bamboo_laboratory_tiles.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/enlighted_birch_laboratory_floor.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/enlighted_birch_laboratory_tiles.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/enlighted_cherry_laboratory_floor.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/enlighted_cherry_laboratory_tiles.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/enlighted_clear_laboratory_screen.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/enlighted_crimson_laboratory_floor.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/enlighted_crimson_laboratory_tiles.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/enlighted_dark_oak_laboratory_floor.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/enlighted_dark_oak_laboratory_tiles.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/enlighted_gray_laboratory_pillar.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/enlighted_gray_laboratory_tiles.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/enlighted_jungle_laboratory_floor.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/enlighted_jungle_laboratory_tiles.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/enlighted_laboratory_block.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/enlighted_laboratory_bookshelf.json (76%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/enlighted_laboratory_fan.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/enlighted_laboratory_fan_redstone_controlled.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/enlighted_laboratory_glass.json (76%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/enlighted_laboratory_pillar.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/enlighted_laboratory_tiles.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/enlighted_laboratory_vent.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/enlighted_laboratory_vent_connecting.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/enlighted_left-faced_blue_signaling_laboratory_block.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/enlighted_left-faced_green_signaling_laboratory_block.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/enlighted_left-faced_red_signaling_laboratory_block.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/enlighted_mangrove_laboratory_floor.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/enlighted_mangrove_laboratory_tiles.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/enlighted_mixed_laboratory_tiles.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/enlighted_oak_laboratory_floor.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/enlighted_oak_laboratory_tiles.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/enlighted_pla_block.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/enlighted_pla_flooring.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/enlighted_pla_tiles.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/enlighted_right-faced_blue_signaling_laboratory_block.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/enlighted_right-faced_green_signaling_laboratory_block.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/enlighted_right-faced_red_signaling_laboratory_block.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/enlighted_screwed_laboratory_block.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/enlighted_spruce_laboratory_floor.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/enlighted_spruce_laboratory_tiles.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/enlighted_tiled_pla_flooring.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/enlighted_warped_laboratory_floor.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/enlighted_warped_laboratory_tiles.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/gray_laboratory_pillar.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/gray_laboratory_tiles.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/jungle_laboratory_floor.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/jungle_laboratory_tiles.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/laboratory_block.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/laboratory_bookshelf.json (76%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/laboratory_fan.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/laboratory_fan_redstone_controlled.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/laboratory_glass.json (64%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/laboratory_pillar.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/laboratory_tiles.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/laboratory_vent.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/laboratory_vent_connecting.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/left-faced_blue_signaling_laboratory_block.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/left-faced_green_signaling_laboratory_block.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/left-faced_red_signaling_laboratory_block.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/mangrove_laboratory_floor.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/mangrove_laboratory_tiles.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/mixed_laboratory_tiles.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/oak_laboratory_floor.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/oak_laboratory_tiles.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/pla_block.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/pla_flooring.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/pla_tiles.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/right-faced_blue_signaling_laboratory_block.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/right-faced_green_signaling_laboratory_block.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/right-faced_red_signaling_laboratory_block.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/screwed_laboratory_block.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/spruce_laboratory_floor.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/spruce_laboratory_tiles.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/tiled_pla_flooring.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/warped_laboratory_floor.json (100%) rename src/generated/resources/data/laboratoryblocks/{loot_tables => loot_table}/blocks/warped_laboratory_tiles.json (100%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/acacia_laboratory_floor.json (76%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/acacia_laboratory_tiles.json (72%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/bamboo_laboratory_floor.json (76%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/bamboo_laboratory_tiles.json (72%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/birch_laboratory_floor.json (76%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/birch_laboratory_tiles.json (72%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/cherry_laboratory_floor.json (76%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/cherry_laboratory_tiles.json (72%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/chiseled_laboratory_bookshelf.json (69%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/clear_laboratory_screen.json (80%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/compressed_starch.json (69%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/configuration_tool.json (81%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/crimson_laboratory_floor.json (76%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/crimson_laboratory_tiles.json (71%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/dark_oak_laboratory_floor.json (76%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/dark_oak_laboratory_tiles.json (71%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/enlighted_acacia_laboratory_floor.json (75%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/enlighted_acacia_laboratory_tiles.json (75%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/enlighted_bamboo_laboratory_floor.json (75%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/enlighted_bamboo_laboratory_tiles.json (75%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/enlighted_birch_laboratory_floor.json (76%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/enlighted_birch_laboratory_tiles.json (76%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/enlighted_cherry_laboratory_floor.json (75%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/enlighted_cherry_laboratory_tiles.json (75%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/enlighted_chiseled_laboratory_bookshelf.json (74%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/enlighted_clear_laboratory_screen.json (75%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/enlighted_crimson_laboratory_floor.json (75%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/enlighted_crimson_laboratory_tiles.json (75%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/enlighted_dark_oak_laboratory_floor.json (75%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/enlighted_dark_oak_laboratory_tiles.json (75%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/enlighted_gray_laboratory_pillar.json (76%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/enlighted_gray_laboratory_tiles.json (76%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/enlighted_jungle_laboratory_floor.json (75%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/enlighted_jungle_laboratory_tiles.json (75%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/enlighted_laboratory_block.json (76%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/enlighted_laboratory_bookshelf.json (76%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/enlighted_laboratory_fan.json (77%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/enlighted_laboratory_fan_redstone_controlled.json (73%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/enlighted_laboratory_glass.json (76%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/enlighted_laboratory_pillar.json (76%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/enlighted_laboratory_tiles.json (76%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/enlighted_laboratory_vent.json (77%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/enlighted_laboratory_vent_connecting.json (70%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/enlighted_left-faced_blue_signaling_laboratory_block.json (73%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/enlighted_left-faced_green_signaling_laboratory_block.json (73%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/enlighted_left-faced_red_signaling_laboratory_block.json (73%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/enlighted_mangrove_laboratory_floor.json (75%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/enlighted_mangrove_laboratory_tiles.json (75%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/enlighted_mixed_laboratory_tiles.json (76%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/enlighted_oak_laboratory_floor.json (76%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/enlighted_oak_laboratory_tiles.json (76%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/enlighted_pla_block.json (78%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/enlighted_pla_flooring.json (77%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/enlighted_pla_tiles.json (78%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/enlighted_right-faced_blue_signaling_laboratory_block.json (73%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/enlighted_right-faced_green_signaling_laboratory_block.json (72%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/enlighted_right-faced_red_signaling_laboratory_block.json (73%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/enlighted_screwed_laboratory_block.json (75%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/enlighted_spruce_laboratory_floor.json (75%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/enlighted_spruce_laboratory_tiles.json (75%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/enlighted_tiled_pla_flooring.json (76%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/enlighted_warped_laboratory_floor.json (75%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/enlighted_warped_laboratory_tiles.json (75%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/glowstone_particles.json (77%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/gray_laboratory_pillar.json (76%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/gray_laboratory_tiles.json (76%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/iron_screw.json (77%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/jungle_laboratory_floor.json (76%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/jungle_laboratory_tiles.json (72%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/laboratory_block.json (76%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/laboratory_bookshelf.json (75%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/laboratory_fan.json (80%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/laboratory_fan_redstone_controlled.json (74%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/laboratory_glass.json (77%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/laboratory_pillar.json (72%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/laboratory_tiles.json (73%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/laboratory_vent.json (77%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/laboratory_vent_connecting.json (70%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/left-faced_blue_signaling_laboratory_block.json (69%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/left-faced_green_signaling_laboratory_block.json (69%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/left-faced_red_signaling_laboratory_block.json (69%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/mangrove_laboratory_floor.json (76%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/mangrove_laboratory_tiles.json (71%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/mixed_laboratory_tiles.json (82%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/oak_laboratory_floor.json (77%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/oak_laboratory_tiles.json (72%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/pla_block.json (72%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/pla_flooring.json (72%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/pla_sheets.json (70%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/pla_tiles.json (74%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/redstone_particles.json (77%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/right-faced_blue_signaling_laboratory_block.json (76%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/right-faced_green_signaling_laboratory_block.json (75%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/right-faced_red_signaling_laboratory_block.json (76%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/screwed_laboratory_block.json (76%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/spruce_laboratory_floor.json (76%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/spruce_laboratory_tiles.json (72%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/starch.json (87%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/tiled_pla_flooring.json (70%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/warped_laboratory_floor.json (76%) rename src/generated/resources/data/laboratoryblocks/{recipes => recipe}/warped_laboratory_tiles.json (72%) rename src/generated/resources/data/minecraft/{advancements => advancement}/recipes/building_blocks/enlighted_laboratory_vent_connecting_from_laboratory_vent_connecting_and_glowstone_particles.json (75%) rename src/generated/resources/data/minecraft/{advancements => advancement}/recipes/misc/from_redstone_particles.json (73%) rename src/generated/resources/data/minecraft/{advancements => advancement}/recipes/misc/glowstone_dust.json (72%) rename src/generated/resources/data/minecraft/{recipes => recipe}/enlighted_laboratory_vent_connecting_from_laboratory_vent_connecting_and_glowstone_particles.json (75%) rename src/generated/resources/data/minecraft/{recipes => recipe}/from_redstone_particles.json (93%) rename src/generated/resources/data/minecraft/{recipes => recipe}/glowstone_dust.json (92%) diff --git a/build.gradle b/build.gradle index 148d99f..13ffa97 100644 --- a/build.gradle +++ b/build.gradle @@ -49,6 +49,7 @@ neoForge { data { data() ideName = 'runLaboratoryBlocksData' + programArguments.addAll '--mod', "laboratoryblocks", '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath() } } } diff --git a/src/generated/resources/.cache/550348c959e4076170dae2cb567a68e425dbdc9a b/src/generated/resources/.cache/550348c959e4076170dae2cb567a68e425dbdc9a index 1d80d39..36e872e 100644 --- a/src/generated/resources/.cache/550348c959e4076170dae2cb567a68e425dbdc9a +++ b/src/generated/resources/.cache/550348c959e4076170dae2cb567a68e425dbdc9a @@ -1,4 +1,4 @@ -// 1.20.1 2024-06-09T22:57:15.1573872 Block States: laboratoryblocks +// 1.21.1 2024-11-26T04:25:40.172428177 Block States: laboratoryblocks 4608b891d42661e2eabce738c6c554475bb19d3f assets/laboratoryblocks/blockstates/acacia_laboratory_floor.json 0ff572a25b3d4fa368b87ba016f04b79593205be assets/laboratoryblocks/blockstates/acacia_laboratory_tiles.json b123ac106b1a7120053c1980872682b149681b4d assets/laboratoryblocks/blockstates/bamboo_laboratory_floor.json diff --git a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d index ceb76cb..b3de219 100644 --- a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d +++ b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d @@ -1,93 +1,93 @@ -// 1.20.1 2024-06-09T22:57:15.1533842 Loot Tables -e0384af235d78fd317f0c97c1ded83fd25286eb7 data/laboratoryblocks/loot_tables/blocks/acacia_laboratory_floor.json -d6310d32c81c7256e0d2d447985cd8e3014bc40e data/laboratoryblocks/loot_tables/blocks/acacia_laboratory_tiles.json -d490be1fec81b56bc8cd1c19361a97b6c874688a data/laboratoryblocks/loot_tables/blocks/bamboo_laboratory_floor.json -c25ddc75a8b13feb54bd79556eddc672d8ece2c4 data/laboratoryblocks/loot_tables/blocks/bamboo_laboratory_tiles.json -bcf3763b635043769151981c90be6c6c6002b398 data/laboratoryblocks/loot_tables/blocks/birch_laboratory_floor.json -4a893c6797fe6900ccdd255215faddf986156793 data/laboratoryblocks/loot_tables/blocks/birch_laboratory_tiles.json -4c6226deb69a3f4575bac9b8c195808941816a2d data/laboratoryblocks/loot_tables/blocks/cherry_laboratory_floor.json -d74c2ed9f62af62dd05bc972caf9144483d3fbfe data/laboratoryblocks/loot_tables/blocks/cherry_laboratory_tiles.json -b00c65e2b3ac8d147703b960630cfa90f4bc2941 data/laboratoryblocks/loot_tables/blocks/clear_laboratory_screen.json -3bb09c828176550d1017117a29c8c315fa55679d data/laboratoryblocks/loot_tables/blocks/crimson_laboratory_floor.json -76d772ec9cee4de98d4fbbec2740e6ad4f22d7cc data/laboratoryblocks/loot_tables/blocks/crimson_laboratory_tiles.json -e3b550a2b3c90280e9614bdbca07a3a74aa043c6 data/laboratoryblocks/loot_tables/blocks/dark_oak_laboratory_floor.json -3cc0e9a614c9c852e3b1c80b6f2296d2b5208a82 data/laboratoryblocks/loot_tables/blocks/dark_oak_laboratory_tiles.json -d483a174e03e8d3267d5da52cc4d35358b0dd418 data/laboratoryblocks/loot_tables/blocks/enlighted_acacia_laboratory_floor.json -f767c7e9d4a0651760f556d0411b280a8f6db79c data/laboratoryblocks/loot_tables/blocks/enlighted_acacia_laboratory_tiles.json -2a28e4ecf70ec8e2baf592532d349288bbaea71f data/laboratoryblocks/loot_tables/blocks/enlighted_bamboo_laboratory_floor.json -830b2e4ab8e969dd86785fb1b2c9b772c7074306 data/laboratoryblocks/loot_tables/blocks/enlighted_bamboo_laboratory_tiles.json -6a6e10e4acf3a49368bcf726970a9bb66ff5c399 data/laboratoryblocks/loot_tables/blocks/enlighted_birch_laboratory_floor.json -3cdc7df166c2251b171f96cdb0eb0975636cffdf data/laboratoryblocks/loot_tables/blocks/enlighted_birch_laboratory_tiles.json -b7da5c5cd4ce93800001fcb3fc2043e2394009fc data/laboratoryblocks/loot_tables/blocks/enlighted_cherry_laboratory_floor.json -504a6028dfa82e3078576b518826d56c69e03d48 data/laboratoryblocks/loot_tables/blocks/enlighted_cherry_laboratory_tiles.json -958bd5b91f1468078b26d61a221bfb412e011de0 data/laboratoryblocks/loot_tables/blocks/enlighted_clear_laboratory_screen.json -6dcaeb03cb6773cf261daf03009e7a2c8cce9065 data/laboratoryblocks/loot_tables/blocks/enlighted_crimson_laboratory_floor.json -f733ea4ff590474faf6d79d248c9e128aa740c81 data/laboratoryblocks/loot_tables/blocks/enlighted_crimson_laboratory_tiles.json -d5c7b1c4653869f8b5cb8482344888117e3896ac data/laboratoryblocks/loot_tables/blocks/enlighted_dark_oak_laboratory_floor.json -18ebeb3d7c03d85858c8226a4ae5bf0d90eb6f44 data/laboratoryblocks/loot_tables/blocks/enlighted_dark_oak_laboratory_tiles.json -30eb8e3aaa13a1964214547c94513790c5c1ec37 data/laboratoryblocks/loot_tables/blocks/enlighted_gray_laboratory_pillar.json -dae0fad1caa471b3b240c832b59ed6b697b0ec22 data/laboratoryblocks/loot_tables/blocks/enlighted_gray_laboratory_tiles.json -1b4b2265318a46dc23272431e543c1d25c95abdb data/laboratoryblocks/loot_tables/blocks/enlighted_jungle_laboratory_floor.json -6e4704564397c02ec8b3228a01746bfd9a377284 data/laboratoryblocks/loot_tables/blocks/enlighted_jungle_laboratory_tiles.json -b5085f0c4b4c93b764f18800df52d5a52128592f data/laboratoryblocks/loot_tables/blocks/enlighted_laboratory_block.json -5fe2f45d7656138d0201809f27f5db3551bb66e8 data/laboratoryblocks/loot_tables/blocks/enlighted_laboratory_bookshelf.json -a864048d3c9cee403b33892af8e106e350f5559b data/laboratoryblocks/loot_tables/blocks/enlighted_laboratory_fan.json -4ec424ca5513b5b25437fec866d28cd31e5bce10 data/laboratoryblocks/loot_tables/blocks/enlighted_laboratory_fan_redstone_controlled.json -77cbba7a184438efe7202ffe8bea19e071115212 data/laboratoryblocks/loot_tables/blocks/enlighted_laboratory_glass.json -1d6e191f854767849b34d7fcd55dc407fbcd1ecc data/laboratoryblocks/loot_tables/blocks/enlighted_laboratory_pillar.json -55fafeecf04d00f6a299dc0b3e928a32fdb00e37 data/laboratoryblocks/loot_tables/blocks/enlighted_laboratory_tiles.json -ec6be4dbf4400b6d8c720d475de9e4e23b28881b data/laboratoryblocks/loot_tables/blocks/enlighted_laboratory_vent.json -5e19785985f637a8c02589fcf6e353f47889f10e data/laboratoryblocks/loot_tables/blocks/enlighted_laboratory_vent_connecting.json -4af70e0ae33848ac90dd4367ace70961226097b7 data/laboratoryblocks/loot_tables/blocks/enlighted_left-faced_blue_signaling_laboratory_block.json -3bfc0754c0f8a2a9959eedc906c5335f276d8bf8 data/laboratoryblocks/loot_tables/blocks/enlighted_left-faced_green_signaling_laboratory_block.json -7209640ff1d03827c81eb12118957fc52b6be035 data/laboratoryblocks/loot_tables/blocks/enlighted_left-faced_red_signaling_laboratory_block.json -4140d4c162c50ba2d98b8bcb0cf6f3a30397247b data/laboratoryblocks/loot_tables/blocks/enlighted_mangrove_laboratory_floor.json -89819556b15af456544aec1e0514a38e7fc66afa data/laboratoryblocks/loot_tables/blocks/enlighted_mangrove_laboratory_tiles.json -55efb83a5432bcd0cd311b07105c6d3cc21f695c data/laboratoryblocks/loot_tables/blocks/enlighted_mixed_laboratory_tiles.json -de7d56959c084676dcce946844a41eedfbf0635b data/laboratoryblocks/loot_tables/blocks/enlighted_oak_laboratory_floor.json -a194d1780112e31634fb63b7544c708ced7d111e data/laboratoryblocks/loot_tables/blocks/enlighted_oak_laboratory_tiles.json -2bc11a9977e6f87c14309197e17326139defcd94 data/laboratoryblocks/loot_tables/blocks/enlighted_pla_block.json -8cbd2e03a4ccde7c8e03a9e24c09f8acc62cdea8 data/laboratoryblocks/loot_tables/blocks/enlighted_pla_flooring.json -1a055dba6ba17fd2fb3c8628ee78914495f1ad79 data/laboratoryblocks/loot_tables/blocks/enlighted_pla_tiles.json -9e2849f4955b2acdee90afa34f7db51e0d3c449a data/laboratoryblocks/loot_tables/blocks/enlighted_right-faced_blue_signaling_laboratory_block.json -d20a992e8db330856ede823a50ad12e950028b13 data/laboratoryblocks/loot_tables/blocks/enlighted_right-faced_green_signaling_laboratory_block.json -359d2e10f1796fcd88a7f44ffb63449a68c382c6 data/laboratoryblocks/loot_tables/blocks/enlighted_right-faced_red_signaling_laboratory_block.json -a48be56ce89be30181db25a5c47bfd4718eed206 data/laboratoryblocks/loot_tables/blocks/enlighted_screwed_laboratory_block.json -95d28ca0b80fc7cc669397a9a471398ba1a1c9fc data/laboratoryblocks/loot_tables/blocks/enlighted_spruce_laboratory_floor.json -2fedafeba67b449b8be49887f9a9b396f1a4b10c data/laboratoryblocks/loot_tables/blocks/enlighted_spruce_laboratory_tiles.json -2d41c3be557593177f4e6cbc79c6dc040d1d11f2 data/laboratoryblocks/loot_tables/blocks/enlighted_tiled_pla_flooring.json -5cced74d592474dfc55ff53c896b4dfd5f14660b data/laboratoryblocks/loot_tables/blocks/enlighted_warped_laboratory_floor.json -0fa3b5a97d2e47bc08a12e1b43c815c639910bb8 data/laboratoryblocks/loot_tables/blocks/enlighted_warped_laboratory_tiles.json -54307581fdda031632706be877e3f950f2057b1e data/laboratoryblocks/loot_tables/blocks/gray_laboratory_pillar.json -f4755a4f8901ad6d6c8046ccaa1e892320b3a374 data/laboratoryblocks/loot_tables/blocks/gray_laboratory_tiles.json -2ebab316a7c8953c5846db8e1ad641784ef59a24 data/laboratoryblocks/loot_tables/blocks/jungle_laboratory_floor.json -2790d6aa1e04849b994ab0295ebfa7555d32916a data/laboratoryblocks/loot_tables/blocks/jungle_laboratory_tiles.json -7d235d4532513e269dc50a5f471ecd6d0373848b data/laboratoryblocks/loot_tables/blocks/laboratory_block.json -de913ec84fb93e156131ce938d89f571b8918072 data/laboratoryblocks/loot_tables/blocks/laboratory_bookshelf.json -f2749978e1bcc1c084df69101b08323c8102ca1f data/laboratoryblocks/loot_tables/blocks/laboratory_fan.json -ff5c9bf57a91eff288cd3f556f3195c09284cdbf data/laboratoryblocks/loot_tables/blocks/laboratory_fan_redstone_controlled.json -8f5d042d25f0015ae4ceaf971147d2f5da090bbd data/laboratoryblocks/loot_tables/blocks/laboratory_glass.json -bc8067368cb80cc6f7d50e82d6d210693b3e04b2 data/laboratoryblocks/loot_tables/blocks/laboratory_pillar.json -dae21403effa6ac759a8aaab8fdaabe522403872 data/laboratoryblocks/loot_tables/blocks/laboratory_tiles.json -0bc6519b27f8787c2572b489198a69927e481efa data/laboratoryblocks/loot_tables/blocks/laboratory_vent.json -b6793c5cf0f0e79d5395df7e970ec6eb6257704c data/laboratoryblocks/loot_tables/blocks/laboratory_vent_connecting.json -3953c685e2760eb8273d5c91f9f28ddc86614dc9 data/laboratoryblocks/loot_tables/blocks/left-faced_blue_signaling_laboratory_block.json -4ff1d679381cf999df1c3d7839090428900846be data/laboratoryblocks/loot_tables/blocks/left-faced_green_signaling_laboratory_block.json -05299d84a9124b89eb03533be234e622d97f512e data/laboratoryblocks/loot_tables/blocks/left-faced_red_signaling_laboratory_block.json -06aa1832754df661072b99f71702e2f329bdaec8 data/laboratoryblocks/loot_tables/blocks/mangrove_laboratory_floor.json -8e371c4629b4103542d2448839edf3f58ccb1d86 data/laboratoryblocks/loot_tables/blocks/mangrove_laboratory_tiles.json -7de5ab1db57d3ff258caf51f3ad6f06140c08ca9 data/laboratoryblocks/loot_tables/blocks/mixed_laboratory_tiles.json -51ea0deb99da7cff1a8fdc3989fc6f026949851d data/laboratoryblocks/loot_tables/blocks/oak_laboratory_floor.json -c86ceb63ddc86d8260ff91f3ac06a9e0cac60341 data/laboratoryblocks/loot_tables/blocks/oak_laboratory_tiles.json -4d38206706178c8eded382723aea2b2b4881bcb8 data/laboratoryblocks/loot_tables/blocks/pla_block.json -8b551d2e6cf192853b06194d508e6b5e98401d2a data/laboratoryblocks/loot_tables/blocks/pla_flooring.json -674568a1c4c3cd074356ac65e137f76a38b5e7a4 data/laboratoryblocks/loot_tables/blocks/pla_tiles.json -f868caaeeba1b06cd591a43be3c6dbabe3c8f1da data/laboratoryblocks/loot_tables/blocks/right-faced_blue_signaling_laboratory_block.json -960ed6f31fce8e6abcff05d261d63f07fe012aaf data/laboratoryblocks/loot_tables/blocks/right-faced_green_signaling_laboratory_block.json -b07be81eab5bd9c309516004b9fde7dde7f8dd72 data/laboratoryblocks/loot_tables/blocks/right-faced_red_signaling_laboratory_block.json -cc90f86ad88b0a14a310436720c6fb823014081a data/laboratoryblocks/loot_tables/blocks/screwed_laboratory_block.json -947de71d3e086de284e369390185b7d6eccb2b74 data/laboratoryblocks/loot_tables/blocks/spruce_laboratory_floor.json -9844ca8e48d4a417f4758bf947d2f119daa339f6 data/laboratoryblocks/loot_tables/blocks/spruce_laboratory_tiles.json -377dc7eec4772d5a8e57b0170499eed3c7904008 data/laboratoryblocks/loot_tables/blocks/tiled_pla_flooring.json -f53efa06a717755e9967fe7e0eec1d336143571f data/laboratoryblocks/loot_tables/blocks/warped_laboratory_floor.json -51de9bb3bbe0700416e675c11f0ca09c3bfe7b31 data/laboratoryblocks/loot_tables/blocks/warped_laboratory_tiles.json +// 1.21.1 2024-11-26T04:25:40.170765185 Loot Tables +e0384af235d78fd317f0c97c1ded83fd25286eb7 data/laboratoryblocks/loot_table/blocks/acacia_laboratory_floor.json +d6310d32c81c7256e0d2d447985cd8e3014bc40e data/laboratoryblocks/loot_table/blocks/acacia_laboratory_tiles.json +d490be1fec81b56bc8cd1c19361a97b6c874688a data/laboratoryblocks/loot_table/blocks/bamboo_laboratory_floor.json +c25ddc75a8b13feb54bd79556eddc672d8ece2c4 data/laboratoryblocks/loot_table/blocks/bamboo_laboratory_tiles.json +bcf3763b635043769151981c90be6c6c6002b398 data/laboratoryblocks/loot_table/blocks/birch_laboratory_floor.json +4a893c6797fe6900ccdd255215faddf986156793 data/laboratoryblocks/loot_table/blocks/birch_laboratory_tiles.json +4c6226deb69a3f4575bac9b8c195808941816a2d data/laboratoryblocks/loot_table/blocks/cherry_laboratory_floor.json +d74c2ed9f62af62dd05bc972caf9144483d3fbfe data/laboratoryblocks/loot_table/blocks/cherry_laboratory_tiles.json +b00c65e2b3ac8d147703b960630cfa90f4bc2941 data/laboratoryblocks/loot_table/blocks/clear_laboratory_screen.json +3bb09c828176550d1017117a29c8c315fa55679d data/laboratoryblocks/loot_table/blocks/crimson_laboratory_floor.json +76d772ec9cee4de98d4fbbec2740e6ad4f22d7cc data/laboratoryblocks/loot_table/blocks/crimson_laboratory_tiles.json +e3b550a2b3c90280e9614bdbca07a3a74aa043c6 data/laboratoryblocks/loot_table/blocks/dark_oak_laboratory_floor.json +3cc0e9a614c9c852e3b1c80b6f2296d2b5208a82 data/laboratoryblocks/loot_table/blocks/dark_oak_laboratory_tiles.json +d483a174e03e8d3267d5da52cc4d35358b0dd418 data/laboratoryblocks/loot_table/blocks/enlighted_acacia_laboratory_floor.json +f767c7e9d4a0651760f556d0411b280a8f6db79c data/laboratoryblocks/loot_table/blocks/enlighted_acacia_laboratory_tiles.json +2a28e4ecf70ec8e2baf592532d349288bbaea71f data/laboratoryblocks/loot_table/blocks/enlighted_bamboo_laboratory_floor.json +830b2e4ab8e969dd86785fb1b2c9b772c7074306 data/laboratoryblocks/loot_table/blocks/enlighted_bamboo_laboratory_tiles.json +6a6e10e4acf3a49368bcf726970a9bb66ff5c399 data/laboratoryblocks/loot_table/blocks/enlighted_birch_laboratory_floor.json +3cdc7df166c2251b171f96cdb0eb0975636cffdf data/laboratoryblocks/loot_table/blocks/enlighted_birch_laboratory_tiles.json +b7da5c5cd4ce93800001fcb3fc2043e2394009fc data/laboratoryblocks/loot_table/blocks/enlighted_cherry_laboratory_floor.json +504a6028dfa82e3078576b518826d56c69e03d48 data/laboratoryblocks/loot_table/blocks/enlighted_cherry_laboratory_tiles.json +958bd5b91f1468078b26d61a221bfb412e011de0 data/laboratoryblocks/loot_table/blocks/enlighted_clear_laboratory_screen.json +6dcaeb03cb6773cf261daf03009e7a2c8cce9065 data/laboratoryblocks/loot_table/blocks/enlighted_crimson_laboratory_floor.json +f733ea4ff590474faf6d79d248c9e128aa740c81 data/laboratoryblocks/loot_table/blocks/enlighted_crimson_laboratory_tiles.json +d5c7b1c4653869f8b5cb8482344888117e3896ac data/laboratoryblocks/loot_table/blocks/enlighted_dark_oak_laboratory_floor.json +18ebeb3d7c03d85858c8226a4ae5bf0d90eb6f44 data/laboratoryblocks/loot_table/blocks/enlighted_dark_oak_laboratory_tiles.json +30eb8e3aaa13a1964214547c94513790c5c1ec37 data/laboratoryblocks/loot_table/blocks/enlighted_gray_laboratory_pillar.json +dae0fad1caa471b3b240c832b59ed6b697b0ec22 data/laboratoryblocks/loot_table/blocks/enlighted_gray_laboratory_tiles.json +1b4b2265318a46dc23272431e543c1d25c95abdb data/laboratoryblocks/loot_table/blocks/enlighted_jungle_laboratory_floor.json +6e4704564397c02ec8b3228a01746bfd9a377284 data/laboratoryblocks/loot_table/blocks/enlighted_jungle_laboratory_tiles.json +b5085f0c4b4c93b764f18800df52d5a52128592f data/laboratoryblocks/loot_table/blocks/enlighted_laboratory_block.json +a1d70acf30bf173de32fa4494ba404511cd3cab3 data/laboratoryblocks/loot_table/blocks/enlighted_laboratory_bookshelf.json +a864048d3c9cee403b33892af8e106e350f5559b data/laboratoryblocks/loot_table/blocks/enlighted_laboratory_fan.json +4ec424ca5513b5b25437fec866d28cd31e5bce10 data/laboratoryblocks/loot_table/blocks/enlighted_laboratory_fan_redstone_controlled.json +516970acd912a5eab5fc998195c124a0485872c4 data/laboratoryblocks/loot_table/blocks/enlighted_laboratory_glass.json +1d6e191f854767849b34d7fcd55dc407fbcd1ecc data/laboratoryblocks/loot_table/blocks/enlighted_laboratory_pillar.json +55fafeecf04d00f6a299dc0b3e928a32fdb00e37 data/laboratoryblocks/loot_table/blocks/enlighted_laboratory_tiles.json +ec6be4dbf4400b6d8c720d475de9e4e23b28881b data/laboratoryblocks/loot_table/blocks/enlighted_laboratory_vent.json +5e19785985f637a8c02589fcf6e353f47889f10e data/laboratoryblocks/loot_table/blocks/enlighted_laboratory_vent_connecting.json +4af70e0ae33848ac90dd4367ace70961226097b7 data/laboratoryblocks/loot_table/blocks/enlighted_left-faced_blue_signaling_laboratory_block.json +3bfc0754c0f8a2a9959eedc906c5335f276d8bf8 data/laboratoryblocks/loot_table/blocks/enlighted_left-faced_green_signaling_laboratory_block.json +7209640ff1d03827c81eb12118957fc52b6be035 data/laboratoryblocks/loot_table/blocks/enlighted_left-faced_red_signaling_laboratory_block.json +4140d4c162c50ba2d98b8bcb0cf6f3a30397247b data/laboratoryblocks/loot_table/blocks/enlighted_mangrove_laboratory_floor.json +89819556b15af456544aec1e0514a38e7fc66afa data/laboratoryblocks/loot_table/blocks/enlighted_mangrove_laboratory_tiles.json +55efb83a5432bcd0cd311b07105c6d3cc21f695c data/laboratoryblocks/loot_table/blocks/enlighted_mixed_laboratory_tiles.json +de7d56959c084676dcce946844a41eedfbf0635b data/laboratoryblocks/loot_table/blocks/enlighted_oak_laboratory_floor.json +a194d1780112e31634fb63b7544c708ced7d111e data/laboratoryblocks/loot_table/blocks/enlighted_oak_laboratory_tiles.json +2bc11a9977e6f87c14309197e17326139defcd94 data/laboratoryblocks/loot_table/blocks/enlighted_pla_block.json +8cbd2e03a4ccde7c8e03a9e24c09f8acc62cdea8 data/laboratoryblocks/loot_table/blocks/enlighted_pla_flooring.json +1a055dba6ba17fd2fb3c8628ee78914495f1ad79 data/laboratoryblocks/loot_table/blocks/enlighted_pla_tiles.json +9e2849f4955b2acdee90afa34f7db51e0d3c449a data/laboratoryblocks/loot_table/blocks/enlighted_right-faced_blue_signaling_laboratory_block.json +d20a992e8db330856ede823a50ad12e950028b13 data/laboratoryblocks/loot_table/blocks/enlighted_right-faced_green_signaling_laboratory_block.json +359d2e10f1796fcd88a7f44ffb63449a68c382c6 data/laboratoryblocks/loot_table/blocks/enlighted_right-faced_red_signaling_laboratory_block.json +a48be56ce89be30181db25a5c47bfd4718eed206 data/laboratoryblocks/loot_table/blocks/enlighted_screwed_laboratory_block.json +95d28ca0b80fc7cc669397a9a471398ba1a1c9fc data/laboratoryblocks/loot_table/blocks/enlighted_spruce_laboratory_floor.json +2fedafeba67b449b8be49887f9a9b396f1a4b10c data/laboratoryblocks/loot_table/blocks/enlighted_spruce_laboratory_tiles.json +2d41c3be557593177f4e6cbc79c6dc040d1d11f2 data/laboratoryblocks/loot_table/blocks/enlighted_tiled_pla_flooring.json +5cced74d592474dfc55ff53c896b4dfd5f14660b data/laboratoryblocks/loot_table/blocks/enlighted_warped_laboratory_floor.json +0fa3b5a97d2e47bc08a12e1b43c815c639910bb8 data/laboratoryblocks/loot_table/blocks/enlighted_warped_laboratory_tiles.json +54307581fdda031632706be877e3f950f2057b1e data/laboratoryblocks/loot_table/blocks/gray_laboratory_pillar.json +f4755a4f8901ad6d6c8046ccaa1e892320b3a374 data/laboratoryblocks/loot_table/blocks/gray_laboratory_tiles.json +2ebab316a7c8953c5846db8e1ad641784ef59a24 data/laboratoryblocks/loot_table/blocks/jungle_laboratory_floor.json +2790d6aa1e04849b994ab0295ebfa7555d32916a data/laboratoryblocks/loot_table/blocks/jungle_laboratory_tiles.json +7d235d4532513e269dc50a5f471ecd6d0373848b data/laboratoryblocks/loot_table/blocks/laboratory_block.json +b293085662ac8e3c2285a5617ba0a34f9190feeb data/laboratoryblocks/loot_table/blocks/laboratory_bookshelf.json +f2749978e1bcc1c084df69101b08323c8102ca1f data/laboratoryblocks/loot_table/blocks/laboratory_fan.json +ff5c9bf57a91eff288cd3f556f3195c09284cdbf data/laboratoryblocks/loot_table/blocks/laboratory_fan_redstone_controlled.json +010534ab9dbd092f48fe58cb96f0fe2a877eccc5 data/laboratoryblocks/loot_table/blocks/laboratory_glass.json +bc8067368cb80cc6f7d50e82d6d210693b3e04b2 data/laboratoryblocks/loot_table/blocks/laboratory_pillar.json +dae21403effa6ac759a8aaab8fdaabe522403872 data/laboratoryblocks/loot_table/blocks/laboratory_tiles.json +0bc6519b27f8787c2572b489198a69927e481efa data/laboratoryblocks/loot_table/blocks/laboratory_vent.json +b6793c5cf0f0e79d5395df7e970ec6eb6257704c data/laboratoryblocks/loot_table/blocks/laboratory_vent_connecting.json +3953c685e2760eb8273d5c91f9f28ddc86614dc9 data/laboratoryblocks/loot_table/blocks/left-faced_blue_signaling_laboratory_block.json +4ff1d679381cf999df1c3d7839090428900846be data/laboratoryblocks/loot_table/blocks/left-faced_green_signaling_laboratory_block.json +05299d84a9124b89eb03533be234e622d97f512e data/laboratoryblocks/loot_table/blocks/left-faced_red_signaling_laboratory_block.json +06aa1832754df661072b99f71702e2f329bdaec8 data/laboratoryblocks/loot_table/blocks/mangrove_laboratory_floor.json +8e371c4629b4103542d2448839edf3f58ccb1d86 data/laboratoryblocks/loot_table/blocks/mangrove_laboratory_tiles.json +7de5ab1db57d3ff258caf51f3ad6f06140c08ca9 data/laboratoryblocks/loot_table/blocks/mixed_laboratory_tiles.json +51ea0deb99da7cff1a8fdc3989fc6f026949851d data/laboratoryblocks/loot_table/blocks/oak_laboratory_floor.json +c86ceb63ddc86d8260ff91f3ac06a9e0cac60341 data/laboratoryblocks/loot_table/blocks/oak_laboratory_tiles.json +4d38206706178c8eded382723aea2b2b4881bcb8 data/laboratoryblocks/loot_table/blocks/pla_block.json +8b551d2e6cf192853b06194d508e6b5e98401d2a data/laboratoryblocks/loot_table/blocks/pla_flooring.json +674568a1c4c3cd074356ac65e137f76a38b5e7a4 data/laboratoryblocks/loot_table/blocks/pla_tiles.json +f868caaeeba1b06cd591a43be3c6dbabe3c8f1da data/laboratoryblocks/loot_table/blocks/right-faced_blue_signaling_laboratory_block.json +960ed6f31fce8e6abcff05d261d63f07fe012aaf data/laboratoryblocks/loot_table/blocks/right-faced_green_signaling_laboratory_block.json +b07be81eab5bd9c309516004b9fde7dde7f8dd72 data/laboratoryblocks/loot_table/blocks/right-faced_red_signaling_laboratory_block.json +cc90f86ad88b0a14a310436720c6fb823014081a data/laboratoryblocks/loot_table/blocks/screwed_laboratory_block.json +947de71d3e086de284e369390185b7d6eccb2b74 data/laboratoryblocks/loot_table/blocks/spruce_laboratory_floor.json +9844ca8e48d4a417f4758bf947d2f119daa339f6 data/laboratoryblocks/loot_table/blocks/spruce_laboratory_tiles.json +377dc7eec4772d5a8e57b0170499eed3c7904008 data/laboratoryblocks/loot_table/blocks/tiled_pla_flooring.json +f53efa06a717755e9967fe7e0eec1d336143571f data/laboratoryblocks/loot_table/blocks/warped_laboratory_floor.json +51de9bb3bbe0700416e675c11f0ca09c3bfe7b31 data/laboratoryblocks/loot_table/blocks/warped_laboratory_tiles.json diff --git a/src/generated/resources/.cache/658b4447709a913e7d207733571904cca1190a02 b/src/generated/resources/.cache/658b4447709a913e7d207733571904cca1190a02 index 00f73e1..940083b 100644 --- a/src/generated/resources/.cache/658b4447709a913e7d207733571904cca1190a02 +++ b/src/generated/resources/.cache/658b4447709a913e7d207733571904cca1190a02 @@ -1,4 +1,4 @@ -// 1.20.1 2024-06-09T22:57:15.1583883 Item Models: laboratoryblocks +// 1.21.1 2024-11-26T04:25:40.173049149 Item Models: laboratoryblocks bb88927e989045825ec5999d461f89910a4fe1ea assets/laboratoryblocks/models/item/acacia_laboratory_floor.json cc46c7a5c5b3dbe0c96a6251edaa430082d719ce assets/laboratoryblocks/models/item/acacia_laboratory_tiles.json 31029a270977c2abc029e734d87b0628f977a600 assets/laboratoryblocks/models/item/bamboo_laboratory_floor.json diff --git a/src/generated/resources/.cache/73115db2fadf9a5adb458c178689d36af3ada434 b/src/generated/resources/.cache/73115db2fadf9a5adb458c178689d36af3ada434 new file mode 100644 index 0000000..47da219 --- /dev/null +++ b/src/generated/resources/.cache/73115db2fadf9a5adb458c178689d36af3ada434 @@ -0,0 +1,2 @@ +// 1.21.1 2024-11-26T04:25:40.17343013 Languages: en_us for mod: laboratoryblocks +631eef174ba0bc7a8cbc79ab3fe8d865c4a92a8c assets/laboratoryblocks/lang/en_us.json diff --git a/src/generated/resources/.cache/9586aad834e893891bae2f65c3492b132aa839ed b/src/generated/resources/.cache/9586aad834e893891bae2f65c3492b132aa839ed index c16014b..ee45f4c 100644 --- a/src/generated/resources/.cache/9586aad834e893891bae2f65c3492b132aa839ed +++ b/src/generated/resources/.cache/9586aad834e893891bae2f65c3492b132aa839ed @@ -1,4 +1,4 @@ -// 1.20.1 2024-06-09T22:57:15.1523825 Fusion Model Provider: Artemis' Laboratory Blocks +// 1.21.1 2024-11-26T04:25:40.17016519 Fusion Model Provider: Artemis' Laboratory Blocks c892d61e092b2d5101faa826d3415751bd00286c assets/laboratoryblocks/models/block/acacia_laboratory_floor.json 6cee35ad689a6df3b3dcae37ae54bc3f501cfa9a assets/laboratoryblocks/models/block/acacia_laboratory_tiles.json 253e60b21d16062a9c1186d3af474c0e2a4f2f34 assets/laboratoryblocks/models/block/bamboo_laboratory_floor.json diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e index a3bca3c..19a9789 100644 --- a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e +++ b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e @@ -1,209 +1,209 @@ -// 1.20.1 2024-06-10T22:41:22.100334 Recipes -3d9f87241be40e9ae84f3b9c3d88aa6d7ddb3c0f data/laboratoryblocks/advancements/recipes/building_blocks/acacia_laboratory_floor.json -973e2aa5b8b14917d2d5fe5f0d35911ee179408b data/laboratoryblocks/advancements/recipes/building_blocks/acacia_laboratory_tiles.json -a9c9d542a081636fd864683080be8441ef6b16d1 data/laboratoryblocks/advancements/recipes/building_blocks/bamboo_laboratory_floor.json -5ed3930b41eb2c2d0719f0af6aa5578686b77c6f data/laboratoryblocks/advancements/recipes/building_blocks/bamboo_laboratory_tiles.json -46423b8781a68a071a0f60dd7dff639170f58c31 data/laboratoryblocks/advancements/recipes/building_blocks/birch_laboratory_floor.json -f54217ac18a42252606cb0b5b9ec8086c92675cb data/laboratoryblocks/advancements/recipes/building_blocks/birch_laboratory_tiles.json -fa546009621db690713fd0d423e44635e3be97b4 data/laboratoryblocks/advancements/recipes/building_blocks/cherry_laboratory_floor.json -47dcbad180ad95b3a9f2d1b85b425ab4255c2712 data/laboratoryblocks/advancements/recipes/building_blocks/cherry_laboratory_tiles.json -3aa88debaf3223441173607f50623699651e9eae data/laboratoryblocks/advancements/recipes/building_blocks/chiseled_laboratory_bookshelf.json -a9ea212a44a38b18578f16b9d92c81540aa80ead data/laboratoryblocks/advancements/recipes/building_blocks/clear_laboratory_screen.json -6d2156f6b07f2582c37988fa0fa90d05ea4fe632 data/laboratoryblocks/advancements/recipes/building_blocks/crimson_laboratory_floor.json -896ad6d35f9f6bbbd910fc89246f734d4a7a3427 data/laboratoryblocks/advancements/recipes/building_blocks/crimson_laboratory_tiles.json -9b5a41e3eda73fed0f637e8df165ef13f7951a60 data/laboratoryblocks/advancements/recipes/building_blocks/dark_oak_laboratory_floor.json -4e74ab13b7da28c0a8e579e3679454899413a32d data/laboratoryblocks/advancements/recipes/building_blocks/dark_oak_laboratory_tiles.json -21002fb20b016b4b139b294fbb738d966e4b57af data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_acacia_laboratory_floor.json -57df7467d217a3f114861d573492c5ffbcc871ff data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_acacia_laboratory_tiles.json -b94869442247aacd7d6868a41c216229cd87b9ba data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_bamboo_laboratory_floor.json -23f071a683e3a6ecf9aa3187efb40724c3613c60 data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_bamboo_laboratory_tiles.json -3c6602b02261cf9e062935f5f244d018ee2ac66b data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_birch_laboratory_floor.json -b86a3d72935ef716c4c1d3df7bbf0ef45640c636 data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_birch_laboratory_tiles.json -0d5d9cf2979f15af9e62e90847cb712f6db1d0dc data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_cherry_laboratory_floor.json -a4ef4793f75c9a71f43b2b01d1fe4eed2c841c23 data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_cherry_laboratory_tiles.json -a8c9d11708cb6a5e9cb9df651164006f80ec4b8f data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_chiseled_laboratory_bookshelf.json -94973430d39f516f1faa61ce5b9a8e5155f3375f data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_clear_laboratory_screen.json -99a30606546e6e015a117fd28fb34b549a4d6e03 data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_crimson_laboratory_floor.json -ac2d40ca36b2196bbe39beebb0a6492158756629 data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_crimson_laboratory_tiles.json -aa53c07ada6a9deba9dff98c0f747e4ea11b1d74 data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_dark_oak_laboratory_floor.json -cdb2687b0641e46e93999e1b0f05bd174504b88e data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_dark_oak_laboratory_tiles.json -da85ec6ddd140a0db88f1d2397618a6d0df0b68c data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_gray_laboratory_pillar.json -4fd8b0582445be2ff615d910fb4ee68c7265d12f data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_gray_laboratory_tiles.json -f4765a7af209bd473ef01ce4541c2e122eb9935c data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_jungle_laboratory_floor.json -99ef4bf0ec2f01ebcc9ee7f187e3c115fc00f118 data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_jungle_laboratory_tiles.json -d413dd15b740c7b6248f01c443265f70d38fbc1a data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_laboratory_block.json -82df5e9adc467d400ac96022b83ccfa2cd0d88f7 data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_laboratory_bookshelf.json -109476dd8f34756b80ec4499363fa128a9487fc2 data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_laboratory_fan.json -d4a47fcb1beba4d185a77b39d0b5cdcdae84ba26 data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_laboratory_fan_redstone_controlled.json -7d60ebc0c227638ab4287a31d36bc15cede90971 data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_laboratory_glass.json -7c2ad2c4a355cea9690f8f2d0f904e5e9f14a767 data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_laboratory_pillar.json -8c215e2af9e45ba759f19bb6ebc2c63b3f7d0483 data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_laboratory_tiles.json -891b338780c2b43b44daaab0a502ce38a06909fa data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_laboratory_vent.json -2cbb4a2ace146de32f58962d1d58958004c9175b data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_laboratory_vent_connecting.json -dad3cf27c8e173c423a5b9b251f579cf650eba0b data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_left-faced_blue_signaling_laboratory_block.json -9e2f12df866e3149bb2578ea5d927eb107071ae8 data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_left-faced_green_signaling_laboratory_block.json -1fd2ebdfa4e82f470a56e19c37bac9f86efae8e5 data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_left-faced_red_signaling_laboratory_block.json -778b66a416b3a76eb480597789c857c088f43579 data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_mangrove_laboratory_floor.json -62b39356624b59e752c469b99fbb1bda9a82c000 data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_mangrove_laboratory_tiles.json -4f2516ea8b2efe2782e3a124fbb984520d04b04e data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_mixed_laboratory_tiles.json -d8ec37320482f96342568c9379a9b0e2955a6127 data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_oak_laboratory_floor.json -c095c69939f16ae4d97f847ff02486d1ca348ca2 data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_oak_laboratory_tiles.json -9cdfb2ab8b3e6054f7545b0c1e2d83aa961ae21e data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_pla_block.json -5fa0aab0ce736cc19706f84f948af79345b70702 data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_pla_flooring.json -c25af7183fb5fd9ee622804aae2cf45b31302e0e data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_pla_tiles.json -ddbf09075f3f1041b02d5a9abc678fe97fcb1a20 data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_right-faced_blue_signaling_laboratory_block.json -ab5a8ff851bb2763d4a0cadb2b1a79b79ddaa8d6 data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_right-faced_green_signaling_laboratory_block.json -12614c08342993f318284f85d627bef04684355b data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_right-faced_red_signaling_laboratory_block.json -8301874a110b1086995565541c283968060be965 data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_screwed_laboratory_block.json -293906cdbfb3e8e377e18081463e51412eaaddd6 data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_spruce_laboratory_floor.json -9a9dc2a8946f4830fff0736d7360031869eca277 data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_spruce_laboratory_tiles.json -164fb999380e8250cc523ae0ebc87f8d4404b18e data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_tiled_pla_flooring.json -978bc864f6cef1bde87820da957935a4a51b325e data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_warped_laboratory_floor.json -614884b4c313d2384c1f74e0d7b7b9ffc3f46ab3 data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_warped_laboratory_tiles.json -5da205f27c1db144f91216dd3197d5ce20e54869 data/laboratoryblocks/advancements/recipes/building_blocks/gray_laboratory_pillar.json -29cb9a76e44f8cec12e03d12a01972926b6bf808 data/laboratoryblocks/advancements/recipes/building_blocks/gray_laboratory_tiles.json -04eb153298ed6aa1dd8049f9e9c39edfb747ac7d data/laboratoryblocks/advancements/recipes/building_blocks/jungle_laboratory_floor.json -558aab699f744dc13a3570017620c2f8f2a53743 data/laboratoryblocks/advancements/recipes/building_blocks/jungle_laboratory_tiles.json -c6a60063ef270bc58fc4608e36c27350dff7685a data/laboratoryblocks/advancements/recipes/building_blocks/laboratory_block.json -051aae3e341c2f027baebb8f4727778a7debdee1 data/laboratoryblocks/advancements/recipes/building_blocks/laboratory_bookshelf.json -5f14311dcdcada3b2dfe3ae28c22678519fba1a5 data/laboratoryblocks/advancements/recipes/building_blocks/laboratory_fan.json -a927a5362237383c5d01fda8d4abb188d8d514b4 data/laboratoryblocks/advancements/recipes/building_blocks/laboratory_fan_redstone_controlled.json -20ae22e6d20303f6db292b69acd60fa633adb815 data/laboratoryblocks/advancements/recipes/building_blocks/laboratory_glass.json -bb58b1259b0cf872fe86cdf4670c22bf97b94782 data/laboratoryblocks/advancements/recipes/building_blocks/laboratory_pillar.json -d66782c93fb078421825086e9c9a4861f5040e59 data/laboratoryblocks/advancements/recipes/building_blocks/laboratory_tiles.json -29195233b876f57e12d4a574d43db1dba590e684 data/laboratoryblocks/advancements/recipes/building_blocks/laboratory_vent.json -02329bd4420072ec974b29aef0f48d45bd86bab0 data/laboratoryblocks/advancements/recipes/building_blocks/laboratory_vent_connecting.json -585f0e6125cbe641ef4b94a04397ee9276919be4 data/laboratoryblocks/advancements/recipes/building_blocks/left-faced_blue_signaling_laboratory_block.json -5dfe63fb258338983fe599163f56f4cb288ccf65 data/laboratoryblocks/advancements/recipes/building_blocks/left-faced_green_signaling_laboratory_block.json -6f9cdb043b751dbbfff8604f847ba8d3f21beda8 data/laboratoryblocks/advancements/recipes/building_blocks/left-faced_red_signaling_laboratory_block.json -99e151dea6fbb340fb2b3fd4f4ac6a7062fab401 data/laboratoryblocks/advancements/recipes/building_blocks/mangrove_laboratory_floor.json -34c3d0ba53770d1a7906250a7e277433fac656c4 data/laboratoryblocks/advancements/recipes/building_blocks/mangrove_laboratory_tiles.json -fb9a95c3a11e9d1fe3e8d44b9ddeb26ed63bb3db data/laboratoryblocks/advancements/recipes/building_blocks/mixed_laboratory_tiles.json -86c5f64f1f3b5cf7376a8f708ad9318c21d0125d data/laboratoryblocks/advancements/recipes/building_blocks/oak_laboratory_floor.json -f1495918cb13ea21a84ec3d39a431c8d8c7cedd8 data/laboratoryblocks/advancements/recipes/building_blocks/oak_laboratory_tiles.json -b53b5c1e774e301bb8bea70257492b9f51c427c0 data/laboratoryblocks/advancements/recipes/building_blocks/pla_block.json -9f8bfa261abcd816a0b186fa6f4711c6cdff159f data/laboratoryblocks/advancements/recipes/building_blocks/pla_flooring.json -5fb7f16ad0e97532a51fb12d2eaf75115838fc5e data/laboratoryblocks/advancements/recipes/building_blocks/pla_tiles.json -e224cb3cb5aa3d9509982652bdf8081f1038c227 data/laboratoryblocks/advancements/recipes/building_blocks/right-faced_blue_signaling_laboratory_block.json -8c66bf7ecc58747e254e58767e546a178f38d6a2 data/laboratoryblocks/advancements/recipes/building_blocks/right-faced_green_signaling_laboratory_block.json -352308d6334773e4f742d32144a6eee817c06e1d data/laboratoryblocks/advancements/recipes/building_blocks/right-faced_red_signaling_laboratory_block.json -9a524dea517b329f64f84bf0776367a352400feb data/laboratoryblocks/advancements/recipes/building_blocks/screwed_laboratory_block.json -66723628cac540a3e8d52efb524fc63b74f0549e data/laboratoryblocks/advancements/recipes/building_blocks/spruce_laboratory_floor.json -9282c0c0702b9440518753b9d3672f0544933aea data/laboratoryblocks/advancements/recipes/building_blocks/spruce_laboratory_tiles.json -d7b440e4f038c78fcf37fbd25e80e56b9832034a data/laboratoryblocks/advancements/recipes/building_blocks/tiled_pla_flooring.json -74b502434d41c5a978f0b2167fb052804de5a35c data/laboratoryblocks/advancements/recipes/building_blocks/warped_laboratory_floor.json -f02196792aa3c833d14ca79541d0b81794bd66fa data/laboratoryblocks/advancements/recipes/building_blocks/warped_laboratory_tiles.json -887ff9d98df544b27f8c729f1ae8f39914df3998 data/laboratoryblocks/advancements/recipes/misc/compressed_starch.json -8a044637535404212c64db9f9d1392681357c0c7 data/laboratoryblocks/advancements/recipes/misc/configuration_tool.json -f5ac4952a0a8b631bd07a386176380c6bf3b41b5 data/laboratoryblocks/advancements/recipes/misc/glowstone_particles.json -feee2f20731e525a853feb1209c61838c26e8201 data/laboratoryblocks/advancements/recipes/misc/iron_screw.json -ef3f692feb60e60e0db6f7f0623bff62fb449801 data/laboratoryblocks/advancements/recipes/misc/pla_sheets.json -d1624687ed44878869c44b3e155a98886d9c8b70 data/laboratoryblocks/advancements/recipes/misc/redstone_particles.json -246de16f71f35a7b6e0e4e9588ba57e3ac094827 data/laboratoryblocks/advancements/recipes/misc/starch.json -a3b1d18fd4515a904e1155df352442ae4b19a4c1 data/laboratoryblocks/recipes/acacia_laboratory_floor.json -149b0f97c2908e7b47b174334cb075f162bde25e data/laboratoryblocks/recipes/acacia_laboratory_tiles.json -31d5b9d8f15c8d1eda06816ec44eed4f230161be data/laboratoryblocks/recipes/bamboo_laboratory_floor.json -9e7dbde67b9cd978097840b9e96442cecc26cd51 data/laboratoryblocks/recipes/bamboo_laboratory_tiles.json -d2c2d3c219a8f8e8d5c407e0caa311eabb2f601f data/laboratoryblocks/recipes/birch_laboratory_floor.json -e724e76d199f328531890bc2bfd71beaf8aaa827 data/laboratoryblocks/recipes/birch_laboratory_tiles.json -ff9a1b2ad2a760fc0792e04de840a0a2cb052d43 data/laboratoryblocks/recipes/cherry_laboratory_floor.json -1eabe096d478ac58a5e09b45391d0d63f8f76a7f data/laboratoryblocks/recipes/cherry_laboratory_tiles.json -aabd10a9e48684663e35ae0c273edd127c4ce755 data/laboratoryblocks/recipes/chiseled_laboratory_bookshelf.json -555d1a614ac4005c16465ce8dfe16e084377eac1 data/laboratoryblocks/recipes/clear_laboratory_screen.json -f3a381a54a82d35b621ea261a310a1ee5cc62416 data/laboratoryblocks/recipes/compressed_starch.json -d4fa28b87a7abe659875e70187b314e48f131aa0 data/laboratoryblocks/recipes/configuration_tool.json -98698f6e47d5a13f7b6e6a1cef006350a42a24b3 data/laboratoryblocks/recipes/crimson_laboratory_floor.json -7b844dce5e9c05e0bd6cc2441b00b295172b55ab data/laboratoryblocks/recipes/crimson_laboratory_tiles.json -fcf85ef66df55e7900cfd97807485c9ac4b73c9b data/laboratoryblocks/recipes/dark_oak_laboratory_floor.json -2931a495b7f46013e3f588d3e5a947007d6fc6b2 data/laboratoryblocks/recipes/dark_oak_laboratory_tiles.json -b60c1106f92156c078cc74223d05a55da48ef4ba data/laboratoryblocks/recipes/enlighted_acacia_laboratory_floor.json -79a2367e1d101d8f2eedd92fc1c651d0003b2cc0 data/laboratoryblocks/recipes/enlighted_acacia_laboratory_tiles.json -fcaeaff9f892d4cb1fa4379cb19ce6781f9ec676 data/laboratoryblocks/recipes/enlighted_bamboo_laboratory_floor.json -44b04a4d6783499704f506f4ecad06068559259e data/laboratoryblocks/recipes/enlighted_bamboo_laboratory_tiles.json -643dc01e217b971683dccfbf71011789f3dc0777 data/laboratoryblocks/recipes/enlighted_birch_laboratory_floor.json -91104d4f28f235d5fba69d38495178dc8212e114 data/laboratoryblocks/recipes/enlighted_birch_laboratory_tiles.json -4ad772e4e518b49ee99aa71eac2d184cbaa1cc50 data/laboratoryblocks/recipes/enlighted_cherry_laboratory_floor.json -fc67037554e85fb33cee764e09b120c0b93ace10 data/laboratoryblocks/recipes/enlighted_cherry_laboratory_tiles.json -32e69ce1898d216e4d0a191bc26370d43e144544 data/laboratoryblocks/recipes/enlighted_chiseled_laboratory_bookshelf.json -a48250798af909e4653a314899edf7872f206bb9 data/laboratoryblocks/recipes/enlighted_clear_laboratory_screen.json -25ed8bec0ab03bc04571ebb0d4aab5385bb35a6b data/laboratoryblocks/recipes/enlighted_crimson_laboratory_floor.json -51ee073dfafba319607d3b68ad06c773e6bcc517 data/laboratoryblocks/recipes/enlighted_crimson_laboratory_tiles.json -aa91e18e144442f4dfbd4aef0178118be395f5a6 data/laboratoryblocks/recipes/enlighted_dark_oak_laboratory_floor.json -adda4282ea5d29b066b3c916662f981bc395b7e3 data/laboratoryblocks/recipes/enlighted_dark_oak_laboratory_tiles.json -c92ab72fcd9f55242229c8910d49adad4fcd7888 data/laboratoryblocks/recipes/enlighted_gray_laboratory_pillar.json -6dace0dc5df69d8fbdebb0a6a5717454f77e2da6 data/laboratoryblocks/recipes/enlighted_gray_laboratory_tiles.json -3c95ae3e3fc877080dc79ddaf8fddd489dd761b8 data/laboratoryblocks/recipes/enlighted_jungle_laboratory_floor.json -b91362c1560a16b5e51b2c288f04046aa4600133 data/laboratoryblocks/recipes/enlighted_jungle_laboratory_tiles.json -4c24e400bb75213c82b8f291a83738677193e5a8 data/laboratoryblocks/recipes/enlighted_laboratory_block.json -19d2981c9e24165efcd2befdcbe3c39a087d6f53 data/laboratoryblocks/recipes/enlighted_laboratory_bookshelf.json -6b00dc9228f6192ad43010f6da0e5fd2fb521a39 data/laboratoryblocks/recipes/enlighted_laboratory_fan.json -375975b23003276cb4b07cc682fe8a4e492f13b1 data/laboratoryblocks/recipes/enlighted_laboratory_fan_redstone_controlled.json -b9c66a587d42d2d1f7dc76cfe56ae8efc0ad4131 data/laboratoryblocks/recipes/enlighted_laboratory_glass.json -87b7761cc3fdeea0fa4dd44748a68f664e1f2494 data/laboratoryblocks/recipes/enlighted_laboratory_pillar.json -8c52b358d45bd25ba324270845ae790711d16900 data/laboratoryblocks/recipes/enlighted_laboratory_tiles.json -a40bbee70744bcd480dd73df00dcd8592a011c54 data/laboratoryblocks/recipes/enlighted_laboratory_vent.json -fd28e443b55490567fac197dbace8b0efe920c9b data/laboratoryblocks/recipes/enlighted_laboratory_vent_connecting.json -47a35daf33c57419cbf16fb197b9ac5c2452f5f3 data/laboratoryblocks/recipes/enlighted_left-faced_blue_signaling_laboratory_block.json -dda28a146e8f5ced6221d2ada14f7b567ee225d4 data/laboratoryblocks/recipes/enlighted_left-faced_green_signaling_laboratory_block.json -5fd872cb557c973cbd6ceecc487a9a87654d9e50 data/laboratoryblocks/recipes/enlighted_left-faced_red_signaling_laboratory_block.json -be7516867ede0b57113f2d8a7b05d95a5326538d data/laboratoryblocks/recipes/enlighted_mangrove_laboratory_floor.json -ab0222af84f6c2e9518af31095e46bea1a71cfda data/laboratoryblocks/recipes/enlighted_mangrove_laboratory_tiles.json -197672f9e8b4c5c6d9dbe79bb6075cd00998c30b data/laboratoryblocks/recipes/enlighted_mixed_laboratory_tiles.json -0276df7866970b0a2f9928b8df205bf131f96b35 data/laboratoryblocks/recipes/enlighted_oak_laboratory_floor.json -b1739b59e61d8d1151f18b65fe049767df93c1be data/laboratoryblocks/recipes/enlighted_oak_laboratory_tiles.json -af2323d2f4bce3d1c3c148d97c6426af07e243aa data/laboratoryblocks/recipes/enlighted_pla_block.json -cba95eb689eb4312a4d25919d2e3ce19528e1fa5 data/laboratoryblocks/recipes/enlighted_pla_flooring.json -1a301b6720ab9c1597babf1eb81d0dfe073f96a5 data/laboratoryblocks/recipes/enlighted_pla_tiles.json -bd4b1acbe13b104ce71c4dcdcef04b470012598a data/laboratoryblocks/recipes/enlighted_right-faced_blue_signaling_laboratory_block.json -3e9c6ed3619460f29c31b385fcf91b844d0e671e data/laboratoryblocks/recipes/enlighted_right-faced_green_signaling_laboratory_block.json -727aef3eb679770f85bc995f39a952ddffd8c7ec data/laboratoryblocks/recipes/enlighted_right-faced_red_signaling_laboratory_block.json -b897d239ff5befbdb235a4f5f279e29cfd75d0cb data/laboratoryblocks/recipes/enlighted_screwed_laboratory_block.json -aa0d8991fd0d1d0f0427779c2305beef9999899d data/laboratoryblocks/recipes/enlighted_spruce_laboratory_floor.json -1fc74efee9b51f1dd59ffa0644746456cdfdbd6c data/laboratoryblocks/recipes/enlighted_spruce_laboratory_tiles.json -543e3f1d6bd29347948102de955893bceb26c5a3 data/laboratoryblocks/recipes/enlighted_tiled_pla_flooring.json -b463a279ba0fbde3a6a6094ef59578124414507e data/laboratoryblocks/recipes/enlighted_warped_laboratory_floor.json -6d3b7eb04f69cd365ca9c799996b703a9aaef41c data/laboratoryblocks/recipes/enlighted_warped_laboratory_tiles.json -84376a8f40458c2936f9150fcd5945c229597d2d data/laboratoryblocks/recipes/glowstone_particles.json -fef738e0cd77c5d2fe49d2d7480194fc9b74b46e data/laboratoryblocks/recipes/gray_laboratory_pillar.json -41d773ae636564fbecd86cb1f803d9e371cdead9 data/laboratoryblocks/recipes/gray_laboratory_tiles.json -36972366c2b7fa0754d62d2848db3b746698b4ee data/laboratoryblocks/recipes/iron_screw.json -e79333a4d7daef561dc1410aa25de3da0ee10bba data/laboratoryblocks/recipes/jungle_laboratory_floor.json -03836b55e6cfba6a562c7ceb43e15f8372ee9bae data/laboratoryblocks/recipes/jungle_laboratory_tiles.json -eafad4ba48512f83fd49ce539019b2f860bee28f data/laboratoryblocks/recipes/laboratory_block.json -109b801dae08ddbea5729c26dd7cb538dac27484 data/laboratoryblocks/recipes/laboratory_bookshelf.json -9a9d11347e6db24a5b5c1576e790a3dff5d103a3 data/laboratoryblocks/recipes/laboratory_fan.json -7325644e7a836545ae71abccec3dd20c6ca785b9 data/laboratoryblocks/recipes/laboratory_fan_redstone_controlled.json -0df188df9ad8669bb7de92bd3bc93833f82a28fe data/laboratoryblocks/recipes/laboratory_glass.json -013d2cc07f6ccbf7a15c8552b0b65a47e2f28dc9 data/laboratoryblocks/recipes/laboratory_pillar.json -af9eaf9df11496130905353987f7862d29188061 data/laboratoryblocks/recipes/laboratory_tiles.json -2aea3d2cf73b8e98283b7399ec7b6e1f006e3015 data/laboratoryblocks/recipes/laboratory_vent.json -f009023ec4743f52be5492d6a59a4b7daa69c406 data/laboratoryblocks/recipes/laboratory_vent_connecting.json -ffffcc9472b9e7c4ec2ac7e8fb355752ea7e7625 data/laboratoryblocks/recipes/left-faced_blue_signaling_laboratory_block.json -4b19e51b39d8140fb2143f98040b488bd51f17fa data/laboratoryblocks/recipes/left-faced_green_signaling_laboratory_block.json -5c88180958463cedfa94522fc23e59d475aef2fe data/laboratoryblocks/recipes/left-faced_red_signaling_laboratory_block.json -21c75098a7c6a5be202ecb9e671820ef7c53ef1c data/laboratoryblocks/recipes/mangrove_laboratory_floor.json -6904273decbeef870f4f01bc8cb16ae79a40b2c5 data/laboratoryblocks/recipes/mangrove_laboratory_tiles.json -69448a62d09c01a46a42c9ebe5c0987ac0f6e067 data/laboratoryblocks/recipes/mixed_laboratory_tiles.json -04b2e4b62a6fb452020b82b3775333605ee758a2 data/laboratoryblocks/recipes/oak_laboratory_floor.json -d2192495a37770ff74123518aefc34fc44482af6 data/laboratoryblocks/recipes/oak_laboratory_tiles.json -b7fd066732d6f5786d5b4131823e502299ac3b46 data/laboratoryblocks/recipes/pla_block.json -618b0df095b434381c4a3d449e9dd6d9a73c1636 data/laboratoryblocks/recipes/pla_flooring.json -d6bff2ddc6668f5928ef3fceb817262a5840b7c6 data/laboratoryblocks/recipes/pla_sheets.json -83cb99649b2a92612fbe0822a071c1f25c35583d data/laboratoryblocks/recipes/pla_tiles.json -af927586a677b267b0a7b6818da6251450939cb1 data/laboratoryblocks/recipes/redstone_particles.json -8dd5cb198d1b9eaa09528e9de55a77d67f339445 data/laboratoryblocks/recipes/right-faced_blue_signaling_laboratory_block.json -e6c5f678476456eee2cd3cc8a5246b27ff05ab5f data/laboratoryblocks/recipes/right-faced_green_signaling_laboratory_block.json -837a6d7eac06fa4dcc521611567084f29cb1b271 data/laboratoryblocks/recipes/right-faced_red_signaling_laboratory_block.json -35535a9e13f1bacac94186129839239d128a1992 data/laboratoryblocks/recipes/screwed_laboratory_block.json -de73fbfa6d7e4f64904257189ec40b79f0f4111a data/laboratoryblocks/recipes/spruce_laboratory_floor.json -8633a2c239d9761f9de083ed4b8de09a5e48dd24 data/laboratoryblocks/recipes/spruce_laboratory_tiles.json -ad44176ed105a0c5bf478799ad698d40ec4bea00 data/laboratoryblocks/recipes/starch.json -568dbb5f8e4597c69ca7fde0135d72468c029f08 data/laboratoryblocks/recipes/tiled_pla_flooring.json -04c2ef574ce6b7e6f8e4e85271f4340c8c559f13 data/laboratoryblocks/recipes/warped_laboratory_floor.json -db2418321268c2483991782c96070e9d2c827395 data/laboratoryblocks/recipes/warped_laboratory_tiles.json -ad222b0b3141e1a46424ce4ded1e2336a34615f9 data/minecraft/advancements/recipes/building_blocks/enlighted_laboratory_vent_connecting_from_laboratory_vent_connecting_and_glowstone_particles.json -680c84554adeed7dd4a6205b053073030efe5afa data/minecraft/advancements/recipes/misc/from_redstone_particles.json -58eebedb01de125854ea2197996dc9facdf49970 data/minecraft/advancements/recipes/misc/glowstone_dust.json -7525bce718767f18abb9b6f68f16d2e87f766598 data/minecraft/recipes/enlighted_laboratory_vent_connecting_from_laboratory_vent_connecting_and_glowstone_particles.json -17736118e596bdd9a8082dd657016d19f8f022bd data/minecraft/recipes/from_redstone_particles.json -77482c3dd34fcf2edff4cb68cab1ecb24cb01a4c data/minecraft/recipes/glowstone_dust.json +// 1.21.1 2024-11-26T04:25:40.171390455 Recipes +4dfe63a8176fd392ad0f0647c7ba1ed8204c7907 data/laboratoryblocks/advancement/recipes/building_blocks/acacia_laboratory_floor.json +82e70b1fb1ac6e62b11e927493713bbfc6cc33e5 data/laboratoryblocks/advancement/recipes/building_blocks/acacia_laboratory_tiles.json +87eecb03bdb370dfa7982f9789ca495d7d9d894c data/laboratoryblocks/advancement/recipes/building_blocks/bamboo_laboratory_floor.json +ea4b1cfd24ca8d10a466c84751212758a2ac6867 data/laboratoryblocks/advancement/recipes/building_blocks/bamboo_laboratory_tiles.json +b76efb52c0daec7687191fbc3cd9dee15168e95d data/laboratoryblocks/advancement/recipes/building_blocks/birch_laboratory_floor.json +6f5d15de3c5dcf700934e4144df713a2645590b8 data/laboratoryblocks/advancement/recipes/building_blocks/birch_laboratory_tiles.json +fdc5d34e915fd785c003e582e8cd1c443d4223f4 data/laboratoryblocks/advancement/recipes/building_blocks/cherry_laboratory_floor.json +46c47be87ec88bb3cc9e1093eaaa79c1ec65641a data/laboratoryblocks/advancement/recipes/building_blocks/cherry_laboratory_tiles.json +6ce8e5b49f2aad359b3ed8f748c759788ed45ed0 data/laboratoryblocks/advancement/recipes/building_blocks/chiseled_laboratory_bookshelf.json +a94cb88db0456655e64a1ffb5c5c0c38c1b6f694 data/laboratoryblocks/advancement/recipes/building_blocks/clear_laboratory_screen.json +8800176c76237e72e7c8c0b854ace266c0043f8c data/laboratoryblocks/advancement/recipes/building_blocks/crimson_laboratory_floor.json +2409f8ba32da26f93d1b3adf81633c6f8332bac4 data/laboratoryblocks/advancement/recipes/building_blocks/crimson_laboratory_tiles.json +89616006e01adaffebf51ed417caa18eba23f311 data/laboratoryblocks/advancement/recipes/building_blocks/dark_oak_laboratory_floor.json +7ea468383262333b145708356c1c0aed329c61bb data/laboratoryblocks/advancement/recipes/building_blocks/dark_oak_laboratory_tiles.json +33b9c6866576bbbb050a84a7310c686f072facfb data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_acacia_laboratory_floor.json +fb99edaabe754b734f5cb87db4c09b9b0ab19237 data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_acacia_laboratory_tiles.json +2d9dfc8fa85f26cd5a96ff60899c7ce7379d14bf data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_bamboo_laboratory_floor.json +488a42da041d2d468443ffbd696054c7879ffcb3 data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_bamboo_laboratory_tiles.json +03b666c6550480047280742b9db6d624decfea17 data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_birch_laboratory_floor.json +817a62a3468281ad6db85acda1526f0c4272925e data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_birch_laboratory_tiles.json +e1912b33ff36a2ee4b6e8dcae04b43b7915bc563 data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_cherry_laboratory_floor.json +d9aacbb318cc72d2dca4878b6ce225c4b87b1846 data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_cherry_laboratory_tiles.json +149c5ccdbb014374f32941209466f5da4dbf4121 data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_chiseled_laboratory_bookshelf.json +03afa17b63e0cd82ed9e2123d07a302e93a62bf6 data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_clear_laboratory_screen.json +d1c22699796b3a2fb505213049d989c1ab73eafa data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_crimson_laboratory_floor.json +7941c6d919bb11b37b91ebaa29f7bbac886595fc data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_crimson_laboratory_tiles.json +3ee5f3ddd02e1ec5254b1d67748c7d2ea65f273d data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_dark_oak_laboratory_floor.json +c81c6de365c9952bf01119be87f180ff08aa5896 data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_dark_oak_laboratory_tiles.json +b50afce80760b50b2a6c828a7467e584c04cdee1 data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_gray_laboratory_pillar.json +2fa47e15fd0539f877b10f21356c20e345c277f6 data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_gray_laboratory_tiles.json +fd3b7407e374312d8ff556ef443ff1e24577502d data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_jungle_laboratory_floor.json +4c687d4f3ca5f0a98c255a05bb7397a982bd4f72 data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_jungle_laboratory_tiles.json +6d6606cc3dc04a07225d7b5f3c940602a25815bd data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_laboratory_block.json +6b656cc6ab663e0a5ca8205dbb1c335d77808b91 data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_laboratory_bookshelf.json +0b6d147e8236fa02baf2d6bc4c81db2c354b5c95 data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_laboratory_fan.json +15881790fc1df47e5e8950bde854bdffadc26993 data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_laboratory_fan_redstone_controlled.json +f2aed2edfcb3cee112527aa73002c7efcc453209 data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_laboratory_glass.json +330589676e6668bcaa53c0f9a71383a49c1fa06b data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_laboratory_pillar.json +2a7d724e34c4d3d1bce7ad408bb28c752560db4d data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_laboratory_tiles.json +0651ebeee2a858f6d3f811759cd1cd1d215dd9aa data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_laboratory_vent.json +ad68559264f605bd96297abddef526b611c71641 data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_laboratory_vent_connecting.json +0d2b274048d4d4238d12c4c7b3df5c1844dc8494 data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_left-faced_blue_signaling_laboratory_block.json +666039c6f554f6f7bae9384c49425ab14e0cf50b data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_left-faced_green_signaling_laboratory_block.json +91064285b504d7764ebc9c687dd5a40e3879eb69 data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_left-faced_red_signaling_laboratory_block.json +80fd219e04974331de3938ea2f3429636b959227 data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_mangrove_laboratory_floor.json +170406156a6e80f01c5a18c55a79ea7954c28229 data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_mangrove_laboratory_tiles.json +4f63176a4885c0f0a5745e1d8d7bd2d23e6c937c data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_mixed_laboratory_tiles.json +52ba997c6bc2345a152888605f6c93e09e56a17e data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_oak_laboratory_floor.json +58cc780852d05f99dd8d8465b666c3436c522d3d data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_oak_laboratory_tiles.json +a2033c1175309de3afb479ccdee791f410961f29 data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_pla_block.json +0b13a3ee149a70ab6b9556d6eeb5ef0b0087fd05 data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_pla_flooring.json +2608a7d36faf3a8918433df2d09dafb2281aeb9d data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_pla_tiles.json +42eb653a75849aec2b284bdc912a79bf4fba2727 data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_right-faced_blue_signaling_laboratory_block.json +20d7ec28c16b54f6c0b4f2772e37a2adaabd8133 data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_right-faced_green_signaling_laboratory_block.json +06935773f2e10f50a296434423ac9d9b57c29a33 data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_right-faced_red_signaling_laboratory_block.json +87526887619db9ff559ecc1c3a43363bc60d58a1 data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_screwed_laboratory_block.json +97a41df6b733c22dcdf6d48abe22dd0937f503b9 data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_spruce_laboratory_floor.json +f7153ee41add75813591af042025fefc7315d910 data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_spruce_laboratory_tiles.json +220faf40cf7721ab8eda105eaebaed6b3c1e47e2 data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_tiled_pla_flooring.json +7f9515cd75acc84ec21ac995b9f05dcfc42822f7 data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_warped_laboratory_floor.json +f9159a79d2edd547667b1651efb32fb02d27189d data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_warped_laboratory_tiles.json +ffdfb315ee81e5683fed545cdd6c10824a366a89 data/laboratoryblocks/advancement/recipes/building_blocks/gray_laboratory_pillar.json +017fa5fa2036107a586c6dc7aad864d1ddff70a0 data/laboratoryblocks/advancement/recipes/building_blocks/gray_laboratory_tiles.json +571ec2ab778364e7c962be94756b4e3a95090ae5 data/laboratoryblocks/advancement/recipes/building_blocks/jungle_laboratory_floor.json +db1442cfbddd2331fba3680a1669d6e464d2d004 data/laboratoryblocks/advancement/recipes/building_blocks/jungle_laboratory_tiles.json +91cc90503197407aa14ee007556f64151ab6c913 data/laboratoryblocks/advancement/recipes/building_blocks/laboratory_block.json +933cb992108d055feeb31c56cc5acedd099ad661 data/laboratoryblocks/advancement/recipes/building_blocks/laboratory_bookshelf.json +d4962a03f812d11966c8529118e34416f9e32c8f data/laboratoryblocks/advancement/recipes/building_blocks/laboratory_fan.json +617270f2220ec4b9a351e96d7fa75f459eb1c940 data/laboratoryblocks/advancement/recipes/building_blocks/laboratory_fan_redstone_controlled.json +8d4b52284df4198ed708793aa8e84fdb5f00b8bf data/laboratoryblocks/advancement/recipes/building_blocks/laboratory_glass.json +504755168437d37468daf462d10c579652aa36c5 data/laboratoryblocks/advancement/recipes/building_blocks/laboratory_pillar.json +f7659c1793bbceab366a6047b75c9beeab4b8a66 data/laboratoryblocks/advancement/recipes/building_blocks/laboratory_tiles.json +97efa4d38fb525edec1204371909a2814930c1c9 data/laboratoryblocks/advancement/recipes/building_blocks/laboratory_vent.json +fadcdb4ae45ab3def0c40d44e40761e5361a3ed0 data/laboratoryblocks/advancement/recipes/building_blocks/laboratory_vent_connecting.json +6ed7d29984cd3c925b86174d0d0a63fd42a614d3 data/laboratoryblocks/advancement/recipes/building_blocks/left-faced_blue_signaling_laboratory_block.json +e9c1e66f8184e5b042ebba4da3b581ff8db7cd01 data/laboratoryblocks/advancement/recipes/building_blocks/left-faced_green_signaling_laboratory_block.json +f446cede8546e86cd5ca166524b5bb188d1bcd77 data/laboratoryblocks/advancement/recipes/building_blocks/left-faced_red_signaling_laboratory_block.json +95c198fe09a1534c6d5818ba3ca5400cc2d260cb data/laboratoryblocks/advancement/recipes/building_blocks/mangrove_laboratory_floor.json +def7937532231d3d9a519b733fc102cdf8686e8f data/laboratoryblocks/advancement/recipes/building_blocks/mangrove_laboratory_tiles.json +769b494abd8eef78bb84a1967ad2c1234e0932c5 data/laboratoryblocks/advancement/recipes/building_blocks/mixed_laboratory_tiles.json +41c2c797e6bd9187f0f26702f7d1be45a111d928 data/laboratoryblocks/advancement/recipes/building_blocks/oak_laboratory_floor.json +e4af066cbd0f2084f896d9c099daef144923342e data/laboratoryblocks/advancement/recipes/building_blocks/oak_laboratory_tiles.json +cbea8c07c984568e894f90f2a5b6fbb653207253 data/laboratoryblocks/advancement/recipes/building_blocks/pla_block.json +96ba4f19a68f5ec6d4886515a6fea9939617fee4 data/laboratoryblocks/advancement/recipes/building_blocks/pla_flooring.json +6a8359c42e8395739cc3b63dd1065e701629827c data/laboratoryblocks/advancement/recipes/building_blocks/pla_tiles.json +1e53bcf0b8211e99d0e881ebfae5d625861beb3b data/laboratoryblocks/advancement/recipes/building_blocks/right-faced_blue_signaling_laboratory_block.json +8a185926851637457604d1e75ac69965259e775d data/laboratoryblocks/advancement/recipes/building_blocks/right-faced_green_signaling_laboratory_block.json +6c5f079e0c40954d2306b0f44d0583d3cbf687ff data/laboratoryblocks/advancement/recipes/building_blocks/right-faced_red_signaling_laboratory_block.json +edbc73181961538803d58b88a05ebcf86e830903 data/laboratoryblocks/advancement/recipes/building_blocks/screwed_laboratory_block.json +472f51773efca9b8bb568c324a8d7ec4decfd830 data/laboratoryblocks/advancement/recipes/building_blocks/spruce_laboratory_floor.json +5f96375ac393622803ec587e60ee2985b1392cee data/laboratoryblocks/advancement/recipes/building_blocks/spruce_laboratory_tiles.json +28202c635aaba2ddf03d566feb01916404bd31a1 data/laboratoryblocks/advancement/recipes/building_blocks/tiled_pla_flooring.json +21b99b32785b073fad9bb6101e9e0784babebcdc data/laboratoryblocks/advancement/recipes/building_blocks/warped_laboratory_floor.json +6e25042f7ad53a61cfcc47ddb76b0874df16810a data/laboratoryblocks/advancement/recipes/building_blocks/warped_laboratory_tiles.json +da7dd4feab7cd796d2d710dd8933cf12dec38392 data/laboratoryblocks/advancement/recipes/misc/compressed_starch.json +cc1e4ec045d35468bd68f5feae60f676514865f9 data/laboratoryblocks/advancement/recipes/misc/configuration_tool.json +c0db8f7a9f9ae121e60ac3757c17af81f0514d6f data/laboratoryblocks/advancement/recipes/misc/glowstone_particles.json +1ff832817e5e3d013439a2eff4433465e279f4b2 data/laboratoryblocks/advancement/recipes/misc/iron_screw.json +ba720c8af55706b19deeb7f36f9038a9692d4142 data/laboratoryblocks/advancement/recipes/misc/pla_sheets.json +2cf908e2834b16cf5cf79cb00b68039c360052d5 data/laboratoryblocks/advancement/recipes/misc/redstone_particles.json +b7f4a38abf51771eb55cc3d0e95d413754efd8a9 data/laboratoryblocks/advancement/recipes/misc/starch.json +48d78a655eb18e012b61ad68c82b9246726ef259 data/laboratoryblocks/recipe/acacia_laboratory_floor.json +a125f87c4f10ea24d73661e961392fed770fa400 data/laboratoryblocks/recipe/acacia_laboratory_tiles.json +7c055fdff27051bf702cede4ec84d5b6d45f91f9 data/laboratoryblocks/recipe/bamboo_laboratory_floor.json +74acb9017e506f2cb27ae9c7db3b0c7eb3853cc1 data/laboratoryblocks/recipe/bamboo_laboratory_tiles.json +d4c03ab3cf8a37a0fa2634404310afd0a29d5ac5 data/laboratoryblocks/recipe/birch_laboratory_floor.json +4855bae65a0624668c549cde16492cffc0ef5b4a data/laboratoryblocks/recipe/birch_laboratory_tiles.json +77263fba0631ed2e60f1c17317da7479d9275c9c data/laboratoryblocks/recipe/cherry_laboratory_floor.json +467cc343c04d7507a7de04b792e680a990d766ff data/laboratoryblocks/recipe/cherry_laboratory_tiles.json +f587f326e7dc7c5b1c79aae7f9dde0df8eca3e8f data/laboratoryblocks/recipe/chiseled_laboratory_bookshelf.json +758b1da1a2fbfea244f0b783a07e3df6b4a295a4 data/laboratoryblocks/recipe/clear_laboratory_screen.json +3ccacbda10d1e956da06e3e15f57a6618f5677dd data/laboratoryblocks/recipe/compressed_starch.json +7d7918d81ffb6e5fc8876347a2bffb4de539e5a1 data/laboratoryblocks/recipe/configuration_tool.json +fd9d976aee96d9b7a06e7d400af3c4881902d03d data/laboratoryblocks/recipe/crimson_laboratory_floor.json +511d4f683323278adfe02445d2b71fa0ca40ded5 data/laboratoryblocks/recipe/crimson_laboratory_tiles.json +e51d11b9b0ac9554b594fbc78bcb1aeab991e857 data/laboratoryblocks/recipe/dark_oak_laboratory_floor.json +687501c9d626333375f35eb64281bc3d357c3245 data/laboratoryblocks/recipe/dark_oak_laboratory_tiles.json +6f2430d5a13c8316e4eea2467444997579eab2c5 data/laboratoryblocks/recipe/enlighted_acacia_laboratory_floor.json +5b06bfd0dd538e4e34da471e890dad5b68c6eae1 data/laboratoryblocks/recipe/enlighted_acacia_laboratory_tiles.json +46788895dcf781f59684d18cd42112730033f87b data/laboratoryblocks/recipe/enlighted_bamboo_laboratory_floor.json +c70be7bb0e36ee6272d99f207c1b7bd98cb13127 data/laboratoryblocks/recipe/enlighted_bamboo_laboratory_tiles.json +a54fa7831863852c2ba15b4738f5318bc7a2303a data/laboratoryblocks/recipe/enlighted_birch_laboratory_floor.json +3e7a04baf4dcbee34d7f6df4efbda8800f7bc49e data/laboratoryblocks/recipe/enlighted_birch_laboratory_tiles.json +d8361e555ee69f8750eb9c2c10ec3334ae51fbeb data/laboratoryblocks/recipe/enlighted_cherry_laboratory_floor.json +db2cbfb0789508ecb1c740a13d43c3752ce82f45 data/laboratoryblocks/recipe/enlighted_cherry_laboratory_tiles.json +f2a65a16c264d68b33fba85f35f0d8fa8884c8bf data/laboratoryblocks/recipe/enlighted_chiseled_laboratory_bookshelf.json +229e3dc57e6266babf22023458a3d9975546ea4d data/laboratoryblocks/recipe/enlighted_clear_laboratory_screen.json +aeddd137b9a6427e83b504a0cbb5b826cacd5c38 data/laboratoryblocks/recipe/enlighted_crimson_laboratory_floor.json +3721c5466b462099a0138b8e3644757190d5e413 data/laboratoryblocks/recipe/enlighted_crimson_laboratory_tiles.json +85e687c7d36be953f53be923081aac7469495566 data/laboratoryblocks/recipe/enlighted_dark_oak_laboratory_floor.json +5002422e25ae83e8dddfd156b80b9ed986025578 data/laboratoryblocks/recipe/enlighted_dark_oak_laboratory_tiles.json +c16ee5b5d7676409c53d0723e8af2263c0f9a3fa data/laboratoryblocks/recipe/enlighted_gray_laboratory_pillar.json +bdd75ea1b5b90dc23ab13fcf0b85a8bc3790f003 data/laboratoryblocks/recipe/enlighted_gray_laboratory_tiles.json +677ff40313b34ed47bc6409d750abd9564f98d6d data/laboratoryblocks/recipe/enlighted_jungle_laboratory_floor.json +2abbfb9fec7e5d337a79a5232d83e37d14f4f98b data/laboratoryblocks/recipe/enlighted_jungle_laboratory_tiles.json +26fd7b393029fa0a1e38382baab855630f0b3acf data/laboratoryblocks/recipe/enlighted_laboratory_block.json +0a6a333c2cde2db8c8656c1da74a0c1d452b0df8 data/laboratoryblocks/recipe/enlighted_laboratory_bookshelf.json +d4a69ce5a86f490be0e64454fdbd8da07e1ee01a data/laboratoryblocks/recipe/enlighted_laboratory_fan.json +6e33cd7a96eba6da80692f04b4b8bb4b90b70486 data/laboratoryblocks/recipe/enlighted_laboratory_fan_redstone_controlled.json +881758ec1ef7842f4195f334df518059ab014af5 data/laboratoryblocks/recipe/enlighted_laboratory_glass.json +8c1e3c4c9d7a7b0fea3a542b949cd98da8b1ab65 data/laboratoryblocks/recipe/enlighted_laboratory_pillar.json +4c3361955c2be3f96ca77862d29924e9f81751cc data/laboratoryblocks/recipe/enlighted_laboratory_tiles.json +8c9a7a84faaf6e03b4dd65f7fdf101e9cdf9fa9b data/laboratoryblocks/recipe/enlighted_laboratory_vent.json +1f051e285cee8a40be7788e494b73e6c423dd0fd data/laboratoryblocks/recipe/enlighted_laboratory_vent_connecting.json +eee609722448506ecba0c037748eb5060df2fb45 data/laboratoryblocks/recipe/enlighted_left-faced_blue_signaling_laboratory_block.json +14b325a1b900e6c668aad975a89920780d35aadf data/laboratoryblocks/recipe/enlighted_left-faced_green_signaling_laboratory_block.json +49874e0da010b828aed07f7ede80c42eba2da283 data/laboratoryblocks/recipe/enlighted_left-faced_red_signaling_laboratory_block.json +66050408a2fc7d6060eab85a108c9581dd251571 data/laboratoryblocks/recipe/enlighted_mangrove_laboratory_floor.json +e55a2e7af3985b58892142ea3969796d3c3cee19 data/laboratoryblocks/recipe/enlighted_mangrove_laboratory_tiles.json +bf96c728777ea575841c5a8138dffa01bf1eb4de data/laboratoryblocks/recipe/enlighted_mixed_laboratory_tiles.json +e9a2031717fed5c65c7696f3235d7e8e14feb897 data/laboratoryblocks/recipe/enlighted_oak_laboratory_floor.json +1fbe7b7d3d6776a5aab1354855299c25ca214ffa data/laboratoryblocks/recipe/enlighted_oak_laboratory_tiles.json +dfbe3e6a2764421b3409045e9a2520e5f17ad1fd data/laboratoryblocks/recipe/enlighted_pla_block.json +8393c87689a46a9072dfe645b7f5a92c0fda233b data/laboratoryblocks/recipe/enlighted_pla_flooring.json +bc7662ac958a9eab57e2f4888a2b82d136776b8b data/laboratoryblocks/recipe/enlighted_pla_tiles.json +06e4c89b23308bc58667b40257c0a13b207fa5f2 data/laboratoryblocks/recipe/enlighted_right-faced_blue_signaling_laboratory_block.json +34db98958ffc8b3e8fbfca8f5c3cbff33d37782c data/laboratoryblocks/recipe/enlighted_right-faced_green_signaling_laboratory_block.json +349fc267bcbb9e4dc9cb0617c88c7ae4df66c1d8 data/laboratoryblocks/recipe/enlighted_right-faced_red_signaling_laboratory_block.json +9a0f203b906eaf8d14dc7512edddb4c62d8118fd data/laboratoryblocks/recipe/enlighted_screwed_laboratory_block.json +f040a1471dee0473eeabd7988eef62c1198b7fe8 data/laboratoryblocks/recipe/enlighted_spruce_laboratory_floor.json +795a7ff2c62d2c4e71de7f2e5a8b43e9e7fe3f43 data/laboratoryblocks/recipe/enlighted_spruce_laboratory_tiles.json +4f88ffcf99b5cbc6335be2bdb0a4a4ae6efbda85 data/laboratoryblocks/recipe/enlighted_tiled_pla_flooring.json +b3429b72579287617d5fee2bc869a44f7c0e9e41 data/laboratoryblocks/recipe/enlighted_warped_laboratory_floor.json +79d4d9595c0c1f3efba6ee72cceb9c15c7183812 data/laboratoryblocks/recipe/enlighted_warped_laboratory_tiles.json +f258ad93d88cececd7cddf8c2a7a12f93e6622f8 data/laboratoryblocks/recipe/glowstone_particles.json +67c0b189c80be5f8e22af8e62742d3dff31dc31d data/laboratoryblocks/recipe/gray_laboratory_pillar.json +1f0cab99c3229e61463fb0c6392ff2c9a7f77e91 data/laboratoryblocks/recipe/gray_laboratory_tiles.json +099cf607ee9c69698bbf1c812cd87515e4546d1b data/laboratoryblocks/recipe/iron_screw.json +6759d34f50b945018007ace6c1da417af208ecf2 data/laboratoryblocks/recipe/jungle_laboratory_floor.json +2fe95f483be7313d07601a8b5c3539047132a10a data/laboratoryblocks/recipe/jungle_laboratory_tiles.json +4be4205d05945d47db4c0d79afa9e4ca244d642f data/laboratoryblocks/recipe/laboratory_block.json +16b7785381bd0711ad866c2d0d2c5d05edb5122a data/laboratoryblocks/recipe/laboratory_bookshelf.json +222b3df577508d46317b89f9b7fef1f6878d72f1 data/laboratoryblocks/recipe/laboratory_fan.json +a861fdffb19c0432dad2406fd26fbe0bad4cc438 data/laboratoryblocks/recipe/laboratory_fan_redstone_controlled.json +8c5b0b71730a49f30bf04135aa218da69a0bc23c data/laboratoryblocks/recipe/laboratory_glass.json +02db448e2cdbc0409505a69e3974a7a7a9f6e14b data/laboratoryblocks/recipe/laboratory_pillar.json +98c59791a586d06b7393e3304900fd6a0f5a28cc data/laboratoryblocks/recipe/laboratory_tiles.json +2c278fba501039fbccdfa98589e774e1e40e26cc data/laboratoryblocks/recipe/laboratory_vent.json +33189983c11a453e3b4a81e3b4d3e93d3af83221 data/laboratoryblocks/recipe/laboratory_vent_connecting.json +be4b57289fd01cfde5514a7a38fb97e43b28a61c data/laboratoryblocks/recipe/left-faced_blue_signaling_laboratory_block.json +55a0c21cd6d63aa7e70b4aa0983836c3ffae198a data/laboratoryblocks/recipe/left-faced_green_signaling_laboratory_block.json +f6b7b9e7be12aa023bdf6ec3fc6f9d72b1ff9089 data/laboratoryblocks/recipe/left-faced_red_signaling_laboratory_block.json +3b2b17ffc831105ddf1a6ddc82f8eedf8105618d data/laboratoryblocks/recipe/mangrove_laboratory_floor.json +c3b625e0b7224a93d76bc5c92f2e5b9f83af8f8d data/laboratoryblocks/recipe/mangrove_laboratory_tiles.json +1dc19fb7bf92595705eba22e83a2ade3e5cfa62c data/laboratoryblocks/recipe/mixed_laboratory_tiles.json +968c96affbef057ffab120688970757ccc97d5b1 data/laboratoryblocks/recipe/oak_laboratory_floor.json +31412691d6df0441d5b83d69554a8e070ebc02d0 data/laboratoryblocks/recipe/oak_laboratory_tiles.json +c53e5c0a4310c55ef9da24816b56331202a448ab data/laboratoryblocks/recipe/pla_block.json +ea0e467ff0334a0a67525e1a71f79783b17e3dd3 data/laboratoryblocks/recipe/pla_flooring.json +c179ee76049421675a08e4280f76e24599abdabf data/laboratoryblocks/recipe/pla_sheets.json +f02e7486fec5da4aba95c0d734e260c0fb340358 data/laboratoryblocks/recipe/pla_tiles.json +3b8b66199fe9971a1aeb478490c239d8c83029f0 data/laboratoryblocks/recipe/redstone_particles.json +c99b53f5433b302ed3965d3996618ed00ccb9712 data/laboratoryblocks/recipe/right-faced_blue_signaling_laboratory_block.json +8d3c6bcd266603d9e79020b9f75878fc8658d27f data/laboratoryblocks/recipe/right-faced_green_signaling_laboratory_block.json +bd082bdd911899b58ad9a6c5024dfce90d5b0090 data/laboratoryblocks/recipe/right-faced_red_signaling_laboratory_block.json +05ef67be5df32fc05b927714dfec08d7f45e869d data/laboratoryblocks/recipe/screwed_laboratory_block.json +fe2e8d8d200043289f4cef6571c3c55337352ff1 data/laboratoryblocks/recipe/spruce_laboratory_floor.json +ee9176cc44b6e580ea56151f50835f067a05d9dd data/laboratoryblocks/recipe/spruce_laboratory_tiles.json +213c55d758ff9bc37789aebeb056c4ff31f99f67 data/laboratoryblocks/recipe/starch.json +99b3a5f70a499fa593202b851354f1eeeaa3e757 data/laboratoryblocks/recipe/tiled_pla_flooring.json +d3b7c2a90fd810adf644585b68127a92e6dd7cbf data/laboratoryblocks/recipe/warped_laboratory_floor.json +ab8588d7b727955e877f1754a1b377a1402dfe79 data/laboratoryblocks/recipe/warped_laboratory_tiles.json +53370893805f4d68d7ca2d72f9d087015f2eecf8 data/minecraft/advancement/recipes/building_blocks/enlighted_laboratory_vent_connecting_from_laboratory_vent_connecting_and_glowstone_particles.json +66bacfd548b41f38ab09f9e94b87ce688a07f4b6 data/minecraft/advancement/recipes/misc/from_redstone_particles.json +ea1878c64b4152ea0521a332bb58eb850e71f73d data/minecraft/advancement/recipes/misc/glowstone_dust.json +58e258fada29787bd5d157ce67e48b146329eee0 data/minecraft/recipe/enlighted_laboratory_vent_connecting_from_laboratory_vent_connecting_and_glowstone_particles.json +4b81e6aa97a5651a58289bcf85d81784b1abb30f data/minecraft/recipe/from_redstone_particles.json +07e98276bead92dd4a7f10032e7e5f25048c9b32 data/minecraft/recipe/glowstone_dust.json diff --git a/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 b/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 deleted file mode 100644 index 83afdd8..0000000 --- a/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 +++ /dev/null @@ -1,2 +0,0 @@ -// 1.20.1 2024-06-10T22:33:38.8140881 Languages: en_us -631eef174ba0bc7a8cbc79ab3fe8d865c4a92a8c assets/laboratoryblocks/lang/en_us.json diff --git a/src/generated/resources/.cache/f751b48f3773cf4dc85aeb52cf48d6ac806b7c33 b/src/generated/resources/.cache/f751b48f3773cf4dc85aeb52cf48d6ac806b7c33 index 30717a6..a18352f 100644 --- a/src/generated/resources/.cache/f751b48f3773cf4dc85aeb52cf48d6ac806b7c33 +++ b/src/generated/resources/.cache/f751b48f3773cf4dc85aeb52cf48d6ac806b7c33 @@ -1,2 +1,2 @@ -// 1.20.1 2024-06-09T22:57:15.1563863 Item tags +// 1.21.1 2024-11-26T04:25:40.172202466 Item tags 18466411c3d10dab4e780625d1b26804786bcafe data/laboratoryblocks/tags/items/starch_ingredient.json diff --git a/src/generated/resources/.cache/f95c7003282837dabaa33e3ffceec4e6865b5218 b/src/generated/resources/.cache/f95c7003282837dabaa33e3ffceec4e6865b5218 index 764996b..a26d90c 100644 --- a/src/generated/resources/.cache/f95c7003282837dabaa33e3ffceec4e6865b5218 +++ b/src/generated/resources/.cache/f95c7003282837dabaa33e3ffceec4e6865b5218 @@ -1,4 +1,4 @@ -// 1.20.1 2024-06-09T23:56:17.4249936 Block tags +// 1.21.1 2024-11-26T04:25:40.169440136 Block tags f21974f84055bb49768b83efad1e6b907f60ede3 data/minecraft/tags/blocks/enchantment_power_provider.json f2b017a5219760ee54cbc09f61a3c76ca456b52d data/minecraft/tags/blocks/mineable/axe.json 76b45cff44678f533784c659a7a999ce73b040d8 data/minecraft/tags/blocks/mineable/pickaxe.json diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/acacia_laboratory_floor.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/acacia_laboratory_floor.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/acacia_laboratory_floor.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/acacia_laboratory_floor.json index c3951ee..878d7c8 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/acacia_laboratory_floor.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/acacia_laboratory_floor.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:acacia_planks" - ] + "items": "minecraft:acacia_planks" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:laboratory_block" - ] + "items": "laboratoryblocks:laboratory_block" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_laboratory_block", - "has_acacia_planks", - "has_the_recipe" + "has_acacia_planks" ] ], "rewards": { "recipes": [ "laboratoryblocks:acacia_laboratory_floor" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/acacia_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/acacia_laboratory_tiles.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/acacia_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/acacia_laboratory_tiles.json index 757dd8f..ba0795f 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/acacia_laboratory_tiles.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/acacia_laboratory_tiles.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:acacia_laboratory_floor" - ] + "items": "laboratoryblocks:acacia_laboratory_floor" } ] }, @@ -22,14 +20,13 @@ }, "requirements": [ [ - "has_acacia_laboratory_floor", - "has_the_recipe" + "has_the_recipe", + "has_acacia_laboratory_floor" ] ], "rewards": { "recipes": [ "laboratoryblocks:acacia_laboratory_tiles" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/bamboo_laboratory_floor.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/bamboo_laboratory_floor.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/bamboo_laboratory_floor.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/bamboo_laboratory_floor.json index d95af3c..46f1c1d 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/bamboo_laboratory_floor.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/bamboo_laboratory_floor.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:bamboo_planks" - ] + "items": "minecraft:bamboo_planks" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:laboratory_block" - ] + "items": "laboratoryblocks:laboratory_block" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_laboratory_block", - "has_bamboo_planks", - "has_the_recipe" + "has_bamboo_planks" ] ], "rewards": { "recipes": [ "laboratoryblocks:bamboo_laboratory_floor" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/bamboo_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/bamboo_laboratory_tiles.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/bamboo_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/bamboo_laboratory_tiles.json index 8ff9387..4a285f2 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/bamboo_laboratory_tiles.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/bamboo_laboratory_tiles.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:bamboo_laboratory_floor" - ] + "items": "laboratoryblocks:bamboo_laboratory_floor" } ] }, @@ -22,14 +20,13 @@ }, "requirements": [ [ - "has_bamboo_laboratory_floor", - "has_the_recipe" + "has_the_recipe", + "has_bamboo_laboratory_floor" ] ], "rewards": { "recipes": [ "laboratoryblocks:bamboo_laboratory_tiles" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/birch_laboratory_floor.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/birch_laboratory_floor.json similarity index 74% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/birch_laboratory_floor.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/birch_laboratory_floor.json index 4c064ae..8de20d6 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/birch_laboratory_floor.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/birch_laboratory_floor.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:birch_planks" - ] + "items": "minecraft:birch_planks" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:laboratory_block" - ] + "items": "laboratoryblocks:laboratory_block" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_laboratory_block", - "has_birch_planks", - "has_the_recipe" + "has_birch_planks" ] ], "rewards": { "recipes": [ "laboratoryblocks:birch_laboratory_floor" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/birch_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/birch_laboratory_tiles.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/birch_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/birch_laboratory_tiles.json index 9d03d00..82baf16 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/birch_laboratory_tiles.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/birch_laboratory_tiles.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:birch_laboratory_floor" - ] + "items": "laboratoryblocks:birch_laboratory_floor" } ] }, @@ -22,14 +20,13 @@ }, "requirements": [ [ - "has_birch_laboratory_floor", - "has_the_recipe" + "has_the_recipe", + "has_birch_laboratory_floor" ] ], "rewards": { "recipes": [ "laboratoryblocks:birch_laboratory_tiles" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/cherry_laboratory_floor.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/cherry_laboratory_floor.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/cherry_laboratory_floor.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/cherry_laboratory_floor.json index 26059fc..b677a7d 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/cherry_laboratory_floor.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/cherry_laboratory_floor.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:cherry_planks" - ] + "items": "minecraft:cherry_planks" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:laboratory_block" - ] + "items": "laboratoryblocks:laboratory_block" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_laboratory_block", - "has_cherry_planks", - "has_the_recipe" + "has_cherry_planks" ] ], "rewards": { "recipes": [ "laboratoryblocks:cherry_laboratory_floor" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/cherry_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/cherry_laboratory_tiles.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/cherry_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/cherry_laboratory_tiles.json index e58fcb5..79388db 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/cherry_laboratory_tiles.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/cherry_laboratory_tiles.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:cherry_laboratory_floor" - ] + "items": "laboratoryblocks:cherry_laboratory_floor" } ] }, @@ -22,14 +20,13 @@ }, "requirements": [ [ - "has_cherry_laboratory_floor", - "has_the_recipe" + "has_the_recipe", + "has_cherry_laboratory_floor" ] ], "rewards": { "recipes": [ "laboratoryblocks:cherry_laboratory_tiles" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/chiseled_laboratory_bookshelf.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/chiseled_laboratory_bookshelf.json similarity index 74% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/chiseled_laboratory_bookshelf.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/chiseled_laboratory_bookshelf.json index a80ace6..6198a06 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/chiseled_laboratory_bookshelf.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/chiseled_laboratory_bookshelf.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:laboratory_block" - ] + "items": "laboratoryblocks:laboratory_block" } ] }, @@ -22,14 +20,13 @@ }, "requirements": [ [ - "has_laboratory_block", - "has_the_recipe" + "has_the_recipe", + "has_laboratory_block" ] ], "rewards": { "recipes": [ "laboratoryblocks:chiseled_laboratory_bookshelf" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/clear_laboratory_screen.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/clear_laboratory_screen.json similarity index 72% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/clear_laboratory_screen.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/clear_laboratory_screen.json index bf09bbd..67166c0 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/clear_laboratory_screen.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/clear_laboratory_screen.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:iron_screw" - ] + "items": "laboratoryblocks:iron_screw" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:laboratory_block" - ] + "items": "laboratoryblocks:laboratory_block" } ] }, @@ -29,9 +25,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:pla_sheets" - ] + "items": "laboratoryblocks:pla_sheets" } ] }, @@ -46,16 +40,15 @@ }, "requirements": [ [ + "has_the_recipe", "has_laboratory_block", "has_iron_screw", - "has_pla_sheets", - "has_the_recipe" + "has_pla_sheets" ] ], "rewards": { "recipes": [ "laboratoryblocks:clear_laboratory_screen" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/crimson_laboratory_floor.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/crimson_laboratory_floor.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/crimson_laboratory_floor.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/crimson_laboratory_floor.json index 3b51bf2..29b0c62 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/crimson_laboratory_floor.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/crimson_laboratory_floor.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:crimson_planks" - ] + "items": "minecraft:crimson_planks" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:laboratory_block" - ] + "items": "laboratoryblocks:laboratory_block" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_laboratory_block", - "has_crimson_planks", - "has_the_recipe" + "has_crimson_planks" ] ], "rewards": { "recipes": [ "laboratoryblocks:crimson_laboratory_floor" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/crimson_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/crimson_laboratory_tiles.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/crimson_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/crimson_laboratory_tiles.json index 8d6c9c3..e320bf0 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/crimson_laboratory_tiles.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/crimson_laboratory_tiles.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:crimson_laboratory_floor" - ] + "items": "laboratoryblocks:crimson_laboratory_floor" } ] }, @@ -22,14 +20,13 @@ }, "requirements": [ [ - "has_crimson_laboratory_floor", - "has_the_recipe" + "has_the_recipe", + "has_crimson_laboratory_floor" ] ], "rewards": { "recipes": [ "laboratoryblocks:crimson_laboratory_tiles" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/dark_oak_laboratory_floor.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/dark_oak_laboratory_floor.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/dark_oak_laboratory_floor.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/dark_oak_laboratory_floor.json index 30468c2..68f4159 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/dark_oak_laboratory_floor.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/dark_oak_laboratory_floor.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:dark_oak_planks" - ] + "items": "minecraft:dark_oak_planks" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:laboratory_block" - ] + "items": "laboratoryblocks:laboratory_block" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_laboratory_block", - "has_dark_oak_planks", - "has_the_recipe" + "has_dark_oak_planks" ] ], "rewards": { "recipes": [ "laboratoryblocks:dark_oak_laboratory_floor" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/dark_oak_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/dark_oak_laboratory_tiles.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/dark_oak_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/dark_oak_laboratory_tiles.json index a0a8d25..364dd32 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/dark_oak_laboratory_tiles.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/dark_oak_laboratory_tiles.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:dark_oak_laboratory_floor" - ] + "items": "laboratoryblocks:dark_oak_laboratory_floor" } ] }, @@ -22,14 +20,13 @@ }, "requirements": [ [ - "has_oak_laboratory_floor", - "has_the_recipe" + "has_the_recipe", + "has_oak_laboratory_floor" ] ], "rewards": { "recipes": [ "laboratoryblocks:dark_oak_laboratory_tiles" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_acacia_laboratory_floor.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_acacia_laboratory_floor.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_acacia_laboratory_floor.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_acacia_laboratory_floor.json index 007d5b9..6edacdc 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_acacia_laboratory_floor.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_acacia_laboratory_floor.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:acacia_laboratory_floor" - ] + "items": "laboratoryblocks:acacia_laboratory_floor" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:glowstone_particles" - ] + "items": "laboratoryblocks:glowstone_particles" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_acacia_laboratory_floor", - "has_glowstone_particles", - "has_the_recipe" + "has_glowstone_particles" ] ], "rewards": { "recipes": [ "laboratoryblocks:enlighted_acacia_laboratory_floor" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_acacia_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_acacia_laboratory_tiles.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_acacia_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_acacia_laboratory_tiles.json index 07ceeaa..8ebb94a 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_acacia_laboratory_tiles.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_acacia_laboratory_tiles.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:acacia_laboratory_tiles" - ] + "items": "laboratoryblocks:acacia_laboratory_tiles" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:glowstone_particles" - ] + "items": "laboratoryblocks:glowstone_particles" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_acacia_laboratory_tiles", - "has_glowstone_particles", - "has_the_recipe" + "has_glowstone_particles" ] ], "rewards": { "recipes": [ "laboratoryblocks:enlighted_acacia_laboratory_tiles" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_bamboo_laboratory_floor.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_bamboo_laboratory_floor.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_bamboo_laboratory_floor.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_bamboo_laboratory_floor.json index 7a0491d..e4e9495 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_bamboo_laboratory_floor.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_bamboo_laboratory_floor.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:bamboo_laboratory_floor" - ] + "items": "laboratoryblocks:bamboo_laboratory_floor" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:glowstone_particles" - ] + "items": "laboratoryblocks:glowstone_particles" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_bamboo_laboratory_floor", - "has_glowstone_particles", - "has_the_recipe" + "has_glowstone_particles" ] ], "rewards": { "recipes": [ "laboratoryblocks:enlighted_bamboo_laboratory_floor" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_bamboo_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_bamboo_laboratory_tiles.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_bamboo_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_bamboo_laboratory_tiles.json index b3edf12..ce7064c 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_bamboo_laboratory_tiles.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_bamboo_laboratory_tiles.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:bamboo_laboratory_tiles" - ] + "items": "laboratoryblocks:bamboo_laboratory_tiles" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:glowstone_particles" - ] + "items": "laboratoryblocks:glowstone_particles" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_bamboo_laboratory_tiles", - "has_glowstone_particles", - "has_the_recipe" + "has_glowstone_particles" ] ], "rewards": { "recipes": [ "laboratoryblocks:enlighted_bamboo_laboratory_tiles" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_birch_laboratory_floor.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_birch_laboratory_floor.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_birch_laboratory_floor.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_birch_laboratory_floor.json index 43702ef..a3533a4 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_birch_laboratory_floor.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_birch_laboratory_floor.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:birch_laboratory_floor" - ] + "items": "laboratoryblocks:birch_laboratory_floor" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:glowstone_particles" - ] + "items": "laboratoryblocks:glowstone_particles" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_birch_laboratory_floor", - "has_glowstone_particles", - "has_the_recipe" + "has_glowstone_particles" ] ], "rewards": { "recipes": [ "laboratoryblocks:enlighted_birch_laboratory_floor" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_birch_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_birch_laboratory_tiles.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_birch_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_birch_laboratory_tiles.json index e5d3103..8b1a3f8 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_birch_laboratory_tiles.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_birch_laboratory_tiles.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:birch_laboratory_tiles" - ] + "items": "laboratoryblocks:birch_laboratory_tiles" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:glowstone_particles" - ] + "items": "laboratoryblocks:glowstone_particles" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_birch_laboratory_tiles", - "has_glowstone_particles", - "has_the_recipe" + "has_glowstone_particles" ] ], "rewards": { "recipes": [ "laboratoryblocks:enlighted_birch_laboratory_tiles" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_cherry_laboratory_floor.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_cherry_laboratory_floor.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_cherry_laboratory_floor.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_cherry_laboratory_floor.json index e2ff6e3..f66a585 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_cherry_laboratory_floor.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_cherry_laboratory_floor.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:cherry_laboratory_floor" - ] + "items": "laboratoryblocks:cherry_laboratory_floor" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:glowstone_particles" - ] + "items": "laboratoryblocks:glowstone_particles" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_cherry_laboratory_floor", - "has_glowstone_particles", - "has_the_recipe" + "has_glowstone_particles" ] ], "rewards": { "recipes": [ "laboratoryblocks:enlighted_cherry_laboratory_floor" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_cherry_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_cherry_laboratory_tiles.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_cherry_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_cherry_laboratory_tiles.json index de585bc..263512f 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_cherry_laboratory_tiles.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_cherry_laboratory_tiles.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:cherry_laboratory_tiles" - ] + "items": "laboratoryblocks:cherry_laboratory_tiles" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:glowstone_particles" - ] + "items": "laboratoryblocks:glowstone_particles" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_cherry_laboratory_tiles", - "has_glowstone_particles", - "has_the_recipe" + "has_glowstone_particles" ] ], "rewards": { "recipes": [ "laboratoryblocks:enlighted_cherry_laboratory_tiles" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_chiseled_laboratory_bookshelf.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_chiseled_laboratory_bookshelf.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_chiseled_laboratory_bookshelf.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_chiseled_laboratory_bookshelf.json index afa93d5..e4c52e3 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_chiseled_laboratory_bookshelf.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_chiseled_laboratory_bookshelf.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:chiseled_laboratory_bookshelf" - ] + "items": "laboratoryblocks:chiseled_laboratory_bookshelf" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:glowstone_particles" - ] + "items": "laboratoryblocks:glowstone_particles" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_chiseled_laboratory_bookshelf", - "has_glowstone_particles", - "has_the_recipe" + "has_glowstone_particles" ] ], "rewards": { "recipes": [ "laboratoryblocks:enlighted_chiseled_laboratory_bookshelf" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_clear_laboratory_screen.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_clear_laboratory_screen.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_clear_laboratory_screen.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_clear_laboratory_screen.json index aa5a70a..9865564 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_clear_laboratory_screen.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_clear_laboratory_screen.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:clear_laboratory_screen" - ] + "items": "laboratoryblocks:clear_laboratory_screen" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:glowstone_particles" - ] + "items": "laboratoryblocks:glowstone_particles" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_clear_laboratory_screen", - "has_glowstone_particles", - "has_the_recipe" + "has_glowstone_particles" ] ], "rewards": { "recipes": [ "laboratoryblocks:enlighted_clear_laboratory_screen" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_crimson_laboratory_floor.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_crimson_laboratory_floor.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_crimson_laboratory_floor.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_crimson_laboratory_floor.json index 1c8eba3..db9a603 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_crimson_laboratory_floor.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_crimson_laboratory_floor.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:crimson_laboratory_floor" - ] + "items": "laboratoryblocks:crimson_laboratory_floor" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:glowstone_particles" - ] + "items": "laboratoryblocks:glowstone_particles" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_crimson_laboratory_floor", - "has_glowstone_particles", - "has_the_recipe" + "has_glowstone_particles" ] ], "rewards": { "recipes": [ "laboratoryblocks:enlighted_crimson_laboratory_floor" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_crimson_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_crimson_laboratory_tiles.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_crimson_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_crimson_laboratory_tiles.json index 09d6b02..06f1a69 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_crimson_laboratory_tiles.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_crimson_laboratory_tiles.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:crimson_laboratory_tiles" - ] + "items": "laboratoryblocks:crimson_laboratory_tiles" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:glowstone_particles" - ] + "items": "laboratoryblocks:glowstone_particles" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_crimson_laboratory_tiles", - "has_glowstone_particles", - "has_the_recipe" + "has_glowstone_particles" ] ], "rewards": { "recipes": [ "laboratoryblocks:enlighted_crimson_laboratory_tiles" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_dark_oak_laboratory_floor.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_dark_oak_laboratory_floor.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_dark_oak_laboratory_floor.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_dark_oak_laboratory_floor.json index 379e979..0539eaf 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_dark_oak_laboratory_floor.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_dark_oak_laboratory_floor.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:dark_oak_laboratory_floor" - ] + "items": "laboratoryblocks:dark_oak_laboratory_floor" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:glowstone_particles" - ] + "items": "laboratoryblocks:glowstone_particles" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_dark_oak_laboratory_floor", - "has_glowstone_particles", - "has_the_recipe" + "has_glowstone_particles" ] ], "rewards": { "recipes": [ "laboratoryblocks:enlighted_dark_oak_laboratory_floor" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_dark_oak_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_dark_oak_laboratory_tiles.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_dark_oak_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_dark_oak_laboratory_tiles.json index bfb8db2..ebed3c1 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_dark_oak_laboratory_tiles.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_dark_oak_laboratory_tiles.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:dark_oak_laboratory_tiles" - ] + "items": "laboratoryblocks:dark_oak_laboratory_tiles" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:glowstone_particles" - ] + "items": "laboratoryblocks:glowstone_particles" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_dark_oak_laboratory_tiles", - "has_glowstone_particles", - "has_the_recipe" + "has_glowstone_particles" ] ], "rewards": { "recipes": [ "laboratoryblocks:enlighted_dark_oak_laboratory_tiles" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_gray_laboratory_pillar.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_gray_laboratory_pillar.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_gray_laboratory_pillar.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_gray_laboratory_pillar.json index b883b04..08c6135 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_gray_laboratory_pillar.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_gray_laboratory_pillar.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:glowstone_particles" - ] + "items": "laboratoryblocks:glowstone_particles" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:gray_laboratory_pillar" - ] + "items": "laboratoryblocks:gray_laboratory_pillar" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_gray_laboratory_pillar", - "has_glowstone_particles", - "has_the_recipe" + "has_glowstone_particles" ] ], "rewards": { "recipes": [ "laboratoryblocks:enlighted_gray_laboratory_pillar" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_gray_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_gray_laboratory_tiles.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_gray_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_gray_laboratory_tiles.json index ebb8025..c02375a 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_gray_laboratory_tiles.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_gray_laboratory_tiles.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:glowstone_particles" - ] + "items": "laboratoryblocks:glowstone_particles" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:gray_laboratory_tiles" - ] + "items": "laboratoryblocks:gray_laboratory_tiles" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_gray_laboratory_tiles", - "has_glowstone_particles", - "has_the_recipe" + "has_glowstone_particles" ] ], "rewards": { "recipes": [ "laboratoryblocks:enlighted_gray_laboratory_tiles" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_jungle_laboratory_floor.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_jungle_laboratory_floor.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_jungle_laboratory_floor.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_jungle_laboratory_floor.json index 7b54c00..36e06da 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_jungle_laboratory_floor.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_jungle_laboratory_floor.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:glowstone_particles" - ] + "items": "laboratoryblocks:glowstone_particles" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:jungle_laboratory_floor" - ] + "items": "laboratoryblocks:jungle_laboratory_floor" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_jungle_laboratory_floor", - "has_glowstone_particles", - "has_the_recipe" + "has_glowstone_particles" ] ], "rewards": { "recipes": [ "laboratoryblocks:enlighted_jungle_laboratory_floor" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_jungle_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_jungle_laboratory_tiles.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_jungle_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_jungle_laboratory_tiles.json index 48efe4c..4fd3a9d 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_jungle_laboratory_tiles.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_jungle_laboratory_tiles.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:glowstone_particles" - ] + "items": "laboratoryblocks:glowstone_particles" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:jungle_laboratory_tiles" - ] + "items": "laboratoryblocks:jungle_laboratory_tiles" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_jungle_laboratory_tiles", - "has_glowstone_particles", - "has_the_recipe" + "has_glowstone_particles" ] ], "rewards": { "recipes": [ "laboratoryblocks:enlighted_jungle_laboratory_tiles" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_laboratory_block.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_laboratory_block.json similarity index 72% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_laboratory_block.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_laboratory_block.json index d078bfb..19bf06a 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_laboratory_block.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_laboratory_block.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:glowstone_particles" - ] + "items": "laboratoryblocks:glowstone_particles" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:laboratory_block" - ] + "items": "laboratoryblocks:laboratory_block" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_laboratory_block", - "has_glowstone_particles", - "has_the_recipe" + "has_glowstone_particles" ] ], "rewards": { "recipes": [ "laboratoryblocks:enlighted_laboratory_block" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_laboratory_bookshelf.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_laboratory_bookshelf.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_laboratory_bookshelf.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_laboratory_bookshelf.json index 63f5723..6c0d0fb 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_laboratory_bookshelf.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_laboratory_bookshelf.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:glowstone_particles" - ] + "items": "laboratoryblocks:glowstone_particles" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:laboratory_bookshelf" - ] + "items": "laboratoryblocks:laboratory_bookshelf" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_laboratory_bookshelf", - "has_glowstone_particles", - "has_the_recipe" + "has_glowstone_particles" ] ], "rewards": { "recipes": [ "laboratoryblocks:enlighted_laboratory_bookshelf" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_laboratory_fan.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_laboratory_fan.json similarity index 72% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_laboratory_fan.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_laboratory_fan.json index 979502c..607b6ec 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_laboratory_fan.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_laboratory_fan.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:glowstone_particles" - ] + "items": "laboratoryblocks:glowstone_particles" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:laboratory_fan" - ] + "items": "laboratoryblocks:laboratory_fan" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_laboratory_fan", - "has_glowstone_particles", - "has_the_recipe" + "has_glowstone_particles" ] ], "rewards": { "recipes": [ "laboratoryblocks:enlighted_laboratory_fan" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_laboratory_fan_redstone_controlled.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_laboratory_fan_redstone_controlled.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_laboratory_fan_redstone_controlled.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_laboratory_fan_redstone_controlled.json index 53fb2d1..e116827 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_laboratory_fan_redstone_controlled.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_laboratory_fan_redstone_controlled.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:enlighted_laboratory_fan" - ] + "items": "laboratoryblocks:enlighted_laboratory_fan" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:redstone_particles" - ] + "items": "laboratoryblocks:redstone_particles" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_enlighted_laboratory_fan", - "has_redstone_particles", - "has_the_recipe" + "has_redstone_particles" ] ], "rewards": { "recipes": [ "laboratoryblocks:enlighted_laboratory_fan_redstone_controlled" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_laboratory_glass.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_laboratory_glass.json similarity index 72% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_laboratory_glass.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_laboratory_glass.json index a670644..dedbd9c 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_laboratory_glass.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_laboratory_glass.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:glowstone_particles" - ] + "items": "laboratoryblocks:glowstone_particles" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:laboratory_glass" - ] + "items": "laboratoryblocks:laboratory_glass" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_laboratory_glass", - "has_glowstone_particles", - "has_the_recipe" + "has_glowstone_particles" ] ], "rewards": { "recipes": [ "laboratoryblocks:enlighted_laboratory_glass" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_laboratory_pillar.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_laboratory_pillar.json similarity index 72% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_laboratory_pillar.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_laboratory_pillar.json index 16f3fad..0bcd74c 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_laboratory_pillar.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_laboratory_pillar.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:glowstone_particles" - ] + "items": "laboratoryblocks:glowstone_particles" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:laboratory_pillar" - ] + "items": "laboratoryblocks:laboratory_pillar" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_laboratory_pillar", - "has_glowstone_particles", - "has_the_recipe" + "has_glowstone_particles" ] ], "rewards": { "recipes": [ "laboratoryblocks:enlighted_laboratory_pillar" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_laboratory_tiles.json similarity index 72% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_laboratory_tiles.json index b238633..ef85e97 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_laboratory_tiles.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_laboratory_tiles.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:glowstone_particles" - ] + "items": "laboratoryblocks:glowstone_particles" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:laboratory_tiles" - ] + "items": "laboratoryblocks:laboratory_tiles" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_laboratory_tiles", - "has_glowstone_particles", - "has_the_recipe" + "has_glowstone_particles" ] ], "rewards": { "recipes": [ "laboratoryblocks:enlighted_laboratory_tiles" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_laboratory_vent.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_laboratory_vent.json similarity index 72% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_laboratory_vent.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_laboratory_vent.json index d77ff66..f5266d5 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_laboratory_vent.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_laboratory_vent.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:glowstone_particles" - ] + "items": "laboratoryblocks:glowstone_particles" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:laboratory_vent" - ] + "items": "laboratoryblocks:laboratory_vent" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_laboratory_vent", - "has_glowstone_particles", - "has_the_recipe" + "has_glowstone_particles" ] ], "rewards": { "recipes": [ "laboratoryblocks:enlighted_laboratory_vent" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_laboratory_vent_connecting.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_laboratory_vent_connecting.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_laboratory_vent_connecting.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_laboratory_vent_connecting.json index 568d0b4..e1eae60 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_laboratory_vent_connecting.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_laboratory_vent_connecting.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:laboratory_vent_connecting" - ] + "items": "laboratoryblocks:laboratory_vent_connecting" } ] }, @@ -22,14 +20,13 @@ }, "requirements": [ [ - "has_laboratory_vent_connecting", - "has_the_recipe" + "has_the_recipe", + "has_laboratory_vent_connecting" ] ], "rewards": { "recipes": [ "laboratoryblocks:enlighted_laboratory_vent_connecting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_left-faced_blue_signaling_laboratory_block.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_left-faced_blue_signaling_laboratory_block.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_left-faced_blue_signaling_laboratory_block.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_left-faced_blue_signaling_laboratory_block.json index 0213fcd..3c224cd 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_left-faced_blue_signaling_laboratory_block.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_left-faced_blue_signaling_laboratory_block.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:glowstone_particles" - ] + "items": "laboratoryblocks:glowstone_particles" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:left-faced_blue_signaling_laboratory_block" - ] + "items": "laboratoryblocks:left-faced_blue_signaling_laboratory_block" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_left-faced_blue_signaling_laboratory_block", - "has_glowstone_particles", - "has_the_recipe" + "has_glowstone_particles" ] ], "rewards": { "recipes": [ "laboratoryblocks:enlighted_left-faced_blue_signaling_laboratory_block" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_left-faced_green_signaling_laboratory_block.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_left-faced_green_signaling_laboratory_block.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_left-faced_green_signaling_laboratory_block.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_left-faced_green_signaling_laboratory_block.json index c778466..1db9b8e 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_left-faced_green_signaling_laboratory_block.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_left-faced_green_signaling_laboratory_block.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:glowstone_particles" - ] + "items": "laboratoryblocks:glowstone_particles" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:left-faced_green_signaling_laboratory_block" - ] + "items": "laboratoryblocks:left-faced_green_signaling_laboratory_block" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_left-faced_green_signaling_laboratory_block", - "has_glowstone_particles", - "has_the_recipe" + "has_glowstone_particles" ] ], "rewards": { "recipes": [ "laboratoryblocks:enlighted_left-faced_green_signaling_laboratory_block" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_left-faced_red_signaling_laboratory_block.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_left-faced_red_signaling_laboratory_block.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_left-faced_red_signaling_laboratory_block.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_left-faced_red_signaling_laboratory_block.json index 6edcc59..94af700 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_left-faced_red_signaling_laboratory_block.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_left-faced_red_signaling_laboratory_block.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:glowstone_particles" - ] + "items": "laboratoryblocks:glowstone_particles" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:left-faced_red_signaling_laboratory_block" - ] + "items": "laboratoryblocks:left-faced_red_signaling_laboratory_block" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_left-faced_red_signaling_laboratory_block", - "has_glowstone_particles", - "has_the_recipe" + "has_glowstone_particles" ] ], "rewards": { "recipes": [ "laboratoryblocks:enlighted_left-faced_red_signaling_laboratory_block" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_mangrove_laboratory_floor.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_mangrove_laboratory_floor.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_mangrove_laboratory_floor.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_mangrove_laboratory_floor.json index 39a8a73..1a0ca29 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_mangrove_laboratory_floor.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_mangrove_laboratory_floor.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:glowstone_particles" - ] + "items": "laboratoryblocks:glowstone_particles" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:mangrove_laboratory_floor" - ] + "items": "laboratoryblocks:mangrove_laboratory_floor" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_mangrove_laboratory_floor", - "has_glowstone_particles", - "has_the_recipe" + "has_glowstone_particles" ] ], "rewards": { "recipes": [ "laboratoryblocks:enlighted_mangrove_laboratory_floor" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_mangrove_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_mangrove_laboratory_tiles.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_mangrove_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_mangrove_laboratory_tiles.json index cf5e29b..3c7b089 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_mangrove_laboratory_tiles.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_mangrove_laboratory_tiles.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:glowstone_particles" - ] + "items": "laboratoryblocks:glowstone_particles" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:mangrove_laboratory_tiles" - ] + "items": "laboratoryblocks:mangrove_laboratory_tiles" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_mangrove_laboratory_tiles", - "has_glowstone_particles", - "has_the_recipe" + "has_glowstone_particles" ] ], "rewards": { "recipes": [ "laboratoryblocks:enlighted_mangrove_laboratory_tiles" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_mixed_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_mixed_laboratory_tiles.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_mixed_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_mixed_laboratory_tiles.json index 87e941b..bc3275a 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_mixed_laboratory_tiles.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_mixed_laboratory_tiles.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:glowstone_particles" - ] + "items": "laboratoryblocks:glowstone_particles" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:mixed_laboratory_tiles" - ] + "items": "laboratoryblocks:mixed_laboratory_tiles" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_mixed_laboratory_tiles", - "has_glowstone_particles", - "has_the_recipe" + "has_glowstone_particles" ] ], "rewards": { "recipes": [ "laboratoryblocks:enlighted_mixed_laboratory_tiles" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_oak_laboratory_floor.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_oak_laboratory_floor.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_oak_laboratory_floor.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_oak_laboratory_floor.json index 6f47fea..eda57c5 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_oak_laboratory_floor.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_oak_laboratory_floor.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:glowstone_particles" - ] + "items": "laboratoryblocks:glowstone_particles" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:oak_laboratory_floor" - ] + "items": "laboratoryblocks:oak_laboratory_floor" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_oak_laboratory_floor", - "has_glowstone_particles", - "has_the_recipe" + "has_glowstone_particles" ] ], "rewards": { "recipes": [ "laboratoryblocks:enlighted_oak_laboratory_floor" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_oak_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_oak_laboratory_tiles.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_oak_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_oak_laboratory_tiles.json index 64e8158..65e2a97 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_oak_laboratory_tiles.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_oak_laboratory_tiles.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:glowstone_particles" - ] + "items": "laboratoryblocks:glowstone_particles" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:oak_laboratory_tiles" - ] + "items": "laboratoryblocks:oak_laboratory_tiles" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_oak_laboratory_tiles", - "has_glowstone_particles", - "has_the_recipe" + "has_glowstone_particles" ] ], "rewards": { "recipes": [ "laboratoryblocks:enlighted_oak_laboratory_tiles" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_pla_block.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_pla_block.json similarity index 72% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_pla_block.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_pla_block.json index e68eb09..c2394b7 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_pla_block.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_pla_block.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:glowstone_particles" - ] + "items": "laboratoryblocks:glowstone_particles" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:pla_block" - ] + "items": "laboratoryblocks:pla_block" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_pla_block", - "has_glowstone_particles", - "has_the_recipe" + "has_glowstone_particles" ] ], "rewards": { "recipes": [ "laboratoryblocks:enlighted_pla_block" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_pla_flooring.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_pla_flooring.json similarity index 72% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_pla_flooring.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_pla_flooring.json index ba74de0..b84a90b 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_pla_flooring.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_pla_flooring.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:glowstone_particles" - ] + "items": "laboratoryblocks:glowstone_particles" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:pla_flooring" - ] + "items": "laboratoryblocks:pla_flooring" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_pla_flooring", - "has_glowstone_particles", - "has_the_recipe" + "has_glowstone_particles" ] ], "rewards": { "recipes": [ "laboratoryblocks:enlighted_pla_flooring" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_pla_tiles.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_pla_tiles.json similarity index 72% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_pla_tiles.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_pla_tiles.json index 4b84a93..ba1d81a 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_pla_tiles.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_pla_tiles.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:glowstone_particles" - ] + "items": "laboratoryblocks:glowstone_particles" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:pla_tiles" - ] + "items": "laboratoryblocks:pla_tiles" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_pla_tiles", - "has_glowstone_particles", - "has_the_recipe" + "has_glowstone_particles" ] ], "rewards": { "recipes": [ "laboratoryblocks:enlighted_pla_tiles" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_right-faced_blue_signaling_laboratory_block.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_right-faced_blue_signaling_laboratory_block.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_right-faced_blue_signaling_laboratory_block.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_right-faced_blue_signaling_laboratory_block.json index 5676969..f515b1e 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_right-faced_blue_signaling_laboratory_block.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_right-faced_blue_signaling_laboratory_block.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:glowstone_particles" - ] + "items": "laboratoryblocks:glowstone_particles" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:right-faced_blue_signaling_laboratory_block" - ] + "items": "laboratoryblocks:right-faced_blue_signaling_laboratory_block" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_right-faced_blue_signaling_laboratory_block", - "has_glowstone_particles", - "has_the_recipe" + "has_glowstone_particles" ] ], "rewards": { "recipes": [ "laboratoryblocks:enlighted_right-faced_blue_signaling_laboratory_block" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_right-faced_green_signaling_laboratory_block.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_right-faced_green_signaling_laboratory_block.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_right-faced_green_signaling_laboratory_block.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_right-faced_green_signaling_laboratory_block.json index b7c44eb..de50193 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_right-faced_green_signaling_laboratory_block.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_right-faced_green_signaling_laboratory_block.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:glowstone_particles" - ] + "items": "laboratoryblocks:glowstone_particles" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:right-faced_green_signaling_laboratory_block" - ] + "items": "laboratoryblocks:right-faced_green_signaling_laboratory_block" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_right-faced_green_signaling_laboratory_block", - "has_glowstone_particles", - "has_the_recipe" + "has_glowstone_particles" ] ], "rewards": { "recipes": [ "laboratoryblocks:enlighted_right-faced_green_signaling_laboratory_block" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_right-faced_red_signaling_laboratory_block.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_right-faced_red_signaling_laboratory_block.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_right-faced_red_signaling_laboratory_block.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_right-faced_red_signaling_laboratory_block.json index 6ec2a53..377d783 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_right-faced_red_signaling_laboratory_block.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_right-faced_red_signaling_laboratory_block.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:glowstone_particles" - ] + "items": "laboratoryblocks:glowstone_particles" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:right-faced_red_signaling_laboratory_block" - ] + "items": "laboratoryblocks:right-faced_red_signaling_laboratory_block" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_right-faced_red_signaling_laboratory_block", - "has_glowstone_particles", - "has_the_recipe" + "has_glowstone_particles" ] ], "rewards": { "recipes": [ "laboratoryblocks:enlighted_right-faced_red_signaling_laboratory_block" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_screwed_laboratory_block.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_screwed_laboratory_block.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_screwed_laboratory_block.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_screwed_laboratory_block.json index 4f51926..ef27911 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_screwed_laboratory_block.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_screwed_laboratory_block.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:glowstone_particles" - ] + "items": "laboratoryblocks:glowstone_particles" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:screwed_laboratory_block" - ] + "items": "laboratoryblocks:screwed_laboratory_block" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_screwed_laboratory_block", - "has_glowstone_particles", - "has_the_recipe" + "has_glowstone_particles" ] ], "rewards": { "recipes": [ "laboratoryblocks:enlighted_screwed_laboratory_block" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_spruce_laboratory_floor.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_spruce_laboratory_floor.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_spruce_laboratory_floor.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_spruce_laboratory_floor.json index 6e7859c..df464d4 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_spruce_laboratory_floor.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_spruce_laboratory_floor.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:glowstone_particles" - ] + "items": "laboratoryblocks:glowstone_particles" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:spruce_laboratory_floor" - ] + "items": "laboratoryblocks:spruce_laboratory_floor" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_spruce_laboratory_floor", - "has_glowstone_particles", - "has_the_recipe" + "has_glowstone_particles" ] ], "rewards": { "recipes": [ "laboratoryblocks:enlighted_spruce_laboratory_floor" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_spruce_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_spruce_laboratory_tiles.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_spruce_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_spruce_laboratory_tiles.json index e2d6ef5..86521b7 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_spruce_laboratory_tiles.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_spruce_laboratory_tiles.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:glowstone_particles" - ] + "items": "laboratoryblocks:glowstone_particles" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:spruce_laboratory_tiles" - ] + "items": "laboratoryblocks:spruce_laboratory_tiles" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_spruce_laboratory_tiles", - "has_glowstone_particles", - "has_the_recipe" + "has_glowstone_particles" ] ], "rewards": { "recipes": [ "laboratoryblocks:enlighted_spruce_laboratory_tiles" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_tiled_pla_flooring.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_tiled_pla_flooring.json similarity index 72% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_tiled_pla_flooring.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_tiled_pla_flooring.json index 0d3900a..a8a3aab 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_tiled_pla_flooring.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_tiled_pla_flooring.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:glowstone_particles" - ] + "items": "laboratoryblocks:glowstone_particles" } ] }, @@ -23,9 +21,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:tiled_pla_flooring" - ] + "items": "laboratoryblocks:tiled_pla_flooring" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_tiled_pla_flooring", - "has_glowstone_particles", - "has_the_recipe" + "has_glowstone_particles" ] ], "rewards": { "recipes": [ "laboratoryblocks:enlighted_tiled_pla_flooring" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_warped_laboratory_floor.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_warped_laboratory_floor.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_warped_laboratory_floor.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_warped_laboratory_floor.json index cdac95f..92dd2bf 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_warped_laboratory_floor.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_warped_laboratory_floor.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:glowstone_particles" - ] + "items": "laboratoryblocks:glowstone_particles" } ] }, @@ -23,9 +21,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:warped_laboratory_floor" - ] + "items": "laboratoryblocks:warped_laboratory_floor" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_warped_laboratory_floor", - "has_glowstone_particles", - "has_the_recipe" + "has_glowstone_particles" ] ], "rewards": { "recipes": [ "laboratoryblocks:enlighted_warped_laboratory_floor" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_warped_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_warped_laboratory_tiles.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_warped_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_warped_laboratory_tiles.json index 93e8ed7..06dc3e6 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/enlighted_warped_laboratory_tiles.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_warped_laboratory_tiles.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:glowstone_particles" - ] + "items": "laboratoryblocks:glowstone_particles" } ] }, @@ -23,9 +21,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:warped_laboratory_tiles" - ] + "items": "laboratoryblocks:warped_laboratory_tiles" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_warped_laboratory_tiles", - "has_glowstone_particles", - "has_the_recipe" + "has_glowstone_particles" ] ], "rewards": { "recipes": [ "laboratoryblocks:enlighted_warped_laboratory_tiles" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/gray_laboratory_pillar.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/gray_laboratory_pillar.json similarity index 74% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/gray_laboratory_pillar.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/gray_laboratory_pillar.json index 768db63..feea56d 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/gray_laboratory_pillar.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/gray_laboratory_pillar.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:gray_dye" - ] + "items": "minecraft:gray_dye" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:laboratory_pillar" - ] + "items": "laboratoryblocks:laboratory_pillar" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_laboratory_pillar", - "has_gray_dye", - "has_the_recipe" + "has_gray_dye" ] ], "rewards": { "recipes": [ "laboratoryblocks:gray_laboratory_pillar" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/gray_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/gray_laboratory_tiles.json similarity index 74% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/gray_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/gray_laboratory_tiles.json index 94def8b..91cffc0 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/gray_laboratory_tiles.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/gray_laboratory_tiles.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:gray_dye" - ] + "items": "minecraft:gray_dye" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:laboratory_tiles" - ] + "items": "laboratoryblocks:laboratory_tiles" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_laboratory_tiles", - "has_gray_dye", - "has_the_recipe" + "has_gray_dye" ] ], "rewards": { "recipes": [ "laboratoryblocks:gray_laboratory_tiles" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/jungle_laboratory_floor.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/jungle_laboratory_floor.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/jungle_laboratory_floor.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/jungle_laboratory_floor.json index 5bac582..83311e4 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/jungle_laboratory_floor.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/jungle_laboratory_floor.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:jungle_planks" - ] + "items": "minecraft:jungle_planks" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:laboratory_block" - ] + "items": "laboratoryblocks:laboratory_block" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_laboratory_block", - "has_jungle_planks", - "has_the_recipe" + "has_jungle_planks" ] ], "rewards": { "recipes": [ "laboratoryblocks:jungle_laboratory_floor" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/jungle_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/jungle_laboratory_tiles.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/jungle_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/jungle_laboratory_tiles.json index 45c28cb..d1e50ad 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/jungle_laboratory_tiles.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/jungle_laboratory_tiles.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:jungle_laboratory_floor" - ] + "items": "laboratoryblocks:jungle_laboratory_floor" } ] }, @@ -22,14 +20,13 @@ }, "requirements": [ [ - "has_jungle_laboratory_floor", - "has_the_recipe" + "has_the_recipe", + "has_jungle_laboratory_floor" ] ], "rewards": { "recipes": [ "laboratoryblocks:jungle_laboratory_tiles" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/laboratory_block.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/laboratory_block.json similarity index 75% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/laboratory_block.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/laboratory_block.json index 2d6b05b..8e04f0c 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/laboratory_block.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/laboratory_block.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:quartz" - ] + "items": "minecraft:quartz" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:stone" - ] + "items": "minecraft:stone" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_stone", - "has_quartz", - "has_the_recipe" + "has_quartz" ] ], "rewards": { "recipes": [ "laboratoryblocks:laboratory_block" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/laboratory_bookshelf.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/laboratory_bookshelf.json similarity index 74% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/laboratory_bookshelf.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/laboratory_bookshelf.json index 8d72965..35d1815 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/laboratory_bookshelf.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/laboratory_bookshelf.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:book" - ] + "items": "minecraft:book" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:laboratory_block" - ] + "items": "laboratoryblocks:laboratory_block" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_laboratory_block", - "has_book", - "has_the_recipe" + "has_book" ] ], "rewards": { "recipes": [ "laboratoryblocks:laboratory_bookshelf" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/laboratory_fan.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/laboratory_fan.json similarity index 72% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/laboratory_fan.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/laboratory_fan.json index 76bdc57..d74d44c 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/laboratory_fan.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/laboratory_fan.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:iron_nugget" - ] + "items": "minecraft:iron_nugget" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:iron_screw" - ] + "items": "laboratoryblocks:iron_screw" } ] }, @@ -29,9 +25,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:laboratory_block" - ] + "items": "laboratoryblocks:laboratory_block" } ] }, @@ -46,16 +40,15 @@ }, "requirements": [ [ + "has_the_recipe", "has_laboratory_block", "has_iron_nugget", - "has_iron_screw", - "has_the_recipe" + "has_iron_screw" ] ], "rewards": { "recipes": [ "laboratoryblocks:laboratory_fan" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/laboratory_fan_redstone_controlled.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/laboratory_fan_redstone_controlled.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/laboratory_fan_redstone_controlled.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/laboratory_fan_redstone_controlled.json index a883abb..949924a 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/laboratory_fan_redstone_controlled.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/laboratory_fan_redstone_controlled.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:laboratory_fan" - ] + "items": "laboratoryblocks:laboratory_fan" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:redstone_particles" - ] + "items": "laboratoryblocks:redstone_particles" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_laboratory_fan", - "has_redstone_particles", - "has_the_recipe" + "has_redstone_particles" ] ], "rewards": { "recipes": [ "laboratoryblocks:laboratory_fan_redstone_controlled" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/laboratory_glass.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/laboratory_glass.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/laboratory_glass.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/laboratory_glass.json index 78f1bff..22b26b7 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/laboratory_glass.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/laboratory_glass.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:glass" - ] + "items": "minecraft:glass" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:laboratory_block" - ] + "items": "laboratoryblocks:laboratory_block" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_glass", - "has_laboratory_block", - "has_the_recipe" + "has_laboratory_block" ] ], "rewards": { "recipes": [ "laboratoryblocks:laboratory_glass" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/laboratory_pillar.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/laboratory_pillar.json similarity index 74% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/laboratory_pillar.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/laboratory_pillar.json index efc71fa..745e553 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/laboratory_pillar.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/laboratory_pillar.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:laboratory_block" - ] + "items": "laboratoryblocks:laboratory_block" } ] }, @@ -22,14 +20,13 @@ }, "requirements": [ [ - "has_laboratory_block", - "has_the_recipe" + "has_the_recipe", + "has_laboratory_block" ] ], "rewards": { "recipes": [ "laboratoryblocks:laboratory_pillar" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/laboratory_tiles.json similarity index 74% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/laboratory_tiles.json index 8a35837..b96948a 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/laboratory_tiles.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/laboratory_tiles.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:laboratory_block" - ] + "items": "laboratoryblocks:laboratory_block" } ] }, @@ -22,14 +20,13 @@ }, "requirements": [ [ - "has_laboratory_block", - "has_the_recipe" + "has_the_recipe", + "has_laboratory_block" ] ], "rewards": { "recipes": [ "laboratoryblocks:laboratory_tiles" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/laboratory_vent.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/laboratory_vent.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/laboratory_vent.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/laboratory_vent.json index 3ee2d52..cd41c68 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/laboratory_vent.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/laboratory_vent.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:iron_nugget" - ] + "items": "minecraft:iron_nugget" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:laboratory_block" - ] + "items": "laboratoryblocks:laboratory_block" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_laboratory_block", - "has_iron_nugget", - "has_the_recipe" + "has_iron_nugget" ] ], "rewards": { "recipes": [ "laboratoryblocks:laboratory_vent" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/laboratory_vent_connecting.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/laboratory_vent_connecting.json similarity index 74% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/laboratory_vent_connecting.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/laboratory_vent_connecting.json index 08b5149..cf54360 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/laboratory_vent_connecting.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/laboratory_vent_connecting.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:laboratory_vent" - ] + "items": "laboratoryblocks:laboratory_vent" } ] }, @@ -22,14 +20,13 @@ }, "requirements": [ [ - "has_laboratory_vent", - "has_the_recipe" + "has_the_recipe", + "has_laboratory_vent" ] ], "rewards": { "recipes": [ "laboratoryblocks:laboratory_vent_connecting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/left-faced_blue_signaling_laboratory_block.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/left-faced_blue_signaling_laboratory_block.json similarity index 71% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/left-faced_blue_signaling_laboratory_block.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/left-faced_blue_signaling_laboratory_block.json index 4166a04..3a48e46 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/left-faced_blue_signaling_laboratory_block.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/left-faced_blue_signaling_laboratory_block.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:left-faced_blue_signaling_laboratory_block" - ] + "items": "laboratoryblocks:left-faced_blue_signaling_laboratory_block" } ] }, @@ -22,14 +20,13 @@ }, "requirements": [ [ - "has_left-faced_blue_signaling_laboratory_block", - "has_the_recipe" + "has_the_recipe", + "has_left-faced_blue_signaling_laboratory_block" ] ], "rewards": { "recipes": [ "laboratoryblocks:left-faced_blue_signaling_laboratory_block" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/left-faced_green_signaling_laboratory_block.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/left-faced_green_signaling_laboratory_block.json similarity index 71% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/left-faced_green_signaling_laboratory_block.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/left-faced_green_signaling_laboratory_block.json index f84cc3b..23c3990 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/left-faced_green_signaling_laboratory_block.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/left-faced_green_signaling_laboratory_block.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:left-faced_green_signaling_laboratory_block" - ] + "items": "laboratoryblocks:left-faced_green_signaling_laboratory_block" } ] }, @@ -22,14 +20,13 @@ }, "requirements": [ [ - "has_left-faced_green_signaling_laboratory_block", - "has_the_recipe" + "has_the_recipe", + "has_left-faced_green_signaling_laboratory_block" ] ], "rewards": { "recipes": [ "laboratoryblocks:left-faced_green_signaling_laboratory_block" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/left-faced_red_signaling_laboratory_block.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/left-faced_red_signaling_laboratory_block.json similarity index 71% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/left-faced_red_signaling_laboratory_block.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/left-faced_red_signaling_laboratory_block.json index fbd8563..abb88f7 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/left-faced_red_signaling_laboratory_block.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/left-faced_red_signaling_laboratory_block.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:left-faced_red_signaling_laboratory_block" - ] + "items": "laboratoryblocks:left-faced_red_signaling_laboratory_block" } ] }, @@ -22,14 +20,13 @@ }, "requirements": [ [ - "has_left-faced_red_signaling_laboratory_block", - "has_the_recipe" + "has_the_recipe", + "has_left-faced_red_signaling_laboratory_block" ] ], "rewards": { "recipes": [ "laboratoryblocks:left-faced_red_signaling_laboratory_block" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/mangrove_laboratory_floor.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/mangrove_laboratory_floor.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/mangrove_laboratory_floor.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/mangrove_laboratory_floor.json index 67d6d50..99d50dc 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/mangrove_laboratory_floor.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/mangrove_laboratory_floor.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:laboratory_block" - ] + "items": "laboratoryblocks:laboratory_block" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:mangrove_planks" - ] + "items": "minecraft:mangrove_planks" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_laboratory_block", - "has_mangrove_planks", - "has_the_recipe" + "has_mangrove_planks" ] ], "rewards": { "recipes": [ "laboratoryblocks:mangrove_laboratory_floor" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/mangrove_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/mangrove_laboratory_tiles.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/mangrove_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/mangrove_laboratory_tiles.json index fb406ed..3f8caf9 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/mangrove_laboratory_tiles.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/mangrove_laboratory_tiles.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:mangrove_laboratory_floor" - ] + "items": "laboratoryblocks:mangrove_laboratory_floor" } ] }, @@ -22,14 +20,13 @@ }, "requirements": [ [ - "has_mangrove_laboratory_floor", - "has_the_recipe" + "has_the_recipe", + "has_mangrove_laboratory_floor" ] ], "rewards": { "recipes": [ "laboratoryblocks:mangrove_laboratory_tiles" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/mixed_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/mixed_laboratory_tiles.json similarity index 72% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/mixed_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/mixed_laboratory_tiles.json index acb9aa7..ca07c10 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/mixed_laboratory_tiles.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/mixed_laboratory_tiles.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:gray_laboratory_tiles" - ] + "items": "laboratoryblocks:gray_laboratory_tiles" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:laboratory_tiles" - ] + "items": "laboratoryblocks:laboratory_tiles" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_gray_laboratory_tiles", - "has_laboratory_tiles", - "has_the_recipe" + "has_laboratory_tiles" ] ], "rewards": { "recipes": [ "laboratoryblocks:mixed_laboratory_tiles" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/oak_laboratory_floor.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/oak_laboratory_floor.json similarity index 74% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/oak_laboratory_floor.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/oak_laboratory_floor.json index 3d6ef79..f53a5bc 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/oak_laboratory_floor.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/oak_laboratory_floor.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:laboratory_block" - ] + "items": "laboratoryblocks:laboratory_block" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:oak_planks" - ] + "items": "minecraft:oak_planks" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_laboratory_block", - "has_oak_planks", - "has_the_recipe" + "has_oak_planks" ] ], "rewards": { "recipes": [ "laboratoryblocks:oak_laboratory_floor" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/oak_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/oak_laboratory_tiles.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/oak_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/oak_laboratory_tiles.json index 132a180..39d33ab 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/oak_laboratory_tiles.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/oak_laboratory_tiles.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:oak_laboratory_floor" - ] + "items": "laboratoryblocks:oak_laboratory_floor" } ] }, @@ -22,14 +20,13 @@ }, "requirements": [ [ - "has_oak_laboratory_floor", - "has_the_recipe" + "has_the_recipe", + "has_oak_laboratory_floor" ] ], "rewards": { "recipes": [ "laboratoryblocks:oak_laboratory_tiles" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/pla_block.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/pla_block.json similarity index 74% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/pla_block.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/pla_block.json index 3fe9709..6e80366 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/pla_block.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/pla_block.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:pla_sheets" - ] + "items": "laboratoryblocks:pla_sheets" } ] }, @@ -22,14 +20,13 @@ }, "requirements": [ [ - "has_pla_sheets", - "has_the_recipe" + "has_the_recipe", + "has_pla_sheets" ] ], "rewards": { "recipes": [ "laboratoryblocks:pla_block" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/pla_flooring.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/pla_flooring.json similarity index 75% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/pla_flooring.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/pla_flooring.json index e0e8fc9..b1993f9 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/pla_flooring.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/pla_flooring.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:pla_block" - ] + "items": "laboratoryblocks:pla_block" } ] }, @@ -22,14 +20,13 @@ }, "requirements": [ [ - "has_pla_block", - "has_the_recipe" + "has_the_recipe", + "has_pla_block" ] ], "rewards": { "recipes": [ "laboratoryblocks:pla_flooring" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/pla_tiles.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/pla_tiles.json similarity index 74% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/pla_tiles.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/pla_tiles.json index 94e9b40..3610607 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/pla_tiles.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/pla_tiles.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:pla_block" - ] + "items": "laboratoryblocks:pla_block" } ] }, @@ -22,14 +20,13 @@ }, "requirements": [ [ - "has_pla_block", - "has_the_recipe" + "has_the_recipe", + "has_pla_block" ] ], "rewards": { "recipes": [ "laboratoryblocks:pla_tiles" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/right-faced_blue_signaling_laboratory_block.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/right-faced_blue_signaling_laboratory_block.json similarity index 78% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/right-faced_blue_signaling_laboratory_block.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/right-faced_blue_signaling_laboratory_block.json index e877ce7..0c75477 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/right-faced_blue_signaling_laboratory_block.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/right-faced_blue_signaling_laboratory_block.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:laboratory_block" - ] + "items": "laboratoryblocks:laboratory_block" } ] }, @@ -23,7 +21,7 @@ "conditions": { "items": [ { - "tag": "minecraft:wool" + "items": "#minecraft:wool" } ] }, @@ -32,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_laboratory_block", - "has_wool", - "has_the_recipe" + "has_wool" ] ], "rewards": { "recipes": [ "laboratoryblocks:right-faced_blue_signaling_laboratory_block" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/right-faced_green_signaling_laboratory_block.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/right-faced_green_signaling_laboratory_block.json similarity index 78% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/right-faced_green_signaling_laboratory_block.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/right-faced_green_signaling_laboratory_block.json index eb8829a..94894a2 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/right-faced_green_signaling_laboratory_block.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/right-faced_green_signaling_laboratory_block.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:laboratory_block" - ] + "items": "laboratoryblocks:laboratory_block" } ] }, @@ -23,7 +21,7 @@ "conditions": { "items": [ { - "tag": "minecraft:wool" + "items": "#minecraft:wool" } ] }, @@ -32,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_laboratory_block", - "has_wool", - "has_the_recipe" + "has_wool" ] ], "rewards": { "recipes": [ "laboratoryblocks:right-faced_green_signaling_laboratory_block" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/right-faced_red_signaling_laboratory_block.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/right-faced_red_signaling_laboratory_block.json similarity index 78% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/right-faced_red_signaling_laboratory_block.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/right-faced_red_signaling_laboratory_block.json index 5e8a6c5..70c86ba 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/right-faced_red_signaling_laboratory_block.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/right-faced_red_signaling_laboratory_block.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:laboratory_block" - ] + "items": "laboratoryblocks:laboratory_block" } ] }, @@ -23,7 +21,7 @@ "conditions": { "items": [ { - "tag": "minecraft:wool" + "items": "#minecraft:wool" } ] }, @@ -32,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_laboratory_block", - "has_wool", - "has_the_recipe" + "has_wool" ] ], "rewards": { "recipes": [ "laboratoryblocks:right-faced_red_signaling_laboratory_block" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/screwed_laboratory_block.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/screwed_laboratory_block.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/screwed_laboratory_block.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/screwed_laboratory_block.json index 59bd03b..0edf951 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/screwed_laboratory_block.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/screwed_laboratory_block.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:iron_screw" - ] + "items": "laboratoryblocks:iron_screw" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:laboratory_block" - ] + "items": "laboratoryblocks:laboratory_block" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_laboratory_block", - "has_iron_screw", - "has_the_recipe" + "has_iron_screw" ] ], "rewards": { "recipes": [ "laboratoryblocks:screwed_laboratory_block" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/spruce_laboratory_floor.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/spruce_laboratory_floor.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/spruce_laboratory_floor.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/spruce_laboratory_floor.json index e5225fa..79442bc 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/spruce_laboratory_floor.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/spruce_laboratory_floor.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:laboratory_block" - ] + "items": "laboratoryblocks:laboratory_block" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:spruce_planks" - ] + "items": "minecraft:spruce_planks" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_laboratory_block", - "has_spruce_planks", - "has_the_recipe" + "has_spruce_planks" ] ], "rewards": { "recipes": [ "laboratoryblocks:spruce_laboratory_floor" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/spruce_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/spruce_laboratory_tiles.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/spruce_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/spruce_laboratory_tiles.json index 2ccb07d..a947a53 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/spruce_laboratory_tiles.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/spruce_laboratory_tiles.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:spruce_laboratory_floor" - ] + "items": "laboratoryblocks:spruce_laboratory_floor" } ] }, @@ -22,14 +20,13 @@ }, "requirements": [ [ - "has_spruce_laboratory_floor", - "has_the_recipe" + "has_the_recipe", + "has_spruce_laboratory_floor" ] ], "rewards": { "recipes": [ "laboratoryblocks:spruce_laboratory_tiles" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/tiled_pla_flooring.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/tiled_pla_flooring.json similarity index 75% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/tiled_pla_flooring.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/tiled_pla_flooring.json index f0d94a9..80ff403 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/tiled_pla_flooring.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/tiled_pla_flooring.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:pla_tiles" - ] + "items": "laboratoryblocks:pla_tiles" } ] }, @@ -22,14 +20,13 @@ }, "requirements": [ [ - "has_pla_tiles", - "has_the_recipe" + "has_the_recipe", + "has_pla_tiles" ] ], "rewards": { "recipes": [ "laboratoryblocks:tiled_pla_flooring" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/warped_laboratory_floor.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/warped_laboratory_floor.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/warped_laboratory_floor.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/warped_laboratory_floor.json index 6b88d14..ec6d6ce 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/warped_laboratory_floor.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/warped_laboratory_floor.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:laboratory_block" - ] + "items": "laboratoryblocks:laboratory_block" } ] }, @@ -23,9 +21,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:warped_planks" - ] + "items": "minecraft:warped_planks" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_laboratory_block", - "has_warped_planks", - "has_the_recipe" + "has_warped_planks" ] ], "rewards": { "recipes": [ "laboratoryblocks:warped_laboratory_floor" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/warped_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/warped_laboratory_tiles.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/warped_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/warped_laboratory_tiles.json index afa87e1..cafcab8 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/building_blocks/warped_laboratory_tiles.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/warped_laboratory_tiles.json @@ -11,9 +11,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:warped_laboratory_floor" - ] + "items": "laboratoryblocks:warped_laboratory_floor" } ] }, @@ -22,14 +20,13 @@ }, "requirements": [ [ - "has_warped_laboratory_floor", - "has_the_recipe" + "has_the_recipe", + "has_warped_laboratory_floor" ] ], "rewards": { "recipes": [ "laboratoryblocks:warped_laboratory_tiles" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/misc/compressed_starch.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/misc/compressed_starch.json similarity index 75% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/misc/compressed_starch.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/misc/compressed_starch.json index 4a67ad9..725852d 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/misc/compressed_starch.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/misc/compressed_starch.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:starch" - ] + "items": "laboratoryblocks:starch" } ] }, @@ -22,14 +20,13 @@ }, "requirements": [ [ - "has_starch", - "has_the_recipe" + "has_the_recipe", + "has_starch" ] ], "rewards": { "recipes": [ "laboratoryblocks:compressed_starch" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/misc/configuration_tool.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/misc/configuration_tool.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/misc/configuration_tool.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/misc/configuration_tool.json index 906046c..e19c818 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/misc/configuration_tool.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/misc/configuration_tool.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:iron_ingot" - ] + "items": "minecraft:iron_ingot" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:iron_nugget" - ] + "items": "minecraft:iron_nugget" } ] }, @@ -29,9 +25,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:iron_screw" - ] + "items": "laboratoryblocks:iron_screw" } ] }, @@ -41,9 +35,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:orange_wool" - ] + "items": "minecraft:orange_wool" } ] }, @@ -58,17 +50,16 @@ }, "requirements": [ [ + "has_the_recipe", "has_iron_ingot", "has_orange_wool", "has_iron_screw", - "has_iron_nugget", - "has_the_recipe" + "has_iron_nugget" ] ], "rewards": { "recipes": [ "laboratoryblocks:configuration_tool" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/misc/glowstone_particles.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/misc/glowstone_particles.json similarity index 75% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/misc/glowstone_particles.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/misc/glowstone_particles.json index 44b20ba..b51f770 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/misc/glowstone_particles.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/misc/glowstone_particles.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:glowstone_dust" - ] + "items": "minecraft:glowstone_dust" } ] }, @@ -22,14 +20,13 @@ }, "requirements": [ [ - "has_glowstone_dust", - "has_the_recipe" + "has_the_recipe", + "has_glowstone_dust" ] ], "rewards": { "recipes": [ "laboratoryblocks:glowstone_particles" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/misc/iron_screw.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/misc/iron_screw.json similarity index 74% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/misc/iron_screw.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/misc/iron_screw.json index a94e9cd..775db37 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/misc/iron_screw.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/misc/iron_screw.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:iron_ingot" - ] + "items": "minecraft:iron_ingot" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:iron_nugget" - ] + "items": "minecraft:iron_nugget" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_iron_nugget", - "has_iron_ingot", - "has_the_recipe" + "has_iron_ingot" ] ], "rewards": { "recipes": [ "laboratoryblocks:iron_screw" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/misc/pla_sheets.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/misc/pla_sheets.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/misc/pla_sheets.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/misc/pla_sheets.json index 7b7ec6e..ba1576f 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/misc/pla_sheets.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/misc/pla_sheets.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:compressed_starch" - ] + "items": "laboratoryblocks:compressed_starch" } ] }, @@ -22,14 +20,13 @@ }, "requirements": [ [ - "has_compressed_starch", - "has_the_recipe" + "has_the_recipe", + "has_compressed_starch" ] ], "rewards": { "recipes": [ "laboratoryblocks:pla_sheets" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/misc/redstone_particles.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/misc/redstone_particles.json similarity index 76% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/misc/redstone_particles.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/misc/redstone_particles.json index 76717bc..516f23c 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/misc/redstone_particles.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/misc/redstone_particles.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:redstone" - ] + "items": "minecraft:redstone" } ] }, @@ -22,14 +20,13 @@ }, "requirements": [ [ - "has_redstone", - "has_the_recipe" + "has_the_recipe", + "has_redstone" ] ], "rewards": { "recipes": [ "laboratoryblocks:redstone_particles" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/advancements/recipes/misc/starch.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/misc/starch.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/advancements/recipes/misc/starch.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/misc/starch.json index 769216a..f45de0a 100644 --- a/src/generated/resources/data/laboratoryblocks/advancements/recipes/misc/starch.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/misc/starch.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:beetroot" - ] + "items": "minecraft:beetroot" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:sugar" - ] + "items": "minecraft:sugar" } ] }, @@ -29,9 +25,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:sugar_cane" - ] + "items": "minecraft:sugar_cane" } ] }, @@ -47,9 +41,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:wheat" - ] + "items": "minecraft:wheat" } ] }, @@ -58,17 +50,16 @@ }, "requirements": [ [ + "has_the_recipe", "has_sugar", "has_sugar_cane", "has_beetroot", - "has_wheat", - "has_the_recipe" + "has_wheat" ] ], "rewards": { "recipes": [ "laboratoryblocks:starch" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/acacia_laboratory_floor.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/acacia_laboratory_floor.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/acacia_laboratory_floor.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/acacia_laboratory_floor.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/acacia_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/acacia_laboratory_tiles.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/acacia_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/acacia_laboratory_tiles.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/bamboo_laboratory_floor.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/bamboo_laboratory_floor.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/bamboo_laboratory_floor.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/bamboo_laboratory_floor.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/bamboo_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/bamboo_laboratory_tiles.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/bamboo_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/bamboo_laboratory_tiles.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/birch_laboratory_floor.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/birch_laboratory_floor.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/birch_laboratory_floor.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/birch_laboratory_floor.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/birch_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/birch_laboratory_tiles.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/birch_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/birch_laboratory_tiles.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/cherry_laboratory_floor.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/cherry_laboratory_floor.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/cherry_laboratory_floor.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/cherry_laboratory_floor.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/cherry_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/cherry_laboratory_tiles.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/cherry_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/cherry_laboratory_tiles.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/clear_laboratory_screen.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/clear_laboratory_screen.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/clear_laboratory_screen.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/clear_laboratory_screen.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/crimson_laboratory_floor.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/crimson_laboratory_floor.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/crimson_laboratory_floor.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/crimson_laboratory_floor.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/crimson_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/crimson_laboratory_tiles.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/crimson_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/crimson_laboratory_tiles.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/dark_oak_laboratory_floor.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/dark_oak_laboratory_floor.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/dark_oak_laboratory_floor.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/dark_oak_laboratory_floor.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/dark_oak_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/dark_oak_laboratory_tiles.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/dark_oak_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/dark_oak_laboratory_tiles.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_acacia_laboratory_floor.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_acacia_laboratory_floor.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_acacia_laboratory_floor.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_acacia_laboratory_floor.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_acacia_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_acacia_laboratory_tiles.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_acacia_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_acacia_laboratory_tiles.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_bamboo_laboratory_floor.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_bamboo_laboratory_floor.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_bamboo_laboratory_floor.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_bamboo_laboratory_floor.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_bamboo_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_bamboo_laboratory_tiles.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_bamboo_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_bamboo_laboratory_tiles.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_birch_laboratory_floor.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_birch_laboratory_floor.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_birch_laboratory_floor.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_birch_laboratory_floor.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_birch_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_birch_laboratory_tiles.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_birch_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_birch_laboratory_tiles.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_cherry_laboratory_floor.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_cherry_laboratory_floor.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_cherry_laboratory_floor.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_cherry_laboratory_floor.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_cherry_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_cherry_laboratory_tiles.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_cherry_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_cherry_laboratory_tiles.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_clear_laboratory_screen.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_clear_laboratory_screen.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_clear_laboratory_screen.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_clear_laboratory_screen.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_crimson_laboratory_floor.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_crimson_laboratory_floor.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_crimson_laboratory_floor.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_crimson_laboratory_floor.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_crimson_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_crimson_laboratory_tiles.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_crimson_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_crimson_laboratory_tiles.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_dark_oak_laboratory_floor.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_dark_oak_laboratory_floor.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_dark_oak_laboratory_floor.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_dark_oak_laboratory_floor.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_dark_oak_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_dark_oak_laboratory_tiles.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_dark_oak_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_dark_oak_laboratory_tiles.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_gray_laboratory_pillar.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_gray_laboratory_pillar.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_gray_laboratory_pillar.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_gray_laboratory_pillar.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_gray_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_gray_laboratory_tiles.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_gray_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_gray_laboratory_tiles.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_jungle_laboratory_floor.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_jungle_laboratory_floor.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_jungle_laboratory_floor.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_jungle_laboratory_floor.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_jungle_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_jungle_laboratory_tiles.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_jungle_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_jungle_laboratory_tiles.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_laboratory_block.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_laboratory_block.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_laboratory_block.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_laboratory_block.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_laboratory_bookshelf.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_laboratory_bookshelf.json similarity index 76% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_laboratory_bookshelf.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_laboratory_bookshelf.json index d6ce7fd..f621a7d 100644 --- a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_laboratory_bookshelf.json +++ b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_laboratory_bookshelf.json @@ -13,14 +13,16 @@ { "condition": "minecraft:match_tool", "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } } - } - ] + ] + } } } ], diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_laboratory_fan.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_laboratory_fan.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_laboratory_fan.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_laboratory_fan.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_laboratory_fan_redstone_controlled.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_laboratory_fan_redstone_controlled.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_laboratory_fan_redstone_controlled.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_laboratory_fan_redstone_controlled.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_laboratory_glass.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_laboratory_glass.json similarity index 76% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_laboratory_glass.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_laboratory_glass.json index 880fbb1..49ed2d1 100644 --- a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_laboratory_glass.json +++ b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_laboratory_glass.json @@ -13,14 +13,16 @@ { "condition": "minecraft:match_tool", "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } } - } - ] + ] + } } } ], diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_laboratory_pillar.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_laboratory_pillar.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_laboratory_pillar.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_laboratory_pillar.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_laboratory_tiles.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_laboratory_tiles.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_laboratory_vent.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_laboratory_vent.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_laboratory_vent.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_laboratory_vent.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_laboratory_vent_connecting.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_laboratory_vent_connecting.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_laboratory_vent_connecting.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_laboratory_vent_connecting.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_left-faced_blue_signaling_laboratory_block.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_left-faced_blue_signaling_laboratory_block.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_left-faced_blue_signaling_laboratory_block.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_left-faced_blue_signaling_laboratory_block.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_left-faced_green_signaling_laboratory_block.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_left-faced_green_signaling_laboratory_block.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_left-faced_green_signaling_laboratory_block.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_left-faced_green_signaling_laboratory_block.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_left-faced_red_signaling_laboratory_block.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_left-faced_red_signaling_laboratory_block.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_left-faced_red_signaling_laboratory_block.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_left-faced_red_signaling_laboratory_block.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_mangrove_laboratory_floor.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_mangrove_laboratory_floor.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_mangrove_laboratory_floor.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_mangrove_laboratory_floor.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_mangrove_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_mangrove_laboratory_tiles.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_mangrove_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_mangrove_laboratory_tiles.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_mixed_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_mixed_laboratory_tiles.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_mixed_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_mixed_laboratory_tiles.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_oak_laboratory_floor.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_oak_laboratory_floor.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_oak_laboratory_floor.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_oak_laboratory_floor.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_oak_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_oak_laboratory_tiles.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_oak_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_oak_laboratory_tiles.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_pla_block.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_pla_block.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_pla_block.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_pla_block.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_pla_flooring.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_pla_flooring.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_pla_flooring.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_pla_flooring.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_pla_tiles.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_pla_tiles.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_pla_tiles.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_pla_tiles.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_right-faced_blue_signaling_laboratory_block.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_right-faced_blue_signaling_laboratory_block.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_right-faced_blue_signaling_laboratory_block.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_right-faced_blue_signaling_laboratory_block.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_right-faced_green_signaling_laboratory_block.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_right-faced_green_signaling_laboratory_block.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_right-faced_green_signaling_laboratory_block.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_right-faced_green_signaling_laboratory_block.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_right-faced_red_signaling_laboratory_block.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_right-faced_red_signaling_laboratory_block.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_right-faced_red_signaling_laboratory_block.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_right-faced_red_signaling_laboratory_block.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_screwed_laboratory_block.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_screwed_laboratory_block.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_screwed_laboratory_block.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_screwed_laboratory_block.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_spruce_laboratory_floor.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_spruce_laboratory_floor.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_spruce_laboratory_floor.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_spruce_laboratory_floor.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_spruce_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_spruce_laboratory_tiles.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_spruce_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_spruce_laboratory_tiles.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_tiled_pla_flooring.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_tiled_pla_flooring.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_tiled_pla_flooring.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_tiled_pla_flooring.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_warped_laboratory_floor.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_warped_laboratory_floor.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_warped_laboratory_floor.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_warped_laboratory_floor.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_warped_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_warped_laboratory_tiles.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/enlighted_warped_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/enlighted_warped_laboratory_tiles.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/gray_laboratory_pillar.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/gray_laboratory_pillar.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/gray_laboratory_pillar.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/gray_laboratory_pillar.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/gray_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/gray_laboratory_tiles.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/gray_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/gray_laboratory_tiles.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/jungle_laboratory_floor.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/jungle_laboratory_floor.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/jungle_laboratory_floor.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/jungle_laboratory_floor.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/jungle_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/jungle_laboratory_tiles.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/jungle_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/jungle_laboratory_tiles.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/laboratory_block.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/laboratory_block.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/laboratory_block.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/laboratory_block.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/laboratory_bookshelf.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/laboratory_bookshelf.json similarity index 76% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/laboratory_bookshelf.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/laboratory_bookshelf.json index 6857f51..ec573b1 100644 --- a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/laboratory_bookshelf.json +++ b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/laboratory_bookshelf.json @@ -13,14 +13,16 @@ { "condition": "minecraft:match_tool", "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } } - } - ] + ] + } } } ], diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/laboratory_fan.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/laboratory_fan.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/laboratory_fan.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/laboratory_fan.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/laboratory_fan_redstone_controlled.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/laboratory_fan_redstone_controlled.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/laboratory_fan_redstone_controlled.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/laboratory_fan_redstone_controlled.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/laboratory_glass.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/laboratory_glass.json similarity index 64% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/laboratory_glass.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/laboratory_glass.json index 12992b1..447a3d5 100644 --- a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/laboratory_glass.json +++ b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/laboratory_glass.json @@ -7,14 +7,16 @@ { "condition": "minecraft:match_tool", "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } } - } - ] + ] + } } } ], diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/laboratory_pillar.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/laboratory_pillar.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/laboratory_pillar.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/laboratory_pillar.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/laboratory_tiles.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/laboratory_tiles.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/laboratory_vent.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/laboratory_vent.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/laboratory_vent.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/laboratory_vent.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/laboratory_vent_connecting.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/laboratory_vent_connecting.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/laboratory_vent_connecting.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/laboratory_vent_connecting.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/left-faced_blue_signaling_laboratory_block.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/left-faced_blue_signaling_laboratory_block.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/left-faced_blue_signaling_laboratory_block.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/left-faced_blue_signaling_laboratory_block.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/left-faced_green_signaling_laboratory_block.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/left-faced_green_signaling_laboratory_block.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/left-faced_green_signaling_laboratory_block.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/left-faced_green_signaling_laboratory_block.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/left-faced_red_signaling_laboratory_block.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/left-faced_red_signaling_laboratory_block.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/left-faced_red_signaling_laboratory_block.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/left-faced_red_signaling_laboratory_block.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/mangrove_laboratory_floor.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/mangrove_laboratory_floor.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/mangrove_laboratory_floor.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/mangrove_laboratory_floor.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/mangrove_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/mangrove_laboratory_tiles.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/mangrove_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/mangrove_laboratory_tiles.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/mixed_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/mixed_laboratory_tiles.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/mixed_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/mixed_laboratory_tiles.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/oak_laboratory_floor.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/oak_laboratory_floor.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/oak_laboratory_floor.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/oak_laboratory_floor.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/oak_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/oak_laboratory_tiles.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/oak_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/oak_laboratory_tiles.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/pla_block.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/pla_block.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/pla_block.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/pla_block.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/pla_flooring.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/pla_flooring.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/pla_flooring.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/pla_flooring.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/pla_tiles.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/pla_tiles.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/pla_tiles.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/pla_tiles.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/right-faced_blue_signaling_laboratory_block.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/right-faced_blue_signaling_laboratory_block.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/right-faced_blue_signaling_laboratory_block.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/right-faced_blue_signaling_laboratory_block.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/right-faced_green_signaling_laboratory_block.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/right-faced_green_signaling_laboratory_block.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/right-faced_green_signaling_laboratory_block.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/right-faced_green_signaling_laboratory_block.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/right-faced_red_signaling_laboratory_block.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/right-faced_red_signaling_laboratory_block.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/right-faced_red_signaling_laboratory_block.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/right-faced_red_signaling_laboratory_block.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/screwed_laboratory_block.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/screwed_laboratory_block.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/screwed_laboratory_block.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/screwed_laboratory_block.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/spruce_laboratory_floor.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/spruce_laboratory_floor.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/spruce_laboratory_floor.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/spruce_laboratory_floor.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/spruce_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/spruce_laboratory_tiles.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/spruce_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/spruce_laboratory_tiles.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/tiled_pla_flooring.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/tiled_pla_flooring.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/tiled_pla_flooring.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/tiled_pla_flooring.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/warped_laboratory_floor.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/warped_laboratory_floor.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/warped_laboratory_floor.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/warped_laboratory_floor.json diff --git a/src/generated/resources/data/laboratoryblocks/loot_tables/blocks/warped_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/loot_table/blocks/warped_laboratory_tiles.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/loot_tables/blocks/warped_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/loot_table/blocks/warped_laboratory_tiles.json diff --git a/src/generated/resources/data/laboratoryblocks/recipes/acacia_laboratory_floor.json b/src/generated/resources/data/laboratoryblocks/recipe/acacia_laboratory_floor.json similarity index 76% rename from src/generated/resources/data/laboratoryblocks/recipes/acacia_laboratory_floor.json rename to src/generated/resources/data/laboratoryblocks/recipe/acacia_laboratory_floor.json index 0cff29b..ff35fd5 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/acacia_laboratory_floor.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/acacia_laboratory_floor.json @@ -16,7 +16,6 @@ ], "result": { "count": 8, - "item": "laboratoryblocks:acacia_laboratory_floor" - }, - "show_notification": true + "id": "laboratoryblocks:acacia_laboratory_floor" + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/acacia_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/recipe/acacia_laboratory_tiles.json similarity index 72% rename from src/generated/resources/data/laboratoryblocks/recipes/acacia_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/recipe/acacia_laboratory_tiles.json index 3a1185a..2c80677 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/acacia_laboratory_tiles.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/acacia_laboratory_tiles.json @@ -12,7 +12,6 @@ ], "result": { "count": 8, - "item": "laboratoryblocks:acacia_laboratory_tiles" - }, - "show_notification": true + "id": "laboratoryblocks:acacia_laboratory_tiles" + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/bamboo_laboratory_floor.json b/src/generated/resources/data/laboratoryblocks/recipe/bamboo_laboratory_floor.json similarity index 76% rename from src/generated/resources/data/laboratoryblocks/recipes/bamboo_laboratory_floor.json rename to src/generated/resources/data/laboratoryblocks/recipe/bamboo_laboratory_floor.json index 1e7ecff..167d433 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/bamboo_laboratory_floor.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/bamboo_laboratory_floor.json @@ -16,7 +16,6 @@ ], "result": { "count": 8, - "item": "laboratoryblocks:bamboo_laboratory_floor" - }, - "show_notification": true + "id": "laboratoryblocks:bamboo_laboratory_floor" + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/bamboo_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/recipe/bamboo_laboratory_tiles.json similarity index 72% rename from src/generated/resources/data/laboratoryblocks/recipes/bamboo_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/recipe/bamboo_laboratory_tiles.json index 84cd7c6..af876ca 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/bamboo_laboratory_tiles.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/bamboo_laboratory_tiles.json @@ -12,7 +12,6 @@ ], "result": { "count": 8, - "item": "laboratoryblocks:bamboo_laboratory_tiles" - }, - "show_notification": true + "id": "laboratoryblocks:bamboo_laboratory_tiles" + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/birch_laboratory_floor.json b/src/generated/resources/data/laboratoryblocks/recipe/birch_laboratory_floor.json similarity index 76% rename from src/generated/resources/data/laboratoryblocks/recipes/birch_laboratory_floor.json rename to src/generated/resources/data/laboratoryblocks/recipe/birch_laboratory_floor.json index 385440a..a867e2d 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/birch_laboratory_floor.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/birch_laboratory_floor.json @@ -16,7 +16,6 @@ ], "result": { "count": 8, - "item": "laboratoryblocks:birch_laboratory_floor" - }, - "show_notification": true + "id": "laboratoryblocks:birch_laboratory_floor" + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/birch_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/recipe/birch_laboratory_tiles.json similarity index 72% rename from src/generated/resources/data/laboratoryblocks/recipes/birch_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/recipe/birch_laboratory_tiles.json index 2d0c265..e04c9e4 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/birch_laboratory_tiles.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/birch_laboratory_tiles.json @@ -12,7 +12,6 @@ ], "result": { "count": 8, - "item": "laboratoryblocks:birch_laboratory_tiles" - }, - "show_notification": true + "id": "laboratoryblocks:birch_laboratory_tiles" + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/cherry_laboratory_floor.json b/src/generated/resources/data/laboratoryblocks/recipe/cherry_laboratory_floor.json similarity index 76% rename from src/generated/resources/data/laboratoryblocks/recipes/cherry_laboratory_floor.json rename to src/generated/resources/data/laboratoryblocks/recipe/cherry_laboratory_floor.json index b2eeb6a..af540c7 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/cherry_laboratory_floor.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/cherry_laboratory_floor.json @@ -16,7 +16,6 @@ ], "result": { "count": 8, - "item": "laboratoryblocks:cherry_laboratory_floor" - }, - "show_notification": true + "id": "laboratoryblocks:cherry_laboratory_floor" + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/cherry_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/recipe/cherry_laboratory_tiles.json similarity index 72% rename from src/generated/resources/data/laboratoryblocks/recipes/cherry_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/recipe/cherry_laboratory_tiles.json index cfc0cae..8d13a51 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/cherry_laboratory_tiles.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/cherry_laboratory_tiles.json @@ -12,7 +12,6 @@ ], "result": { "count": 8, - "item": "laboratoryblocks:cherry_laboratory_tiles" - }, - "show_notification": true + "id": "laboratoryblocks:cherry_laboratory_tiles" + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/chiseled_laboratory_bookshelf.json b/src/generated/resources/data/laboratoryblocks/recipe/chiseled_laboratory_bookshelf.json similarity index 69% rename from src/generated/resources/data/laboratoryblocks/recipes/chiseled_laboratory_bookshelf.json rename to src/generated/resources/data/laboratoryblocks/recipe/chiseled_laboratory_bookshelf.json index 821e236..9d3f3a9 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/chiseled_laboratory_bookshelf.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/chiseled_laboratory_bookshelf.json @@ -12,7 +12,7 @@ "AAA" ], "result": { - "item": "laboratoryblocks:chiseled_laboratory_bookshelf" - }, - "show_notification": true + "count": 1, + "id": "laboratoryblocks:chiseled_laboratory_bookshelf" + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/clear_laboratory_screen.json b/src/generated/resources/data/laboratoryblocks/recipe/clear_laboratory_screen.json similarity index 80% rename from src/generated/resources/data/laboratoryblocks/recipes/clear_laboratory_screen.json rename to src/generated/resources/data/laboratoryblocks/recipe/clear_laboratory_screen.json index f618737..9d29f59 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/clear_laboratory_screen.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/clear_laboratory_screen.json @@ -19,7 +19,6 @@ ], "result": { "count": 4, - "item": "laboratoryblocks:clear_laboratory_screen" - }, - "show_notification": true + "id": "laboratoryblocks:clear_laboratory_screen" + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/compressed_starch.json b/src/generated/resources/data/laboratoryblocks/recipe/compressed_starch.json similarity index 69% rename from src/generated/resources/data/laboratoryblocks/recipes/compressed_starch.json rename to src/generated/resources/data/laboratoryblocks/recipe/compressed_starch.json index 291e319..e52bd1f 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/compressed_starch.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/compressed_starch.json @@ -11,7 +11,7 @@ "AA" ], "result": { - "item": "laboratoryblocks:compressed_starch" - }, - "show_notification": true + "count": 1, + "id": "laboratoryblocks:compressed_starch" + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/configuration_tool.json b/src/generated/resources/data/laboratoryblocks/recipe/configuration_tool.json similarity index 81% rename from src/generated/resources/data/laboratoryblocks/recipes/configuration_tool.json rename to src/generated/resources/data/laboratoryblocks/recipe/configuration_tool.json index d01bb83..c4a2557 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/configuration_tool.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/configuration_tool.json @@ -21,7 +21,7 @@ "AD " ], "result": { - "item": "laboratoryblocks:configuration_tool" - }, - "show_notification": true + "count": 1, + "id": "laboratoryblocks:configuration_tool" + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/crimson_laboratory_floor.json b/src/generated/resources/data/laboratoryblocks/recipe/crimson_laboratory_floor.json similarity index 76% rename from src/generated/resources/data/laboratoryblocks/recipes/crimson_laboratory_floor.json rename to src/generated/resources/data/laboratoryblocks/recipe/crimson_laboratory_floor.json index 4720aad..616d25a 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/crimson_laboratory_floor.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/crimson_laboratory_floor.json @@ -16,7 +16,6 @@ ], "result": { "count": 8, - "item": "laboratoryblocks:crimson_laboratory_floor" - }, - "show_notification": true + "id": "laboratoryblocks:crimson_laboratory_floor" + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/crimson_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/recipe/crimson_laboratory_tiles.json similarity index 71% rename from src/generated/resources/data/laboratoryblocks/recipes/crimson_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/recipe/crimson_laboratory_tiles.json index 7b8f22c..d19060a 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/crimson_laboratory_tiles.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/crimson_laboratory_tiles.json @@ -12,7 +12,6 @@ ], "result": { "count": 8, - "item": "laboratoryblocks:crimson_laboratory_tiles" - }, - "show_notification": true + "id": "laboratoryblocks:crimson_laboratory_tiles" + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/dark_oak_laboratory_floor.json b/src/generated/resources/data/laboratoryblocks/recipe/dark_oak_laboratory_floor.json similarity index 76% rename from src/generated/resources/data/laboratoryblocks/recipes/dark_oak_laboratory_floor.json rename to src/generated/resources/data/laboratoryblocks/recipe/dark_oak_laboratory_floor.json index c7512ac..6af139d 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/dark_oak_laboratory_floor.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/dark_oak_laboratory_floor.json @@ -16,7 +16,6 @@ ], "result": { "count": 8, - "item": "laboratoryblocks:dark_oak_laboratory_floor" - }, - "show_notification": true + "id": "laboratoryblocks:dark_oak_laboratory_floor" + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/dark_oak_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/recipe/dark_oak_laboratory_tiles.json similarity index 71% rename from src/generated/resources/data/laboratoryblocks/recipes/dark_oak_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/recipe/dark_oak_laboratory_tiles.json index ae10ac3..269a188 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/dark_oak_laboratory_tiles.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/dark_oak_laboratory_tiles.json @@ -12,7 +12,6 @@ ], "result": { "count": 8, - "item": "laboratoryblocks:dark_oak_laboratory_tiles" - }, - "show_notification": true + "id": "laboratoryblocks:dark_oak_laboratory_tiles" + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_acacia_laboratory_floor.json b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_acacia_laboratory_floor.json similarity index 75% rename from src/generated/resources/data/laboratoryblocks/recipes/enlighted_acacia_laboratory_floor.json rename to src/generated/resources/data/laboratoryblocks/recipe/enlighted_acacia_laboratory_floor.json index 59ebc7a..f835884 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_acacia_laboratory_floor.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_acacia_laboratory_floor.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "laboratoryblocks:enlighted_acacia_laboratory_floor" + "count": 1, + "id": "laboratoryblocks:enlighted_acacia_laboratory_floor" } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_acacia_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_acacia_laboratory_tiles.json similarity index 75% rename from src/generated/resources/data/laboratoryblocks/recipes/enlighted_acacia_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/recipe/enlighted_acacia_laboratory_tiles.json index 1aef0a4..786bb18 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_acacia_laboratory_tiles.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_acacia_laboratory_tiles.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "laboratoryblocks:enlighted_acacia_laboratory_tiles" + "count": 1, + "id": "laboratoryblocks:enlighted_acacia_laboratory_tiles" } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_bamboo_laboratory_floor.json b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_bamboo_laboratory_floor.json similarity index 75% rename from src/generated/resources/data/laboratoryblocks/recipes/enlighted_bamboo_laboratory_floor.json rename to src/generated/resources/data/laboratoryblocks/recipe/enlighted_bamboo_laboratory_floor.json index 9b0a973..da2fad9 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_bamboo_laboratory_floor.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_bamboo_laboratory_floor.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "laboratoryblocks:enlighted_bamboo_laboratory_floor" + "count": 1, + "id": "laboratoryblocks:enlighted_bamboo_laboratory_floor" } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_bamboo_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_bamboo_laboratory_tiles.json similarity index 75% rename from src/generated/resources/data/laboratoryblocks/recipes/enlighted_bamboo_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/recipe/enlighted_bamboo_laboratory_tiles.json index 5e03c3c..f991809 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_bamboo_laboratory_tiles.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_bamboo_laboratory_tiles.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "laboratoryblocks:enlighted_bamboo_laboratory_tiles" + "count": 1, + "id": "laboratoryblocks:enlighted_bamboo_laboratory_tiles" } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_birch_laboratory_floor.json b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_birch_laboratory_floor.json similarity index 76% rename from src/generated/resources/data/laboratoryblocks/recipes/enlighted_birch_laboratory_floor.json rename to src/generated/resources/data/laboratoryblocks/recipe/enlighted_birch_laboratory_floor.json index 503a433..8ad6595 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_birch_laboratory_floor.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_birch_laboratory_floor.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "laboratoryblocks:enlighted_birch_laboratory_floor" + "count": 1, + "id": "laboratoryblocks:enlighted_birch_laboratory_floor" } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_birch_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_birch_laboratory_tiles.json similarity index 76% rename from src/generated/resources/data/laboratoryblocks/recipes/enlighted_birch_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/recipe/enlighted_birch_laboratory_tiles.json index e2fdf93..63668ac 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_birch_laboratory_tiles.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_birch_laboratory_tiles.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "laboratoryblocks:enlighted_birch_laboratory_tiles" + "count": 1, + "id": "laboratoryblocks:enlighted_birch_laboratory_tiles" } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_cherry_laboratory_floor.json b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_cherry_laboratory_floor.json similarity index 75% rename from src/generated/resources/data/laboratoryblocks/recipes/enlighted_cherry_laboratory_floor.json rename to src/generated/resources/data/laboratoryblocks/recipe/enlighted_cherry_laboratory_floor.json index 7296130..dc26552 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_cherry_laboratory_floor.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_cherry_laboratory_floor.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "laboratoryblocks:enlighted_cherry_laboratory_floor" + "count": 1, + "id": "laboratoryblocks:enlighted_cherry_laboratory_floor" } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_cherry_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_cherry_laboratory_tiles.json similarity index 75% rename from src/generated/resources/data/laboratoryblocks/recipes/enlighted_cherry_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/recipe/enlighted_cherry_laboratory_tiles.json index a32054e..39265bc 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_cherry_laboratory_tiles.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_cherry_laboratory_tiles.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "laboratoryblocks:enlighted_cherry_laboratory_tiles" + "count": 1, + "id": "laboratoryblocks:enlighted_cherry_laboratory_tiles" } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_chiseled_laboratory_bookshelf.json b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_chiseled_laboratory_bookshelf.json similarity index 74% rename from src/generated/resources/data/laboratoryblocks/recipes/enlighted_chiseled_laboratory_bookshelf.json rename to src/generated/resources/data/laboratoryblocks/recipe/enlighted_chiseled_laboratory_bookshelf.json index 3239275..32ee981 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_chiseled_laboratory_bookshelf.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_chiseled_laboratory_bookshelf.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "laboratoryblocks:enlighted_chiseled_laboratory_bookshelf" + "count": 1, + "id": "laboratoryblocks:enlighted_chiseled_laboratory_bookshelf" } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_clear_laboratory_screen.json b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_clear_laboratory_screen.json similarity index 75% rename from src/generated/resources/data/laboratoryblocks/recipes/enlighted_clear_laboratory_screen.json rename to src/generated/resources/data/laboratoryblocks/recipe/enlighted_clear_laboratory_screen.json index 612dbb1..523551e 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_clear_laboratory_screen.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_clear_laboratory_screen.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "laboratoryblocks:enlighted_clear_laboratory_screen" + "count": 1, + "id": "laboratoryblocks:enlighted_clear_laboratory_screen" } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_crimson_laboratory_floor.json b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_crimson_laboratory_floor.json similarity index 75% rename from src/generated/resources/data/laboratoryblocks/recipes/enlighted_crimson_laboratory_floor.json rename to src/generated/resources/data/laboratoryblocks/recipe/enlighted_crimson_laboratory_floor.json index 658628f..f929eba 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_crimson_laboratory_floor.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_crimson_laboratory_floor.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "laboratoryblocks:enlighted_crimson_laboratory_floor" + "count": 1, + "id": "laboratoryblocks:enlighted_crimson_laboratory_floor" } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_crimson_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_crimson_laboratory_tiles.json similarity index 75% rename from src/generated/resources/data/laboratoryblocks/recipes/enlighted_crimson_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/recipe/enlighted_crimson_laboratory_tiles.json index 322c1f5..22db17c 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_crimson_laboratory_tiles.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_crimson_laboratory_tiles.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "laboratoryblocks:enlighted_crimson_laboratory_tiles" + "count": 1, + "id": "laboratoryblocks:enlighted_crimson_laboratory_tiles" } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_dark_oak_laboratory_floor.json b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_dark_oak_laboratory_floor.json similarity index 75% rename from src/generated/resources/data/laboratoryblocks/recipes/enlighted_dark_oak_laboratory_floor.json rename to src/generated/resources/data/laboratoryblocks/recipe/enlighted_dark_oak_laboratory_floor.json index a7134b3..9ee5bbe 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_dark_oak_laboratory_floor.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_dark_oak_laboratory_floor.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "laboratoryblocks:enlighted_dark_oak_laboratory_floor" + "count": 1, + "id": "laboratoryblocks:enlighted_dark_oak_laboratory_floor" } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_dark_oak_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_dark_oak_laboratory_tiles.json similarity index 75% rename from src/generated/resources/data/laboratoryblocks/recipes/enlighted_dark_oak_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/recipe/enlighted_dark_oak_laboratory_tiles.json index f55a986..89198a3 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_dark_oak_laboratory_tiles.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_dark_oak_laboratory_tiles.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "laboratoryblocks:enlighted_dark_oak_laboratory_tiles" + "count": 1, + "id": "laboratoryblocks:enlighted_dark_oak_laboratory_tiles" } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_gray_laboratory_pillar.json b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_gray_laboratory_pillar.json similarity index 76% rename from src/generated/resources/data/laboratoryblocks/recipes/enlighted_gray_laboratory_pillar.json rename to src/generated/resources/data/laboratoryblocks/recipe/enlighted_gray_laboratory_pillar.json index fc011e6..f991c11 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_gray_laboratory_pillar.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_gray_laboratory_pillar.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "laboratoryblocks:enlighted_gray_laboratory_pillar" + "count": 1, + "id": "laboratoryblocks:enlighted_gray_laboratory_pillar" } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_gray_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_gray_laboratory_tiles.json similarity index 76% rename from src/generated/resources/data/laboratoryblocks/recipes/enlighted_gray_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/recipe/enlighted_gray_laboratory_tiles.json index bba3c65..0d17788 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_gray_laboratory_tiles.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_gray_laboratory_tiles.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "laboratoryblocks:enlighted_gray_laboratory_tiles" + "count": 1, + "id": "laboratoryblocks:enlighted_gray_laboratory_tiles" } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_jungle_laboratory_floor.json b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_jungle_laboratory_floor.json similarity index 75% rename from src/generated/resources/data/laboratoryblocks/recipes/enlighted_jungle_laboratory_floor.json rename to src/generated/resources/data/laboratoryblocks/recipe/enlighted_jungle_laboratory_floor.json index 0559170..164082c 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_jungle_laboratory_floor.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_jungle_laboratory_floor.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "laboratoryblocks:enlighted_jungle_laboratory_floor" + "count": 1, + "id": "laboratoryblocks:enlighted_jungle_laboratory_floor" } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_jungle_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_jungle_laboratory_tiles.json similarity index 75% rename from src/generated/resources/data/laboratoryblocks/recipes/enlighted_jungle_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/recipe/enlighted_jungle_laboratory_tiles.json index d3aa809..0400003 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_jungle_laboratory_tiles.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_jungle_laboratory_tiles.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "laboratoryblocks:enlighted_jungle_laboratory_tiles" + "count": 1, + "id": "laboratoryblocks:enlighted_jungle_laboratory_tiles" } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_laboratory_block.json b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_laboratory_block.json similarity index 76% rename from src/generated/resources/data/laboratoryblocks/recipes/enlighted_laboratory_block.json rename to src/generated/resources/data/laboratoryblocks/recipe/enlighted_laboratory_block.json index 4c29acf..247059b 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_laboratory_block.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_laboratory_block.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "laboratoryblocks:enlighted_laboratory_block" + "count": 1, + "id": "laboratoryblocks:enlighted_laboratory_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_laboratory_bookshelf.json b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_laboratory_bookshelf.json similarity index 76% rename from src/generated/resources/data/laboratoryblocks/recipes/enlighted_laboratory_bookshelf.json rename to src/generated/resources/data/laboratoryblocks/recipe/enlighted_laboratory_bookshelf.json index f53b4a3..da49363 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_laboratory_bookshelf.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_laboratory_bookshelf.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "laboratoryblocks:enlighted_laboratory_bookshelf" + "count": 1, + "id": "laboratoryblocks:enlighted_laboratory_bookshelf" } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_laboratory_fan.json b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_laboratory_fan.json similarity index 77% rename from src/generated/resources/data/laboratoryblocks/recipes/enlighted_laboratory_fan.json rename to src/generated/resources/data/laboratoryblocks/recipe/enlighted_laboratory_fan.json index 51c6181..789d313 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_laboratory_fan.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_laboratory_fan.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "laboratoryblocks:enlighted_laboratory_fan" + "count": 1, + "id": "laboratoryblocks:enlighted_laboratory_fan" } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_laboratory_fan_redstone_controlled.json b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_laboratory_fan_redstone_controlled.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/recipes/enlighted_laboratory_fan_redstone_controlled.json rename to src/generated/resources/data/laboratoryblocks/recipe/enlighted_laboratory_fan_redstone_controlled.json index f5d5888..fde9dd7 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_laboratory_fan_redstone_controlled.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_laboratory_fan_redstone_controlled.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "laboratoryblocks:enlighted_laboratory_fan_redstone_controlled" + "count": 1, + "id": "laboratoryblocks:enlighted_laboratory_fan_redstone_controlled" } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_laboratory_glass.json b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_laboratory_glass.json similarity index 76% rename from src/generated/resources/data/laboratoryblocks/recipes/enlighted_laboratory_glass.json rename to src/generated/resources/data/laboratoryblocks/recipe/enlighted_laboratory_glass.json index a1ab9b0..c298344 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_laboratory_glass.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_laboratory_glass.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "laboratoryblocks:enlighted_laboratory_glass" + "count": 1, + "id": "laboratoryblocks:enlighted_laboratory_glass" } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_laboratory_pillar.json b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_laboratory_pillar.json similarity index 76% rename from src/generated/resources/data/laboratoryblocks/recipes/enlighted_laboratory_pillar.json rename to src/generated/resources/data/laboratoryblocks/recipe/enlighted_laboratory_pillar.json index a8c48ae..71e6ba7 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_laboratory_pillar.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_laboratory_pillar.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "laboratoryblocks:enlighted_laboratory_pillar" + "count": 1, + "id": "laboratoryblocks:enlighted_laboratory_pillar" } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_laboratory_tiles.json similarity index 76% rename from src/generated/resources/data/laboratoryblocks/recipes/enlighted_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/recipe/enlighted_laboratory_tiles.json index f3de557..8016e0d 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_laboratory_tiles.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_laboratory_tiles.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "laboratoryblocks:enlighted_laboratory_tiles" + "count": 1, + "id": "laboratoryblocks:enlighted_laboratory_tiles" } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_laboratory_vent.json b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_laboratory_vent.json similarity index 77% rename from src/generated/resources/data/laboratoryblocks/recipes/enlighted_laboratory_vent.json rename to src/generated/resources/data/laboratoryblocks/recipe/enlighted_laboratory_vent.json index 8d5c2a2..f660604 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_laboratory_vent.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_laboratory_vent.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "laboratoryblocks:enlighted_laboratory_vent" + "count": 1, + "id": "laboratoryblocks:enlighted_laboratory_vent" } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_laboratory_vent_connecting.json b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_laboratory_vent_connecting.json similarity index 70% rename from src/generated/resources/data/laboratoryblocks/recipes/enlighted_laboratory_vent_connecting.json rename to src/generated/resources/data/laboratoryblocks/recipe/enlighted_laboratory_vent_connecting.json index 8205465..c1a0c2b 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_laboratory_vent_connecting.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_laboratory_vent_connecting.json @@ -7,6 +7,7 @@ } ], "result": { - "item": "laboratoryblocks:enlighted_laboratory_vent_connecting" + "count": 1, + "id": "laboratoryblocks:enlighted_laboratory_vent_connecting" } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_left-faced_blue_signaling_laboratory_block.json b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_left-faced_blue_signaling_laboratory_block.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/recipes/enlighted_left-faced_blue_signaling_laboratory_block.json rename to src/generated/resources/data/laboratoryblocks/recipe/enlighted_left-faced_blue_signaling_laboratory_block.json index 423dec8..65014c1 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_left-faced_blue_signaling_laboratory_block.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_left-faced_blue_signaling_laboratory_block.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "laboratoryblocks:enlighted_left-faced_blue_signaling_laboratory_block" + "count": 1, + "id": "laboratoryblocks:enlighted_left-faced_blue_signaling_laboratory_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_left-faced_green_signaling_laboratory_block.json b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_left-faced_green_signaling_laboratory_block.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/recipes/enlighted_left-faced_green_signaling_laboratory_block.json rename to src/generated/resources/data/laboratoryblocks/recipe/enlighted_left-faced_green_signaling_laboratory_block.json index c746400..a46d8ea 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_left-faced_green_signaling_laboratory_block.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_left-faced_green_signaling_laboratory_block.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "laboratoryblocks:enlighted_left-faced_green_signaling_laboratory_block" + "count": 1, + "id": "laboratoryblocks:enlighted_left-faced_green_signaling_laboratory_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_left-faced_red_signaling_laboratory_block.json b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_left-faced_red_signaling_laboratory_block.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/recipes/enlighted_left-faced_red_signaling_laboratory_block.json rename to src/generated/resources/data/laboratoryblocks/recipe/enlighted_left-faced_red_signaling_laboratory_block.json index 77d4a6c..6100414 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_left-faced_red_signaling_laboratory_block.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_left-faced_red_signaling_laboratory_block.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "laboratoryblocks:enlighted_left-faced_red_signaling_laboratory_block" + "count": 1, + "id": "laboratoryblocks:enlighted_left-faced_red_signaling_laboratory_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_mangrove_laboratory_floor.json b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_mangrove_laboratory_floor.json similarity index 75% rename from src/generated/resources/data/laboratoryblocks/recipes/enlighted_mangrove_laboratory_floor.json rename to src/generated/resources/data/laboratoryblocks/recipe/enlighted_mangrove_laboratory_floor.json index 5c83dd1..58e41e9 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_mangrove_laboratory_floor.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_mangrove_laboratory_floor.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "laboratoryblocks:enlighted_mangrove_laboratory_floor" + "count": 1, + "id": "laboratoryblocks:enlighted_mangrove_laboratory_floor" } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_mangrove_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_mangrove_laboratory_tiles.json similarity index 75% rename from src/generated/resources/data/laboratoryblocks/recipes/enlighted_mangrove_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/recipe/enlighted_mangrove_laboratory_tiles.json index b107b37..d723810 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_mangrove_laboratory_tiles.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_mangrove_laboratory_tiles.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "laboratoryblocks:enlighted_mangrove_laboratory_tiles" + "count": 1, + "id": "laboratoryblocks:enlighted_mangrove_laboratory_tiles" } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_mixed_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_mixed_laboratory_tiles.json similarity index 76% rename from src/generated/resources/data/laboratoryblocks/recipes/enlighted_mixed_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/recipe/enlighted_mixed_laboratory_tiles.json index d0690f8..1e01d7b 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_mixed_laboratory_tiles.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_mixed_laboratory_tiles.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "laboratoryblocks:enlighted_mixed_laboratory_tiles" + "count": 1, + "id": "laboratoryblocks:enlighted_mixed_laboratory_tiles" } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_oak_laboratory_floor.json b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_oak_laboratory_floor.json similarity index 76% rename from src/generated/resources/data/laboratoryblocks/recipes/enlighted_oak_laboratory_floor.json rename to src/generated/resources/data/laboratoryblocks/recipe/enlighted_oak_laboratory_floor.json index 1f64e28..59050db 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_oak_laboratory_floor.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_oak_laboratory_floor.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "laboratoryblocks:enlighted_oak_laboratory_floor" + "count": 1, + "id": "laboratoryblocks:enlighted_oak_laboratory_floor" } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_oak_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_oak_laboratory_tiles.json similarity index 76% rename from src/generated/resources/data/laboratoryblocks/recipes/enlighted_oak_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/recipe/enlighted_oak_laboratory_tiles.json index 268b6b3..dffa3ab 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_oak_laboratory_tiles.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_oak_laboratory_tiles.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "laboratoryblocks:enlighted_oak_laboratory_tiles" + "count": 1, + "id": "laboratoryblocks:enlighted_oak_laboratory_tiles" } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_pla_block.json b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_pla_block.json similarity index 78% rename from src/generated/resources/data/laboratoryblocks/recipes/enlighted_pla_block.json rename to src/generated/resources/data/laboratoryblocks/recipe/enlighted_pla_block.json index b554316..6e10c7e 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_pla_block.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_pla_block.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "laboratoryblocks:enlighted_pla_block" + "count": 1, + "id": "laboratoryblocks:enlighted_pla_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_pla_flooring.json b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_pla_flooring.json similarity index 77% rename from src/generated/resources/data/laboratoryblocks/recipes/enlighted_pla_flooring.json rename to src/generated/resources/data/laboratoryblocks/recipe/enlighted_pla_flooring.json index 2541f1d..1e92315 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_pla_flooring.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_pla_flooring.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "laboratoryblocks:enlighted_pla_flooring" + "count": 1, + "id": "laboratoryblocks:enlighted_pla_flooring" } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_pla_tiles.json b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_pla_tiles.json similarity index 78% rename from src/generated/resources/data/laboratoryblocks/recipes/enlighted_pla_tiles.json rename to src/generated/resources/data/laboratoryblocks/recipe/enlighted_pla_tiles.json index c4c2577..a8a0f0d 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_pla_tiles.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_pla_tiles.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "laboratoryblocks:enlighted_pla_tiles" + "count": 1, + "id": "laboratoryblocks:enlighted_pla_tiles" } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_right-faced_blue_signaling_laboratory_block.json b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_right-faced_blue_signaling_laboratory_block.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/recipes/enlighted_right-faced_blue_signaling_laboratory_block.json rename to src/generated/resources/data/laboratoryblocks/recipe/enlighted_right-faced_blue_signaling_laboratory_block.json index 0e4b547..e989192 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_right-faced_blue_signaling_laboratory_block.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_right-faced_blue_signaling_laboratory_block.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "laboratoryblocks:enlighted_right-faced_blue_signaling_laboratory_block" + "count": 1, + "id": "laboratoryblocks:enlighted_right-faced_blue_signaling_laboratory_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_right-faced_green_signaling_laboratory_block.json b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_right-faced_green_signaling_laboratory_block.json similarity index 72% rename from src/generated/resources/data/laboratoryblocks/recipes/enlighted_right-faced_green_signaling_laboratory_block.json rename to src/generated/resources/data/laboratoryblocks/recipe/enlighted_right-faced_green_signaling_laboratory_block.json index 81fb229..b4be3ed 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_right-faced_green_signaling_laboratory_block.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_right-faced_green_signaling_laboratory_block.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "laboratoryblocks:enlighted_right-faced_green_signaling_laboratory_block" + "count": 1, + "id": "laboratoryblocks:enlighted_right-faced_green_signaling_laboratory_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_right-faced_red_signaling_laboratory_block.json b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_right-faced_red_signaling_laboratory_block.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/recipes/enlighted_right-faced_red_signaling_laboratory_block.json rename to src/generated/resources/data/laboratoryblocks/recipe/enlighted_right-faced_red_signaling_laboratory_block.json index cbae29e..57bfd43 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_right-faced_red_signaling_laboratory_block.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_right-faced_red_signaling_laboratory_block.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "laboratoryblocks:enlighted_right-faced_red_signaling_laboratory_block" + "count": 1, + "id": "laboratoryblocks:enlighted_right-faced_red_signaling_laboratory_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_screwed_laboratory_block.json b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_screwed_laboratory_block.json similarity index 75% rename from src/generated/resources/data/laboratoryblocks/recipes/enlighted_screwed_laboratory_block.json rename to src/generated/resources/data/laboratoryblocks/recipe/enlighted_screwed_laboratory_block.json index 75a72c1..3954f6e 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_screwed_laboratory_block.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_screwed_laboratory_block.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "laboratoryblocks:enlighted_screwed_laboratory_block" + "count": 1, + "id": "laboratoryblocks:enlighted_screwed_laboratory_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_spruce_laboratory_floor.json b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_spruce_laboratory_floor.json similarity index 75% rename from src/generated/resources/data/laboratoryblocks/recipes/enlighted_spruce_laboratory_floor.json rename to src/generated/resources/data/laboratoryblocks/recipe/enlighted_spruce_laboratory_floor.json index 139acaf..9863886 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_spruce_laboratory_floor.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_spruce_laboratory_floor.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "laboratoryblocks:enlighted_spruce_laboratory_floor" + "count": 1, + "id": "laboratoryblocks:enlighted_spruce_laboratory_floor" } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_spruce_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_spruce_laboratory_tiles.json similarity index 75% rename from src/generated/resources/data/laboratoryblocks/recipes/enlighted_spruce_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/recipe/enlighted_spruce_laboratory_tiles.json index a139e7a..fddc39f 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_spruce_laboratory_tiles.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_spruce_laboratory_tiles.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "laboratoryblocks:enlighted_spruce_laboratory_tiles" + "count": 1, + "id": "laboratoryblocks:enlighted_spruce_laboratory_tiles" } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_tiled_pla_flooring.json b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_tiled_pla_flooring.json similarity index 76% rename from src/generated/resources/data/laboratoryblocks/recipes/enlighted_tiled_pla_flooring.json rename to src/generated/resources/data/laboratoryblocks/recipe/enlighted_tiled_pla_flooring.json index 1aca33c..034371a 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_tiled_pla_flooring.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_tiled_pla_flooring.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "laboratoryblocks:enlighted_tiled_pla_flooring" + "count": 1, + "id": "laboratoryblocks:enlighted_tiled_pla_flooring" } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_warped_laboratory_floor.json b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_warped_laboratory_floor.json similarity index 75% rename from src/generated/resources/data/laboratoryblocks/recipes/enlighted_warped_laboratory_floor.json rename to src/generated/resources/data/laboratoryblocks/recipe/enlighted_warped_laboratory_floor.json index dff7b65..c701973 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_warped_laboratory_floor.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_warped_laboratory_floor.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "laboratoryblocks:enlighted_warped_laboratory_floor" + "count": 1, + "id": "laboratoryblocks:enlighted_warped_laboratory_floor" } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_warped_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_warped_laboratory_tiles.json similarity index 75% rename from src/generated/resources/data/laboratoryblocks/recipes/enlighted_warped_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/recipe/enlighted_warped_laboratory_tiles.json index 3f2e03d..19eafff 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_warped_laboratory_tiles.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_warped_laboratory_tiles.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "laboratoryblocks:enlighted_warped_laboratory_tiles" + "count": 1, + "id": "laboratoryblocks:enlighted_warped_laboratory_tiles" } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/glowstone_particles.json b/src/generated/resources/data/laboratoryblocks/recipe/glowstone_particles.json similarity index 77% rename from src/generated/resources/data/laboratoryblocks/recipes/glowstone_particles.json rename to src/generated/resources/data/laboratoryblocks/recipe/glowstone_particles.json index 1ef4031..c94d619 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/glowstone_particles.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/glowstone_particles.json @@ -8,6 +8,6 @@ ], "result": { "count": 8, - "item": "laboratoryblocks:glowstone_particles" + "id": "laboratoryblocks:glowstone_particles" } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/gray_laboratory_pillar.json b/src/generated/resources/data/laboratoryblocks/recipe/gray_laboratory_pillar.json similarity index 76% rename from src/generated/resources/data/laboratoryblocks/recipes/gray_laboratory_pillar.json rename to src/generated/resources/data/laboratoryblocks/recipe/gray_laboratory_pillar.json index a7d8571..6d4a780 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/gray_laboratory_pillar.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/gray_laboratory_pillar.json @@ -16,7 +16,6 @@ ], "result": { "count": 8, - "item": "laboratoryblocks:gray_laboratory_pillar" - }, - "show_notification": true + "id": "laboratoryblocks:gray_laboratory_pillar" + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/gray_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/recipe/gray_laboratory_tiles.json similarity index 76% rename from src/generated/resources/data/laboratoryblocks/recipes/gray_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/recipe/gray_laboratory_tiles.json index f650a46..c385329 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/gray_laboratory_tiles.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/gray_laboratory_tiles.json @@ -16,7 +16,6 @@ ], "result": { "count": 8, - "item": "laboratoryblocks:gray_laboratory_tiles" - }, - "show_notification": true + "id": "laboratoryblocks:gray_laboratory_tiles" + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/iron_screw.json b/src/generated/resources/data/laboratoryblocks/recipe/iron_screw.json similarity index 77% rename from src/generated/resources/data/laboratoryblocks/recipes/iron_screw.json rename to src/generated/resources/data/laboratoryblocks/recipe/iron_screw.json index 7c17bad..ab57865 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/iron_screw.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/iron_screw.json @@ -15,7 +15,6 @@ ], "result": { "count": 16, - "item": "laboratoryblocks:iron_screw" - }, - "show_notification": true + "id": "laboratoryblocks:iron_screw" + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/jungle_laboratory_floor.json b/src/generated/resources/data/laboratoryblocks/recipe/jungle_laboratory_floor.json similarity index 76% rename from src/generated/resources/data/laboratoryblocks/recipes/jungle_laboratory_floor.json rename to src/generated/resources/data/laboratoryblocks/recipe/jungle_laboratory_floor.json index d6ac76f..3f06159 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/jungle_laboratory_floor.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/jungle_laboratory_floor.json @@ -16,7 +16,6 @@ ], "result": { "count": 8, - "item": "laboratoryblocks:jungle_laboratory_floor" - }, - "show_notification": true + "id": "laboratoryblocks:jungle_laboratory_floor" + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/jungle_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/recipe/jungle_laboratory_tiles.json similarity index 72% rename from src/generated/resources/data/laboratoryblocks/recipes/jungle_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/recipe/jungle_laboratory_tiles.json index 6bc299a..ab86119 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/jungle_laboratory_tiles.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/jungle_laboratory_tiles.json @@ -12,7 +12,6 @@ ], "result": { "count": 8, - "item": "laboratoryblocks:jungle_laboratory_tiles" - }, - "show_notification": true + "id": "laboratoryblocks:jungle_laboratory_tiles" + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/laboratory_block.json b/src/generated/resources/data/laboratoryblocks/recipe/laboratory_block.json similarity index 76% rename from src/generated/resources/data/laboratoryblocks/recipes/laboratory_block.json rename to src/generated/resources/data/laboratoryblocks/recipe/laboratory_block.json index c63b438..16ec620 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/laboratory_block.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/laboratory_block.json @@ -16,7 +16,6 @@ ], "result": { "count": 8, - "item": "laboratoryblocks:laboratory_block" - }, - "show_notification": true + "id": "laboratoryblocks:laboratory_block" + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/laboratory_bookshelf.json b/src/generated/resources/data/laboratoryblocks/recipe/laboratory_bookshelf.json similarity index 75% rename from src/generated/resources/data/laboratoryblocks/recipes/laboratory_bookshelf.json rename to src/generated/resources/data/laboratoryblocks/recipe/laboratory_bookshelf.json index 1bfceda..02244ac 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/laboratory_bookshelf.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/laboratory_bookshelf.json @@ -15,7 +15,7 @@ "AAA" ], "result": { - "item": "laboratoryblocks:laboratory_bookshelf" - }, - "show_notification": true + "count": 1, + "id": "laboratoryblocks:laboratory_bookshelf" + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/laboratory_fan.json b/src/generated/resources/data/laboratoryblocks/recipe/laboratory_fan.json similarity index 80% rename from src/generated/resources/data/laboratoryblocks/recipes/laboratory_fan.json rename to src/generated/resources/data/laboratoryblocks/recipe/laboratory_fan.json index 7913197..0c816f7 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/laboratory_fan.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/laboratory_fan.json @@ -18,7 +18,7 @@ "ABA" ], "result": { - "item": "laboratoryblocks:laboratory_fan" - }, - "show_notification": true + "count": 1, + "id": "laboratoryblocks:laboratory_fan" + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/laboratory_fan_redstone_controlled.json b/src/generated/resources/data/laboratoryblocks/recipe/laboratory_fan_redstone_controlled.json similarity index 74% rename from src/generated/resources/data/laboratoryblocks/recipes/laboratory_fan_redstone_controlled.json rename to src/generated/resources/data/laboratoryblocks/recipe/laboratory_fan_redstone_controlled.json index 6a7fecc..65b2428 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/laboratory_fan_redstone_controlled.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/laboratory_fan_redstone_controlled.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "laboratoryblocks:laboratory_fan_redstone_controlled" + "count": 1, + "id": "laboratoryblocks:laboratory_fan_redstone_controlled" } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/laboratory_glass.json b/src/generated/resources/data/laboratoryblocks/recipe/laboratory_glass.json similarity index 77% rename from src/generated/resources/data/laboratoryblocks/recipes/laboratory_glass.json rename to src/generated/resources/data/laboratoryblocks/recipe/laboratory_glass.json index edc8bea..6f6a5da 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/laboratory_glass.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/laboratory_glass.json @@ -16,7 +16,6 @@ ], "result": { "count": 8, - "item": "laboratoryblocks:laboratory_glass" - }, - "show_notification": true + "id": "laboratoryblocks:laboratory_glass" + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/laboratory_pillar.json b/src/generated/resources/data/laboratoryblocks/recipe/laboratory_pillar.json similarity index 72% rename from src/generated/resources/data/laboratoryblocks/recipes/laboratory_pillar.json rename to src/generated/resources/data/laboratoryblocks/recipe/laboratory_pillar.json index e52b7d4..3abf1bd 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/laboratory_pillar.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/laboratory_pillar.json @@ -12,7 +12,6 @@ ], "result": { "count": 2, - "item": "laboratoryblocks:laboratory_pillar" - }, - "show_notification": true + "id": "laboratoryblocks:laboratory_pillar" + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/recipe/laboratory_tiles.json similarity index 73% rename from src/generated/resources/data/laboratoryblocks/recipes/laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/recipe/laboratory_tiles.json index 56b6e2a..4a29b5f 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/laboratory_tiles.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/laboratory_tiles.json @@ -12,7 +12,6 @@ ], "result": { "count": 8, - "item": "laboratoryblocks:laboratory_tiles" - }, - "show_notification": true + "id": "laboratoryblocks:laboratory_tiles" + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/laboratory_vent.json b/src/generated/resources/data/laboratoryblocks/recipe/laboratory_vent.json similarity index 77% rename from src/generated/resources/data/laboratoryblocks/recipes/laboratory_vent.json rename to src/generated/resources/data/laboratoryblocks/recipe/laboratory_vent.json index e115f1d..776dac8 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/laboratory_vent.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/laboratory_vent.json @@ -15,7 +15,7 @@ " B " ], "result": { - "item": "laboratoryblocks:laboratory_vent" - }, - "show_notification": true + "count": 1, + "id": "laboratoryblocks:laboratory_vent" + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/laboratory_vent_connecting.json b/src/generated/resources/data/laboratoryblocks/recipe/laboratory_vent_connecting.json similarity index 70% rename from src/generated/resources/data/laboratoryblocks/recipes/laboratory_vent_connecting.json rename to src/generated/resources/data/laboratoryblocks/recipe/laboratory_vent_connecting.json index e630b97..16ebc28 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/laboratory_vent_connecting.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/laboratory_vent_connecting.json @@ -7,6 +7,7 @@ } ], "result": { - "item": "laboratoryblocks:laboratory_vent_connecting" + "count": 1, + "id": "laboratoryblocks:laboratory_vent_connecting" } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/left-faced_blue_signaling_laboratory_block.json b/src/generated/resources/data/laboratoryblocks/recipe/left-faced_blue_signaling_laboratory_block.json similarity index 69% rename from src/generated/resources/data/laboratoryblocks/recipes/left-faced_blue_signaling_laboratory_block.json rename to src/generated/resources/data/laboratoryblocks/recipe/left-faced_blue_signaling_laboratory_block.json index 0344b6d..c32eb44 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/left-faced_blue_signaling_laboratory_block.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/left-faced_blue_signaling_laboratory_block.json @@ -7,6 +7,7 @@ } ], "result": { - "item": "laboratoryblocks:left-faced_blue_signaling_laboratory_block" + "count": 1, + "id": "laboratoryblocks:left-faced_blue_signaling_laboratory_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/left-faced_green_signaling_laboratory_block.json b/src/generated/resources/data/laboratoryblocks/recipe/left-faced_green_signaling_laboratory_block.json similarity index 69% rename from src/generated/resources/data/laboratoryblocks/recipes/left-faced_green_signaling_laboratory_block.json rename to src/generated/resources/data/laboratoryblocks/recipe/left-faced_green_signaling_laboratory_block.json index 37a8f4f..e4a9309 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/left-faced_green_signaling_laboratory_block.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/left-faced_green_signaling_laboratory_block.json @@ -7,6 +7,7 @@ } ], "result": { - "item": "laboratoryblocks:left-faced_green_signaling_laboratory_block" + "count": 1, + "id": "laboratoryblocks:left-faced_green_signaling_laboratory_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/left-faced_red_signaling_laboratory_block.json b/src/generated/resources/data/laboratoryblocks/recipe/left-faced_red_signaling_laboratory_block.json similarity index 69% rename from src/generated/resources/data/laboratoryblocks/recipes/left-faced_red_signaling_laboratory_block.json rename to src/generated/resources/data/laboratoryblocks/recipe/left-faced_red_signaling_laboratory_block.json index e9d96bc..d403786 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/left-faced_red_signaling_laboratory_block.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/left-faced_red_signaling_laboratory_block.json @@ -7,6 +7,7 @@ } ], "result": { - "item": "laboratoryblocks:left-faced_red_signaling_laboratory_block" + "count": 1, + "id": "laboratoryblocks:left-faced_red_signaling_laboratory_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/mangrove_laboratory_floor.json b/src/generated/resources/data/laboratoryblocks/recipe/mangrove_laboratory_floor.json similarity index 76% rename from src/generated/resources/data/laboratoryblocks/recipes/mangrove_laboratory_floor.json rename to src/generated/resources/data/laboratoryblocks/recipe/mangrove_laboratory_floor.json index c9817da..f2276dc 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/mangrove_laboratory_floor.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/mangrove_laboratory_floor.json @@ -16,7 +16,6 @@ ], "result": { "count": 8, - "item": "laboratoryblocks:mangrove_laboratory_floor" - }, - "show_notification": true + "id": "laboratoryblocks:mangrove_laboratory_floor" + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/mangrove_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/recipe/mangrove_laboratory_tiles.json similarity index 71% rename from src/generated/resources/data/laboratoryblocks/recipes/mangrove_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/recipe/mangrove_laboratory_tiles.json index 2813dd5..4c2bbea 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/mangrove_laboratory_tiles.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/mangrove_laboratory_tiles.json @@ -12,7 +12,6 @@ ], "result": { "count": 8, - "item": "laboratoryblocks:mangrove_laboratory_tiles" - }, - "show_notification": true + "id": "laboratoryblocks:mangrove_laboratory_tiles" + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/mixed_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/recipe/mixed_laboratory_tiles.json similarity index 82% rename from src/generated/resources/data/laboratoryblocks/recipes/mixed_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/recipe/mixed_laboratory_tiles.json index 04e2209..485d121 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/mixed_laboratory_tiles.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/mixed_laboratory_tiles.json @@ -11,6 +11,6 @@ ], "result": { "count": 2, - "item": "laboratoryblocks:mixed_laboratory_tiles" + "id": "laboratoryblocks:mixed_laboratory_tiles" } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/oak_laboratory_floor.json b/src/generated/resources/data/laboratoryblocks/recipe/oak_laboratory_floor.json similarity index 77% rename from src/generated/resources/data/laboratoryblocks/recipes/oak_laboratory_floor.json rename to src/generated/resources/data/laboratoryblocks/recipe/oak_laboratory_floor.json index 0e396fd..dfd18ee 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/oak_laboratory_floor.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/oak_laboratory_floor.json @@ -16,7 +16,6 @@ ], "result": { "count": 8, - "item": "laboratoryblocks:oak_laboratory_floor" - }, - "show_notification": true + "id": "laboratoryblocks:oak_laboratory_floor" + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/oak_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/recipe/oak_laboratory_tiles.json similarity index 72% rename from src/generated/resources/data/laboratoryblocks/recipes/oak_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/recipe/oak_laboratory_tiles.json index 80f879e..f5cf47a 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/oak_laboratory_tiles.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/oak_laboratory_tiles.json @@ -12,7 +12,6 @@ ], "result": { "count": 8, - "item": "laboratoryblocks:oak_laboratory_tiles" - }, - "show_notification": true + "id": "laboratoryblocks:oak_laboratory_tiles" + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/pla_block.json b/src/generated/resources/data/laboratoryblocks/recipe/pla_block.json similarity index 72% rename from src/generated/resources/data/laboratoryblocks/recipes/pla_block.json rename to src/generated/resources/data/laboratoryblocks/recipe/pla_block.json index be41919..bb68d77 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/pla_block.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/pla_block.json @@ -11,7 +11,7 @@ "AA" ], "result": { - "item": "laboratoryblocks:pla_block" - }, - "show_notification": true + "count": 1, + "id": "laboratoryblocks:pla_block" + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/pla_flooring.json b/src/generated/resources/data/laboratoryblocks/recipe/pla_flooring.json similarity index 72% rename from src/generated/resources/data/laboratoryblocks/recipes/pla_flooring.json rename to src/generated/resources/data/laboratoryblocks/recipe/pla_flooring.json index 1a21bc6..ff72662 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/pla_flooring.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/pla_flooring.json @@ -11,7 +11,6 @@ ], "result": { "count": 3, - "item": "laboratoryblocks:pla_flooring" - }, - "show_notification": true + "id": "laboratoryblocks:pla_flooring" + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/pla_sheets.json b/src/generated/resources/data/laboratoryblocks/recipe/pla_sheets.json similarity index 70% rename from src/generated/resources/data/laboratoryblocks/recipes/pla_sheets.json rename to src/generated/resources/data/laboratoryblocks/recipe/pla_sheets.json index fc711d6..5b389d2 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/pla_sheets.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/pla_sheets.json @@ -6,5 +6,8 @@ "ingredient": { "item": "laboratoryblocks:compressed_starch" }, - "result": "laboratoryblocks:pla_sheets" + "result": { + "count": 1, + "id": "laboratoryblocks:pla_sheets" + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/pla_tiles.json b/src/generated/resources/data/laboratoryblocks/recipe/pla_tiles.json similarity index 74% rename from src/generated/resources/data/laboratoryblocks/recipes/pla_tiles.json rename to src/generated/resources/data/laboratoryblocks/recipe/pla_tiles.json index b399d59..68facc2 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/pla_tiles.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/pla_tiles.json @@ -12,7 +12,6 @@ ], "result": { "count": 8, - "item": "laboratoryblocks:pla_tiles" - }, - "show_notification": true + "id": "laboratoryblocks:pla_tiles" + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/redstone_particles.json b/src/generated/resources/data/laboratoryblocks/recipe/redstone_particles.json similarity index 77% rename from src/generated/resources/data/laboratoryblocks/recipes/redstone_particles.json rename to src/generated/resources/data/laboratoryblocks/recipe/redstone_particles.json index 895da8a..8ec4ee7 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/redstone_particles.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/redstone_particles.json @@ -8,6 +8,6 @@ ], "result": { "count": 8, - "item": "laboratoryblocks:redstone_particles" + "id": "laboratoryblocks:redstone_particles" } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/right-faced_blue_signaling_laboratory_block.json b/src/generated/resources/data/laboratoryblocks/recipe/right-faced_blue_signaling_laboratory_block.json similarity index 76% rename from src/generated/resources/data/laboratoryblocks/recipes/right-faced_blue_signaling_laboratory_block.json rename to src/generated/resources/data/laboratoryblocks/recipe/right-faced_blue_signaling_laboratory_block.json index 4740cb9..bbe99cf 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/right-faced_blue_signaling_laboratory_block.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/right-faced_blue_signaling_laboratory_block.json @@ -19,7 +19,6 @@ ], "result": { "count": 8, - "item": "laboratoryblocks:right-faced_blue_signaling_laboratory_block" - }, - "show_notification": true + "id": "laboratoryblocks:right-faced_blue_signaling_laboratory_block" + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/right-faced_green_signaling_laboratory_block.json b/src/generated/resources/data/laboratoryblocks/recipe/right-faced_green_signaling_laboratory_block.json similarity index 75% rename from src/generated/resources/data/laboratoryblocks/recipes/right-faced_green_signaling_laboratory_block.json rename to src/generated/resources/data/laboratoryblocks/recipe/right-faced_green_signaling_laboratory_block.json index 16e60a7..8c11656 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/right-faced_green_signaling_laboratory_block.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/right-faced_green_signaling_laboratory_block.json @@ -19,7 +19,6 @@ ], "result": { "count": 8, - "item": "laboratoryblocks:right-faced_green_signaling_laboratory_block" - }, - "show_notification": true + "id": "laboratoryblocks:right-faced_green_signaling_laboratory_block" + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/right-faced_red_signaling_laboratory_block.json b/src/generated/resources/data/laboratoryblocks/recipe/right-faced_red_signaling_laboratory_block.json similarity index 76% rename from src/generated/resources/data/laboratoryblocks/recipes/right-faced_red_signaling_laboratory_block.json rename to src/generated/resources/data/laboratoryblocks/recipe/right-faced_red_signaling_laboratory_block.json index 7eb58f6..946c87b 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/right-faced_red_signaling_laboratory_block.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/right-faced_red_signaling_laboratory_block.json @@ -19,7 +19,6 @@ ], "result": { "count": 8, - "item": "laboratoryblocks:right-faced_red_signaling_laboratory_block" - }, - "show_notification": true + "id": "laboratoryblocks:right-faced_red_signaling_laboratory_block" + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/screwed_laboratory_block.json b/src/generated/resources/data/laboratoryblocks/recipe/screwed_laboratory_block.json similarity index 76% rename from src/generated/resources/data/laboratoryblocks/recipes/screwed_laboratory_block.json rename to src/generated/resources/data/laboratoryblocks/recipe/screwed_laboratory_block.json index 8a58e6e..c884dec 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/screwed_laboratory_block.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/screwed_laboratory_block.json @@ -16,7 +16,6 @@ ], "result": { "count": 2, - "item": "laboratoryblocks:screwed_laboratory_block" - }, - "show_notification": true + "id": "laboratoryblocks:screwed_laboratory_block" + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/spruce_laboratory_floor.json b/src/generated/resources/data/laboratoryblocks/recipe/spruce_laboratory_floor.json similarity index 76% rename from src/generated/resources/data/laboratoryblocks/recipes/spruce_laboratory_floor.json rename to src/generated/resources/data/laboratoryblocks/recipe/spruce_laboratory_floor.json index 9943a1a..4ed1cc3 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/spruce_laboratory_floor.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/spruce_laboratory_floor.json @@ -16,7 +16,6 @@ ], "result": { "count": 8, - "item": "laboratoryblocks:spruce_laboratory_floor" - }, - "show_notification": true + "id": "laboratoryblocks:spruce_laboratory_floor" + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/spruce_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/recipe/spruce_laboratory_tiles.json similarity index 72% rename from src/generated/resources/data/laboratoryblocks/recipes/spruce_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/recipe/spruce_laboratory_tiles.json index f25310f..02d63c6 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/spruce_laboratory_tiles.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/spruce_laboratory_tiles.json @@ -12,7 +12,6 @@ ], "result": { "count": 8, - "item": "laboratoryblocks:spruce_laboratory_tiles" - }, - "show_notification": true + "id": "laboratoryblocks:spruce_laboratory_tiles" + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/starch.json b/src/generated/resources/data/laboratoryblocks/recipe/starch.json similarity index 87% rename from src/generated/resources/data/laboratoryblocks/recipes/starch.json rename to src/generated/resources/data/laboratoryblocks/recipe/starch.json index 990f8ad..a34bd8c 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/starch.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/starch.json @@ -16,6 +16,7 @@ } ], "result": { - "item": "laboratoryblocks:starch" + "count": 1, + "id": "laboratoryblocks:starch" } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/tiled_pla_flooring.json b/src/generated/resources/data/laboratoryblocks/recipe/tiled_pla_flooring.json similarity index 70% rename from src/generated/resources/data/laboratoryblocks/recipes/tiled_pla_flooring.json rename to src/generated/resources/data/laboratoryblocks/recipe/tiled_pla_flooring.json index 437bccf..594f843 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/tiled_pla_flooring.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/tiled_pla_flooring.json @@ -11,7 +11,6 @@ ], "result": { "count": 3, - "item": "laboratoryblocks:tiled_pla_flooring" - }, - "show_notification": true + "id": "laboratoryblocks:tiled_pla_flooring" + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/warped_laboratory_floor.json b/src/generated/resources/data/laboratoryblocks/recipe/warped_laboratory_floor.json similarity index 76% rename from src/generated/resources/data/laboratoryblocks/recipes/warped_laboratory_floor.json rename to src/generated/resources/data/laboratoryblocks/recipe/warped_laboratory_floor.json index 532f198..9b3eaf9 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/warped_laboratory_floor.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/warped_laboratory_floor.json @@ -16,7 +16,6 @@ ], "result": { "count": 8, - "item": "laboratoryblocks:warped_laboratory_floor" - }, - "show_notification": true + "id": "laboratoryblocks:warped_laboratory_floor" + } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipes/warped_laboratory_tiles.json b/src/generated/resources/data/laboratoryblocks/recipe/warped_laboratory_tiles.json similarity index 72% rename from src/generated/resources/data/laboratoryblocks/recipes/warped_laboratory_tiles.json rename to src/generated/resources/data/laboratoryblocks/recipe/warped_laboratory_tiles.json index 59192aa..cc115cf 100644 --- a/src/generated/resources/data/laboratoryblocks/recipes/warped_laboratory_tiles.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/warped_laboratory_tiles.json @@ -12,7 +12,6 @@ ], "result": { "count": 8, - "item": "laboratoryblocks:warped_laboratory_tiles" - }, - "show_notification": true + "id": "laboratoryblocks:warped_laboratory_tiles" + } } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/enlighted_laboratory_vent_connecting_from_laboratory_vent_connecting_and_glowstone_particles.json b/src/generated/resources/data/minecraft/advancement/recipes/building_blocks/enlighted_laboratory_vent_connecting_from_laboratory_vent_connecting_and_glowstone_particles.json similarity index 75% rename from src/generated/resources/data/minecraft/advancements/recipes/building_blocks/enlighted_laboratory_vent_connecting_from_laboratory_vent_connecting_and_glowstone_particles.json rename to src/generated/resources/data/minecraft/advancement/recipes/building_blocks/enlighted_laboratory_vent_connecting_from_laboratory_vent_connecting_and_glowstone_particles.json index d41ff6d..287131d 100644 --- a/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/enlighted_laboratory_vent_connecting_from_laboratory_vent_connecting_and_glowstone_particles.json +++ b/src/generated/resources/data/minecraft/advancement/recipes/building_blocks/enlighted_laboratory_vent_connecting_from_laboratory_vent_connecting_and_glowstone_particles.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:glowstone_particles" - ] + "items": "laboratoryblocks:glowstone_particles" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:laboratory_vent_connecting" - ] + "items": "laboratoryblocks:laboratory_vent_connecting" } ] }, @@ -34,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_laboratory_vent_connecting", - "has_glowstone_particles", - "has_the_recipe" + "has_glowstone_particles" ] ], "rewards": { "recipes": [ "minecraft:enlighted_laboratory_vent_connecting_from_laboratory_vent_connecting_and_glowstone_particles" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/misc/from_redstone_particles.json b/src/generated/resources/data/minecraft/advancement/recipes/misc/from_redstone_particles.json similarity index 73% rename from src/generated/resources/data/minecraft/advancements/recipes/misc/from_redstone_particles.json rename to src/generated/resources/data/minecraft/advancement/recipes/misc/from_redstone_particles.json index 1ca5a9f..6ae1566 100644 --- a/src/generated/resources/data/minecraft/advancements/recipes/misc/from_redstone_particles.json +++ b/src/generated/resources/data/minecraft/advancement/recipes/misc/from_redstone_particles.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:redstone_particles" - ] + "items": "laboratoryblocks:redstone_particles" } ] }, @@ -22,14 +20,13 @@ }, "requirements": [ [ - "has_redstone_particles", - "has_the_recipe" + "has_the_recipe", + "has_redstone_particles" ] ], "rewards": { "recipes": [ "minecraft:from_redstone_particles" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/misc/glowstone_dust.json b/src/generated/resources/data/minecraft/advancement/recipes/misc/glowstone_dust.json similarity index 72% rename from src/generated/resources/data/minecraft/advancements/recipes/misc/glowstone_dust.json rename to src/generated/resources/data/minecraft/advancement/recipes/misc/glowstone_dust.json index 881729d..bae0cff 100644 --- a/src/generated/resources/data/minecraft/advancements/recipes/misc/glowstone_dust.json +++ b/src/generated/resources/data/minecraft/advancement/recipes/misc/glowstone_dust.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:glowstone_particles" - ] + "items": "laboratoryblocks:glowstone_particles" } ] }, @@ -22,14 +20,13 @@ }, "requirements": [ [ - "has_glowstone_particles", - "has_the_recipe" + "has_the_recipe", + "has_glowstone_particles" ] ], "rewards": { "recipes": [ "minecraft:glowstone_dust" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/enlighted_laboratory_vent_connecting_from_laboratory_vent_connecting_and_glowstone_particles.json b/src/generated/resources/data/minecraft/recipe/enlighted_laboratory_vent_connecting_from_laboratory_vent_connecting_and_glowstone_particles.json similarity index 75% rename from src/generated/resources/data/minecraft/recipes/enlighted_laboratory_vent_connecting_from_laboratory_vent_connecting_and_glowstone_particles.json rename to src/generated/resources/data/minecraft/recipe/enlighted_laboratory_vent_connecting_from_laboratory_vent_connecting_and_glowstone_particles.json index 1f7ffca..4494a62 100644 --- a/src/generated/resources/data/minecraft/recipes/enlighted_laboratory_vent_connecting_from_laboratory_vent_connecting_and_glowstone_particles.json +++ b/src/generated/resources/data/minecraft/recipe/enlighted_laboratory_vent_connecting_from_laboratory_vent_connecting_and_glowstone_particles.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "laboratoryblocks:enlighted_laboratory_vent_connecting" + "count": 1, + "id": "laboratoryblocks:enlighted_laboratory_vent_connecting" } } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/from_redstone_particles.json b/src/generated/resources/data/minecraft/recipe/from_redstone_particles.json similarity index 93% rename from src/generated/resources/data/minecraft/recipes/from_redstone_particles.json rename to src/generated/resources/data/minecraft/recipe/from_redstone_particles.json index 43d7812..6669b8a 100644 --- a/src/generated/resources/data/minecraft/recipes/from_redstone_particles.json +++ b/src/generated/resources/data/minecraft/recipe/from_redstone_particles.json @@ -28,6 +28,7 @@ } ], "result": { - "item": "minecraft:redstone" + "count": 1, + "id": "minecraft:redstone" } } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/glowstone_dust.json b/src/generated/resources/data/minecraft/recipe/glowstone_dust.json similarity index 92% rename from src/generated/resources/data/minecraft/recipes/glowstone_dust.json rename to src/generated/resources/data/minecraft/recipe/glowstone_dust.json index 884b47c..bd9b0c7 100644 --- a/src/generated/resources/data/minecraft/recipes/glowstone_dust.json +++ b/src/generated/resources/data/minecraft/recipe/glowstone_dust.json @@ -28,6 +28,7 @@ } ], "result": { - "item": "minecraft:glowstone_dust" + "count": 1, + "id": "minecraft:glowstone_dust" } } \ No newline at end of file From b6a12f251b01d834588bca15d8a9012e10ea2bbc Mon Sep 17 00:00:00 2001 From: EnderTurret <36442079+EnderTurret@users.noreply.github.com> Date: Tue, 26 Nov 2024 04:35:32 -0500 Subject: [PATCH 10/16] Fix advancement display. --- .../data/laboratoryblocks/advancement/glassworking.json | 2 +- .../data/laboratoryblocks/advancement/i_have_spoken.json | 2 +- .../data/laboratoryblocks/advancement/i_said_the_real_tile.json | 2 +- .../resources/data/laboratoryblocks/advancement/ironworks.json | 2 +- .../resources/data/laboratoryblocks/advancement/it_glows.json | 2 +- .../data/laboratoryblocks/advancement/lab_assistant.json | 2 +- .../resources/data/laboratoryblocks/advancement/librarian.json | 2 +- .../data/laboratoryblocks/advancement/librarian_but_fancy.json | 2 +- .../resources/data/laboratoryblocks/advancement/perfection.json | 2 +- .../data/laboratoryblocks/advancement/pla_enthusiast.json | 2 +- .../resources/data/laboratoryblocks/advancement/pla_master.json | 2 +- .../resources/data/laboratoryblocks/advancement/pla_tiling.json | 2 +- .../data/laboratoryblocks/advancement/ready_for_work.json | 2 +- .../data/laboratoryblocks/advancement/screen_time.json | 2 +- .../laboratoryblocks/advancement/show_me_the_real_tile.json | 2 +- .../data/laboratoryblocks/advancement/show_me_the_way.json | 2 +- .../data/laboratoryblocks/advancement/this_is_the_way.json | 2 +- .../data/laboratoryblocks/advancement/welcome_to_the_lab.json | 2 +- .../data/laboratoryblocks/advancement/you_spin_me_round.json | 2 +- .../advancement/you_spin_me_round_in_controlled_manner.json | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/main/resources/data/laboratoryblocks/advancement/glassworking.json b/src/main/resources/data/laboratoryblocks/advancement/glassworking.json index 72f0dc0..8929f0e 100644 --- a/src/main/resources/data/laboratoryblocks/advancement/glassworking.json +++ b/src/main/resources/data/laboratoryblocks/advancement/glassworking.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "laboratoryblocks:laboratory_glass" + "id": "laboratoryblocks:laboratory_glass" }, "title": "Glassworking", "description": "Place your first block of Laboratory Glass", diff --git a/src/main/resources/data/laboratoryblocks/advancement/i_have_spoken.json b/src/main/resources/data/laboratoryblocks/advancement/i_have_spoken.json index 2784026..afb2d55 100644 --- a/src/main/resources/data/laboratoryblocks/advancement/i_have_spoken.json +++ b/src/main/resources/data/laboratoryblocks/advancement/i_have_spoken.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "laboratoryblocks:right-faced_blue_signaling_laboratory_block" + "id": "laboratoryblocks:right-faced_blue_signaling_laboratory_block" }, "title": "I have spoken", "description": "Place your first Right Facing Blue Signaling Laboratory block", diff --git a/src/main/resources/data/laboratoryblocks/advancement/i_said_the_real_tile.json b/src/main/resources/data/laboratoryblocks/advancement/i_said_the_real_tile.json index d9e2e84..ca24612 100644 --- a/src/main/resources/data/laboratoryblocks/advancement/i_said_the_real_tile.json +++ b/src/main/resources/data/laboratoryblocks/advancement/i_said_the_real_tile.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "laboratoryblocks:gray_laboratory_tiles" + "id": "laboratoryblocks:gray_laboratory_tiles" }, "title": "I said, show me the real tile", "description": "Place your first Gray Laboratory Tile", diff --git a/src/main/resources/data/laboratoryblocks/advancement/ironworks.json b/src/main/resources/data/laboratoryblocks/advancement/ironworks.json index 5f5bcc4..aa3a98f 100644 --- a/src/main/resources/data/laboratoryblocks/advancement/ironworks.json +++ b/src/main/resources/data/laboratoryblocks/advancement/ironworks.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "laboratoryblocks:iron_screw" + "id": "laboratoryblocks:iron_screw" }, "title": "Ironworks", "description": "Obtain your first iron screw", diff --git a/src/main/resources/data/laboratoryblocks/advancement/it_glows.json b/src/main/resources/data/laboratoryblocks/advancement/it_glows.json index 5e8abcc..b7514f0 100644 --- a/src/main/resources/data/laboratoryblocks/advancement/it_glows.json +++ b/src/main/resources/data/laboratoryblocks/advancement/it_glows.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "laboratoryblocks:enlighted_laboratory_glass" + "id": "laboratoryblocks:enlighted_laboratory_glass" }, "title": "It glows?", "description": "Place your first enlighted block of Laboratory Glass", diff --git a/src/main/resources/data/laboratoryblocks/advancement/lab_assistant.json b/src/main/resources/data/laboratoryblocks/advancement/lab_assistant.json index 681a558..6a46dfc 100644 --- a/src/main/resources/data/laboratoryblocks/advancement/lab_assistant.json +++ b/src/main/resources/data/laboratoryblocks/advancement/lab_assistant.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "laboratoryblocks:pla_sheets" + "id": "laboratoryblocks:pla_sheets" }, "title": "Lab Assistant", "description": "Craft a PLA Sheet", diff --git a/src/main/resources/data/laboratoryblocks/advancement/librarian.json b/src/main/resources/data/laboratoryblocks/advancement/librarian.json index 57d89d5..42c5586 100644 --- a/src/main/resources/data/laboratoryblocks/advancement/librarian.json +++ b/src/main/resources/data/laboratoryblocks/advancement/librarian.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "laboratoryblocks:laboratory_bookshelf" + "id": "laboratoryblocks:laboratory_bookshelf" }, "title": "Librarian", "description": "Place your first Laboratory Bookshelf", diff --git a/src/main/resources/data/laboratoryblocks/advancement/librarian_but_fancy.json b/src/main/resources/data/laboratoryblocks/advancement/librarian_but_fancy.json index 1bd3cbc..5c48e9c 100644 --- a/src/main/resources/data/laboratoryblocks/advancement/librarian_but_fancy.json +++ b/src/main/resources/data/laboratoryblocks/advancement/librarian_but_fancy.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "laboratoryblocks:chiseled_laboratory_bookshelf" + "id": "laboratoryblocks:chiseled_laboratory_bookshelf" }, "title": "Librarian, but Fancy", "description": "Place your first Chiseled Laboratory Bookshelf", diff --git a/src/main/resources/data/laboratoryblocks/advancement/perfection.json b/src/main/resources/data/laboratoryblocks/advancement/perfection.json index 0c73e39..f87de65 100644 --- a/src/main/resources/data/laboratoryblocks/advancement/perfection.json +++ b/src/main/resources/data/laboratoryblocks/advancement/perfection.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "laboratoryblocks:mixed_laboratory_tiles" + "id": "laboratoryblocks:mixed_laboratory_tiles" }, "title": "Perfection!", "description": "Place your first Mixed Laboratory Tile", diff --git a/src/main/resources/data/laboratoryblocks/advancement/pla_enthusiast.json b/src/main/resources/data/laboratoryblocks/advancement/pla_enthusiast.json index 886c441..8f65561 100644 --- a/src/main/resources/data/laboratoryblocks/advancement/pla_enthusiast.json +++ b/src/main/resources/data/laboratoryblocks/advancement/pla_enthusiast.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "laboratoryblocks:pla_block" + "id": "laboratoryblocks:pla_block" }, "title": "PLA Enthusiast", "description": "Place your first PLA Block", diff --git a/src/main/resources/data/laboratoryblocks/advancement/pla_master.json b/src/main/resources/data/laboratoryblocks/advancement/pla_master.json index dd9e281..f2104ce 100644 --- a/src/main/resources/data/laboratoryblocks/advancement/pla_master.json +++ b/src/main/resources/data/laboratoryblocks/advancement/pla_master.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "laboratoryblocks:pla_flooring" + "id": "laboratoryblocks:pla_flooring" }, "title": "PLA Master", "description": "Place your first PLA Flooring", diff --git a/src/main/resources/data/laboratoryblocks/advancement/pla_tiling.json b/src/main/resources/data/laboratoryblocks/advancement/pla_tiling.json index e01621e..d9e9571 100644 --- a/src/main/resources/data/laboratoryblocks/advancement/pla_tiling.json +++ b/src/main/resources/data/laboratoryblocks/advancement/pla_tiling.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "laboratoryblocks:pla_tiles" + "id": "laboratoryblocks:pla_tiles" }, "title": "PLA Tiling", "description": "Place your first PLA Tile", diff --git a/src/main/resources/data/laboratoryblocks/advancement/ready_for_work.json b/src/main/resources/data/laboratoryblocks/advancement/ready_for_work.json index 77c438b..0ddb703 100644 --- a/src/main/resources/data/laboratoryblocks/advancement/ready_for_work.json +++ b/src/main/resources/data/laboratoryblocks/advancement/ready_for_work.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "laboratoryblocks:configuration_tool" + "id": "laboratoryblocks:configuration_tool" }, "title": "Ready for Work", "description": "Obtain a Configuration Tool", diff --git a/src/main/resources/data/laboratoryblocks/advancement/screen_time.json b/src/main/resources/data/laboratoryblocks/advancement/screen_time.json index bea09b4..415478d 100644 --- a/src/main/resources/data/laboratoryblocks/advancement/screen_time.json +++ b/src/main/resources/data/laboratoryblocks/advancement/screen_time.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "laboratoryblocks:clear_laboratory_screen" + "id": "laboratoryblocks:clear_laboratory_screen" }, "title": "Screen Time", "description": "Place your first Laboratory Screen", diff --git a/src/main/resources/data/laboratoryblocks/advancement/show_me_the_real_tile.json b/src/main/resources/data/laboratoryblocks/advancement/show_me_the_real_tile.json index 4326e8b..251e4e9 100644 --- a/src/main/resources/data/laboratoryblocks/advancement/show_me_the_real_tile.json +++ b/src/main/resources/data/laboratoryblocks/advancement/show_me_the_real_tile.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "laboratoryblocks:laboratory_tiles" + "id": "laboratoryblocks:laboratory_tiles" }, "title": "Show me the real tile", "description": "Place your first Laboratory Tile", diff --git a/src/main/resources/data/laboratoryblocks/advancement/show_me_the_way.json b/src/main/resources/data/laboratoryblocks/advancement/show_me_the_way.json index 1ac96e7..0ca107b 100644 --- a/src/main/resources/data/laboratoryblocks/advancement/show_me_the_way.json +++ b/src/main/resources/data/laboratoryblocks/advancement/show_me_the_way.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "laboratoryblocks:right-faced_red_signaling_laboratory_block" + "id": "laboratoryblocks:right-faced_red_signaling_laboratory_block" }, "title": "Show me the way", "description": "Place your first Right Facing Red Signaling Laboratory block", diff --git a/src/main/resources/data/laboratoryblocks/advancement/this_is_the_way.json b/src/main/resources/data/laboratoryblocks/advancement/this_is_the_way.json index 3b6b003..cb213ef 100644 --- a/src/main/resources/data/laboratoryblocks/advancement/this_is_the_way.json +++ b/src/main/resources/data/laboratoryblocks/advancement/this_is_the_way.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "laboratoryblocks:right-faced_green_signaling_laboratory_block" + "id": "laboratoryblocks:right-faced_green_signaling_laboratory_block" }, "title": "This is the way", "description": "Place your first Right Facing Green Signaling Laboratory block", diff --git a/src/main/resources/data/laboratoryblocks/advancement/welcome_to_the_lab.json b/src/main/resources/data/laboratoryblocks/advancement/welcome_to_the_lab.json index 4b441ba..307d192 100644 --- a/src/main/resources/data/laboratoryblocks/advancement/welcome_to_the_lab.json +++ b/src/main/resources/data/laboratoryblocks/advancement/welcome_to_the_lab.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "laboratoryblocks:laboratory_block" + "id": "laboratoryblocks:laboratory_block" }, "title": "Welcome to the Lab", "description": "Obtain your first Laboratory Block", diff --git a/src/main/resources/data/laboratoryblocks/advancement/you_spin_me_round.json b/src/main/resources/data/laboratoryblocks/advancement/you_spin_me_round.json index d03ea99..5857b58 100644 --- a/src/main/resources/data/laboratoryblocks/advancement/you_spin_me_round.json +++ b/src/main/resources/data/laboratoryblocks/advancement/you_spin_me_round.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "laboratoryblocks:laboratory_fan" + "id": "laboratoryblocks:laboratory_fan" }, "title": "You Spin Me Round", "description": "Place your first Laboratory Fan and make it spin", diff --git a/src/main/resources/data/laboratoryblocks/advancement/you_spin_me_round_in_controlled_manner.json b/src/main/resources/data/laboratoryblocks/advancement/you_spin_me_round_in_controlled_manner.json index 66bc9de..f61aba0 100644 --- a/src/main/resources/data/laboratoryblocks/advancement/you_spin_me_round_in_controlled_manner.json +++ b/src/main/resources/data/laboratoryblocks/advancement/you_spin_me_round_in_controlled_manner.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "laboratoryblocks:laboratory_fan_redstone_controlled" + "id": "laboratoryblocks:laboratory_fan_redstone_controlled" }, "title": "You Spin Me Round (In controlled manner)", "description": "Place your first Laboratory Fan that is controlled by Redstone", From 2aa41fc3f1b2a3db3ca3e65e68d1f6621c1aae1e Mon Sep 17 00:00:00 2001 From: EnderTurret <36442079+EnderTurret@users.noreply.github.com> Date: Tue, 26 Nov 2024 18:37:53 -0500 Subject: [PATCH 11/16] Introduce `BaseLaboratoryBlock`, to reduce code duplication. Specifically, to consolidate all the glowstone application/removal code into one spot. Also fix a few tabs that snuck in. --- .../custom/ApplyingGlowstoneParticle.java | 2 +- ...hiseledLaboratoryBookShelfBlockEntity.java | 4 +- .../common/blocks/BaseLaboratoryBlock.java | 84 ++++++++++++++ .../ChiseledLaboratoryBookShelfBlock.java | 85 ++++---------- .../common/blocks/LaboratoryBlock.java | 67 +---------- .../common/blocks/LaboratoryCarpetBlock.java | 61 +++------- .../common/blocks/LaboratoryGlassBlock.java | 65 +---------- .../RedstoneControlledLaboratoryBlock.java | 107 +----------------- .../common/registration/ModBlocks.java | 2 +- 9 files changed, 131 insertions(+), 346 deletions(-) create mode 100644 src/main/java/de/artemis/laboratoryblocks/common/blocks/BaseLaboratoryBlock.java diff --git a/src/main/java/de/artemis/laboratoryblocks/client/particle/custom/ApplyingGlowstoneParticle.java b/src/main/java/de/artemis/laboratoryblocks/client/particle/custom/ApplyingGlowstoneParticle.java index e08f466..241dfc6 100644 --- a/src/main/java/de/artemis/laboratoryblocks/client/particle/custom/ApplyingGlowstoneParticle.java +++ b/src/main/java/de/artemis/laboratoryblocks/client/particle/custom/ApplyingGlowstoneParticle.java @@ -49,7 +49,7 @@ public Provider(SpriteSet spriteSet) { } @Override - public Particle createParticle(@NotNull SimpleParticleType particleType, @NotNull ClientLevel level, double x, double y, double z, double dx, double dy, double dz) { + public Particle createParticle(@NotNull SimpleParticleType particleType, @NotNull ClientLevel level, double x, double y, double z, double dx, double dy, double dz) { ApplyingGlowstoneParticle applyingGlowstoneParticle = new ApplyingGlowstoneParticle(level, x, y, z, this.spriteSet, dx, dy, dz); applyingGlowstoneParticle.setColor(1F, 0.80F, 0.25F); diff --git a/src/main/java/de/artemis/laboratoryblocks/common/blockentities/ChiseledLaboratoryBookShelfBlockEntity.java b/src/main/java/de/artemis/laboratoryblocks/common/blockentities/ChiseledLaboratoryBookShelfBlockEntity.java index 7ebdb0e..84a6fab 100644 --- a/src/main/java/de/artemis/laboratoryblocks/common/blockentities/ChiseledLaboratoryBookShelfBlockEntity.java +++ b/src/main/java/de/artemis/laboratoryblocks/common/blockentities/ChiseledLaboratoryBookShelfBlockEntity.java @@ -12,9 +12,9 @@ public class ChiseledLaboratoryBookShelfBlockEntity extends ChiseledBookShelfBlo public ChiseledLaboratoryBookShelfBlockEntity(BlockPos blockPos, BlockState blockState) { super(blockPos, blockState); } - + @Override public BlockEntityType getType() { - return ModBlockEntities.CHISELED_LABORATORY_BOOKSHELF_BLOCK_ENTITY.get(); + return ModBlockEntities.CHISELED_LABORATORY_BOOKSHELF_BLOCK_ENTITY.get(); } } diff --git a/src/main/java/de/artemis/laboratoryblocks/common/blocks/BaseLaboratoryBlock.java b/src/main/java/de/artemis/laboratoryblocks/common/blocks/BaseLaboratoryBlock.java new file mode 100644 index 0000000..4aa397e --- /dev/null +++ b/src/main/java/de/artemis/laboratoryblocks/common/blocks/BaseLaboratoryBlock.java @@ -0,0 +1,84 @@ +package de.artemis.laboratoryblocks.common.blocks; + +import java.util.function.Supplier; + +import de.artemis.laboratoryblocks.common.registration.ModItems; +import de.artemis.laboratoryblocks.common.registration.ModKeyBindings; +import de.artemis.laboratoryblocks.common.registration.ModParticles; +import de.artemis.laboratoryblocks.common.registration.ModSoundEvents; +import de.artemis.laboratoryblocks.common.util.KeyBindingUtil; +import net.minecraft.core.BlockPos; +import net.minecraft.core.particles.ParticleOptions; +import net.minecraft.sounds.SoundEvents; +import net.minecraft.sounds.SoundSource; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.ItemInteractionResult; +import net.minecraft.world.entity.EquipmentSlot; +import net.minecraft.world.entity.item.ItemEntity; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.state.BlockState; + +public interface BaseLaboratoryBlock { + + public default void spawnParticles(ParticleOptions particle, Level level, BlockPos blockPos) { + for (float i = 0; i <= 1; i += 0.2F) { + level.addParticle(particle, blockPos.getX() + i, blockPos.getY(), blockPos.getZ(), 0, 0, 0); + level.addParticle(particle, blockPos.getX() + i, blockPos.getY() + 1, blockPos.getZ(), 0, 0, 0); + level.addParticle(particle, blockPos.getX(), blockPos.getY() + i, blockPos.getZ(), 0, 0, 0); + level.addParticle(particle, blockPos.getX() + 1, blockPos.getY() + i, blockPos.getZ(), 0, 0, 0); + level.addParticle(particle, blockPos.getX() + i, blockPos.getY(), blockPos.getZ() + 1, 0, 0, 0); + level.addParticle(particle, blockPos.getX() + i, blockPos.getY() + 1, blockPos.getZ() + 1, 0, 0, 0); + level.addParticle(particle, blockPos.getX(), blockPos.getY() + i, blockPos.getZ() + 1, 0, 0, 0); + level.addParticle(particle, blockPos.getX() + 1, blockPos.getY() + i, blockPos.getZ() + 1, 0, 0, 0); + level.addParticle(particle, blockPos.getX(), blockPos.getY(), blockPos.getZ() + i, 0, 0, 0); + level.addParticle(particle, blockPos.getX() + 1, blockPos.getY(), blockPos.getZ() + i, 0, 0, 0); + level.addParticle(particle, blockPos.getX(), blockPos.getY() + 1, blockPos.getZ() + i, 0, 0, 0); + level.addParticle(particle, blockPos.getX() + 1, blockPos.getY() + 1, blockPos.getZ() + i, 0, 0, 0); + } + } + + public default BlockState copyState(BlockState oldState, BlockState newState) { + return newState; + } + + @SuppressWarnings("deprecation") + public default ItemInteractionResult tryApplyGlowstone(ItemStack itemStackInHand, BlockState blockState, Level level, BlockPos blockPos, Player player, InteractionHand hand, Supplier glowstone_block) { + // Applying Glowstone + if (itemStackInHand.is(ModItems.GLOWSTONE_PARTICLES.get()) && !blockState.getBlock().builtInRegistryHolder().unwrapKey().get().toString().contains("enlighted")) { + if (!player.isCreative()) { + itemStackInHand.shrink(1); + } + level.setBlock(blockPos, copyState(blockState, glowstone_block.get().defaultBlockState()), 3); + level.playSound(player, blockPos, SoundEvents.RESPAWN_ANCHOR_CHARGE, SoundSource.BLOCKS, 1.0F, 1.0F); + + spawnParticles(ModParticles.APPLYING_GLOWSTONE_PARTICLE.get(), level, blockPos); + + return ItemInteractionResult.SUCCESS; + } + + // Removing Glowstone + if (itemStackInHand.is(ModItems.CONFIGURATION_TOOL.get()) && blockState.getBlock().builtInRegistryHolder().unwrapKey().get().toString().contains("enlighted") && KeyBindingUtil.isKeyPressed(ModKeyBindings.REMOVE_GLOWSTONE_CONFIGURATION_TOOL_ACTION)) { + if (!player.isCreative()) { + if (!player.getInventory().add(new ItemStack(ModItems.GLOWSTONE_PARTICLES.get()))) { + ItemEntity itemEntity = new ItemEntity(level, blockPos.getX() + 0.5F, blockPos.getY() + 1.0F, blockPos.getZ() + 0.5F, new ItemStack(ModItems.GLOWSTONE_PARTICLES.get())); + itemEntity.setDefaultPickUpDelay(); + level.addFreshEntity(itemEntity); + } + + itemStackInHand.hurtAndBreak(1, player, hand == InteractionHand.MAIN_HAND ? EquipmentSlot.MAINHAND : EquipmentSlot.OFFHAND); + } + level.setBlock(blockPos, copyState(blockState, glowstone_block.get().defaultBlockState()), 3); + level.playSound(player, blockPos, SoundEvents.AXE_WAX_OFF, SoundSource.BLOCKS, 1.0F, 1.0F); + level.playSound(player, blockPos, ModSoundEvents.CONFIGURATION_TOOL_USE.get(), SoundSource.BLOCKS, 1.0F, 1.0F); + + spawnParticles(ModParticles.REMOVING_MODIFIER_PARTICLE.get(), level, blockPos); + + return ItemInteractionResult.SUCCESS; + } + + return ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION; + } +} diff --git a/src/main/java/de/artemis/laboratoryblocks/common/blocks/ChiseledLaboratoryBookShelfBlock.java b/src/main/java/de/artemis/laboratoryblocks/common/blocks/ChiseledLaboratoryBookShelfBlock.java index 3e14aa3..60fecd0 100644 --- a/src/main/java/de/artemis/laboratoryblocks/common/blocks/ChiseledLaboratoryBookShelfBlock.java +++ b/src/main/java/de/artemis/laboratoryblocks/common/blocks/ChiseledLaboratoryBookShelfBlock.java @@ -8,15 +8,17 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.ChiseledBookShelfBlock; +import net.minecraft.world.level.block.HorizontalDirectionalBlock; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.phys.BlockHitResult; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.util.function.Supplier; -public class ChiseledLaboratoryBookShelfBlock extends ChiseledBookShelfBlock { +public class ChiseledLaboratoryBookShelfBlock extends ChiseledBookShelfBlock implements BaseLaboratoryBlock { private final Supplier block; @@ -25,6 +27,17 @@ public ChiseledLaboratoryBookShelfBlock(Supplier block; public LaboratoryBlock(Supplier block, Properties properties) { @@ -30,70 +31,8 @@ public LaboratoryBlock(Supplier block, Properties properties) { this.block = block; } - @SuppressWarnings("deprecation") @Override protected @NotNull ItemInteractionResult useItemOn(ItemStack itemStackInHand, BlockState blockState, Level level, BlockPos blockPos, Player player, InteractionHand hand, BlockHitResult hitResult) { - if (itemStackInHand.is(ModItems.GLOWSTONE_PARTICLES.get()) || itemStackInHand.is(ModItems.CONFIGURATION_TOOL.get())) { - - // Applying Glowstone - if (itemStackInHand.is(ModItems.GLOWSTONE_PARTICLES.get()) && !blockState.getBlock().builtInRegistryHolder().unwrapKey().get().toString().contains("enlighted")) { - if (!player.isCreative()) { - itemStackInHand.shrink(1); - } - level.setBlock(blockPos, block.get().defaultBlockState(), 3); - level.playSound(player, blockPos, SoundEvents.RESPAWN_ANCHOR_CHARGE, SoundSource.BLOCKS, 1.0F, 1.0F); - - for (float i = 0; i <= 1; i += 0.2F) { - level.addParticle(ModParticles.APPLYING_GLOWSTONE_PARTICLE.get(), blockPos.getX() + i, blockPos.getY(), blockPos.getZ(), 0, 0, 0); - level.addParticle(ModParticles.APPLYING_GLOWSTONE_PARTICLE.get(), blockPos.getX() + i, blockPos.getY() + 1, blockPos.getZ(), 0, 0, 0); - level.addParticle(ModParticles.APPLYING_GLOWSTONE_PARTICLE.get(), blockPos.getX(), blockPos.getY() + i, blockPos.getZ(), 0, 0, 0); - level.addParticle(ModParticles.APPLYING_GLOWSTONE_PARTICLE.get(), blockPos.getX() + 1, blockPos.getY() + i, blockPos.getZ(), 0, 0, 0); - level.addParticle(ModParticles.APPLYING_GLOWSTONE_PARTICLE.get(), blockPos.getX() + i, blockPos.getY(), blockPos.getZ() + 1, 0, 0, 0); - level.addParticle(ModParticles.APPLYING_GLOWSTONE_PARTICLE.get(), blockPos.getX() + i, blockPos.getY() + 1, blockPos.getZ() + 1, 0, 0, 0); - level.addParticle(ModParticles.APPLYING_GLOWSTONE_PARTICLE.get(), blockPos.getX(), blockPos.getY() + i, blockPos.getZ() + 1, 0, 0, 0); - level.addParticle(ModParticles.APPLYING_GLOWSTONE_PARTICLE.get(), blockPos.getX() + 1, blockPos.getY() + i, blockPos.getZ() + 1, 0, 0, 0); - level.addParticle(ModParticles.APPLYING_GLOWSTONE_PARTICLE.get(), blockPos.getX(), blockPos.getY(), blockPos.getZ() + i, 0, 0, 0); - level.addParticle(ModParticles.APPLYING_GLOWSTONE_PARTICLE.get(), blockPos.getX() + 1, blockPos.getY(), blockPos.getZ() + i, 0, 0, 0); - level.addParticle(ModParticles.APPLYING_GLOWSTONE_PARTICLE.get(), blockPos.getX(), blockPos.getY() + 1, blockPos.getZ() + i, 0, 0, 0); - level.addParticle(ModParticles.APPLYING_GLOWSTONE_PARTICLE.get(), blockPos.getX() + 1, blockPos.getY() + 1, blockPos.getZ() + i, 0, 0, 0); - } - - return ItemInteractionResult.SUCCESS; - } - - // Removing Glowstone - else if (itemStackInHand.is(ModItems.CONFIGURATION_TOOL.get()) && blockState.getBlock().builtInRegistryHolder().unwrapKey().get().toString().contains("enlighted") && KeyBindingUtil.isKeyPressed(ModKeyBindings.REMOVE_GLOWSTONE_CONFIGURATION_TOOL_ACTION)) { - if (!player.isCreative()) { - if (!player.getInventory().add(new ItemStack(ModItems.GLOWSTONE_PARTICLES.get()))) { - ItemEntity itemEntity = new ItemEntity(level, blockPos.getX() + 0.5F, blockPos.getY() + 1.0F, blockPos.getZ() + 0.5F, new ItemStack(ModItems.GLOWSTONE_PARTICLES.get())); - itemEntity.setDefaultPickUpDelay(); - level.addFreshEntity(itemEntity); - } - - itemStackInHand.hurtAndBreak(1, player, hand == InteractionHand.MAIN_HAND ? EquipmentSlot.MAINHAND : EquipmentSlot.OFFHAND); - } - level.setBlock(blockPos, block.get().defaultBlockState(), 3); - level.playSound(player, blockPos, SoundEvents.AXE_WAX_OFF, SoundSource.BLOCKS, 1.0F, 1.0F); - level.playSound(player, blockPos, ModSoundEvents.CONFIGURATION_TOOL_USE.get(), SoundSource.BLOCKS, 1.0F, 1.0F); - - for (float i = 0; i <= 1; i += 0.2F) { - level.addParticle(ModParticles.REMOVING_MODIFIER_PARTICLE.get(), blockPos.getX() + i, blockPos.getY(), blockPos.getZ(), 0, 0, 0); - level.addParticle(ModParticles.REMOVING_MODIFIER_PARTICLE.get(), blockPos.getX() + i, blockPos.getY() + 1, blockPos.getZ(), 0, 0, 0); - level.addParticle(ModParticles.REMOVING_MODIFIER_PARTICLE.get(), blockPos.getX(), blockPos.getY() + i, blockPos.getZ(), 0, 0, 0); - level.addParticle(ModParticles.REMOVING_MODIFIER_PARTICLE.get(), blockPos.getX() + 1, blockPos.getY() + i, blockPos.getZ(), 0, 0, 0); - level.addParticle(ModParticles.REMOVING_MODIFIER_PARTICLE.get(), blockPos.getX() + i, blockPos.getY(), blockPos.getZ() + 1, 0, 0, 0); - level.addParticle(ModParticles.REMOVING_MODIFIER_PARTICLE.get(), blockPos.getX() + i, blockPos.getY() + 1, blockPos.getZ() + 1, 0, 0, 0); - level.addParticle(ModParticles.REMOVING_MODIFIER_PARTICLE.get(), blockPos.getX(), blockPos.getY() + i, blockPos.getZ() + 1, 0, 0, 0); - level.addParticle(ModParticles.REMOVING_MODIFIER_PARTICLE.get(), blockPos.getX() + 1, blockPos.getY() + i, blockPos.getZ() + 1, 0, 0, 0); - level.addParticle(ModParticles.REMOVING_MODIFIER_PARTICLE.get(), blockPos.getX(), blockPos.getY(), blockPos.getZ() + i, 0, 0, 0); - level.addParticle(ModParticles.REMOVING_MODIFIER_PARTICLE.get(), blockPos.getX() + 1, blockPos.getY(), blockPos.getZ() + i, 0, 0, 0); - level.addParticle(ModParticles.REMOVING_MODIFIER_PARTICLE.get(), blockPos.getX(), blockPos.getY() + 1, blockPos.getZ() + i, 0, 0, 0); - level.addParticle(ModParticles.REMOVING_MODIFIER_PARTICLE.get(), blockPos.getX() + 1, blockPos.getY() + 1, blockPos.getZ() + i, 0, 0, 0); - } - - return ItemInteractionResult.SUCCESS; - } - } - return ItemInteractionResult.FAIL; + return tryApplyGlowstone(itemStackInHand, blockState, level, blockPos, player, hand, block); } } diff --git a/src/main/java/de/artemis/laboratoryblocks/common/blocks/LaboratoryCarpetBlock.java b/src/main/java/de/artemis/laboratoryblocks/common/blocks/LaboratoryCarpetBlock.java index acb91f3..5947884 100644 --- a/src/main/java/de/artemis/laboratoryblocks/common/blocks/LaboratoryCarpetBlock.java +++ b/src/main/java/de/artemis/laboratoryblocks/common/blocks/LaboratoryCarpetBlock.java @@ -6,6 +6,7 @@ import de.artemis.laboratoryblocks.common.registration.ModSoundEvents; import de.artemis.laboratoryblocks.common.util.KeyBindingUtil; import net.minecraft.core.BlockPos; +import net.minecraft.core.particles.ParticleOptions; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; import net.minecraft.world.InteractionHand; @@ -22,7 +23,7 @@ import java.util.function.Supplier; -public class LaboratoryCarpetBlock extends CarpetBlock { +public class LaboratoryCarpetBlock extends CarpetBlock implements BaseLaboratoryBlock { private final Supplier block; public LaboratoryCarpetBlock(Supplier block, Properties properties) { @@ -30,55 +31,19 @@ public LaboratoryCarpetBlock(Supplier block, Properties p this.block = block; } + @Override + public void spawnParticles(ParticleOptions particle, Level level, BlockPos blockPos) { + for (float i = 0; i <= 1; i += 0.2F) { + level.addParticle(particle, blockPos.getX() + i, blockPos.getY() + 0.0625F, blockPos.getZ(), 0, 0, 0); + level.addParticle(particle, blockPos.getX() + i, blockPos.getY() + 0.0625F, blockPos.getZ() + 1, 0, 0, 0); + level.addParticle(particle, blockPos.getX(), blockPos.getY() + 0.0625F, blockPos.getZ() + i, 0, 0, 0); + level.addParticle(particle, blockPos.getX() + 1, blockPos.getY() + 0.0625F, blockPos.getZ() + i, 0, 0, 0); + } + } + @SuppressWarnings("deprecation") @Override protected @NotNull ItemInteractionResult useItemOn(ItemStack itemStackInHand, BlockState blockState, Level level, BlockPos blockPos, Player player, InteractionHand hand, BlockHitResult hitResult) { - if (itemStackInHand.is(ModItems.GLOWSTONE_PARTICLES.get()) || itemStackInHand.is(ModItems.CONFIGURATION_TOOL.get())) { - - // Applying Glowstone - if (itemStackInHand.is(ModItems.GLOWSTONE_PARTICLES.get()) && !blockState.getBlock().builtInRegistryHolder().unwrapKey().get().toString().contains("enlighted")) { - if (!player.isCreative()) { - itemStackInHand.shrink(1); - } - level.setBlock(blockPos, block.get().defaultBlockState(), 3); - level.playSound(player, blockPos, SoundEvents.RESPAWN_ANCHOR_CHARGE, SoundSource.BLOCKS, 1.0F, 1.0F); - - for (float i = 0; i <= 1; i += 0.2F) { - level.addParticle(ModParticles.APPLYING_GLOWSTONE_PARTICLE.get(), blockPos.getX() + i, blockPos.getY() + 0.0625F, blockPos.getZ(), 0, 0, 0); - level.addParticle(ModParticles.APPLYING_GLOWSTONE_PARTICLE.get(), blockPos.getX() + i, blockPos.getY() + 0.0625F, blockPos.getZ() + 1, 0, 0, 0); - level.addParticle(ModParticles.APPLYING_GLOWSTONE_PARTICLE.get(), blockPos.getX(), blockPos.getY() + 0.0625F, blockPos.getZ() + i, 0, 0, 0); - level.addParticle(ModParticles.APPLYING_GLOWSTONE_PARTICLE.get(), blockPos.getX() + 1, blockPos.getY() + 0.0625F, blockPos.getZ() + i, 0, 0, 0); - } - - return ItemInteractionResult.SUCCESS; - } - - // Removing Glowstone - else if (itemStackInHand.is(ModItems.CONFIGURATION_TOOL.get()) && blockState.getBlock().builtInRegistryHolder().unwrapKey().get().toString().contains("enlighted") && KeyBindingUtil.isKeyPressed(ModKeyBindings.REMOVE_GLOWSTONE_CONFIGURATION_TOOL_ACTION)) { - if (!player.isCreative()) { - if (!player.getInventory().add(new ItemStack(ModItems.GLOWSTONE_PARTICLES.get()))) { - ItemEntity itemEntity = new ItemEntity(level, blockPos.getX() + 0.5F, blockPos.getY() + 1.0F, blockPos.getZ() + 0.5F, new ItemStack(ModItems.GLOWSTONE_PARTICLES.get())); - itemEntity.setDefaultPickUpDelay(); - level.addFreshEntity(itemEntity); - } - - itemStackInHand.hurtAndBreak(1, player, hand == InteractionHand.MAIN_HAND ? EquipmentSlot.MAINHAND : EquipmentSlot.OFFHAND); - } - level.setBlock(blockPos, block.get().defaultBlockState(), 3); - level.playSound(player, blockPos, SoundEvents.AXE_WAX_OFF, SoundSource.BLOCKS, 1.0F, 1.0F); - level.playSound(player, blockPos, ModSoundEvents.CONFIGURATION_TOOL_USE.get(), SoundSource.BLOCKS, 1.0F, 1.0F); - - for (float i = 0; i <= 1; i += 0.2F) { - level.addParticle(ModParticles.REMOVING_MODIFIER_PARTICLE.get(), blockPos.getX() + i, blockPos.getY() + 0.0625F, blockPos.getZ(), 0, 0, 0); - level.addParticle(ModParticles.REMOVING_MODIFIER_PARTICLE.get(), blockPos.getX() + i, blockPos.getY() + 0.0625F, blockPos.getZ() + 1, 0, 0, 0); - level.addParticle(ModParticles.REMOVING_MODIFIER_PARTICLE.get(), blockPos.getX(), blockPos.getY() + 0.0625F, blockPos.getZ() + i, 0, 0, 0); - level.addParticle(ModParticles.REMOVING_MODIFIER_PARTICLE.get(), blockPos.getX() + 1, blockPos.getY() + 0.0625F, blockPos.getZ() + i, 0, 0, 0); - } - - return ItemInteractionResult.SUCCESS; - } - } - return ItemInteractionResult.FAIL; + return tryApplyGlowstone(itemStackInHand, blockState, level, blockPos, player, hand, block); } } - diff --git a/src/main/java/de/artemis/laboratoryblocks/common/blocks/LaboratoryGlassBlock.java b/src/main/java/de/artemis/laboratoryblocks/common/blocks/LaboratoryGlassBlock.java index 1fd9c68..0a03561 100644 --- a/src/main/java/de/artemis/laboratoryblocks/common/blocks/LaboratoryGlassBlock.java +++ b/src/main/java/de/artemis/laboratoryblocks/common/blocks/LaboratoryGlassBlock.java @@ -22,7 +22,7 @@ import java.util.function.Supplier; -public class LaboratoryGlassBlock extends TransparentBlock { +public class LaboratoryGlassBlock extends TransparentBlock implements BaseLaboratoryBlock { private final Supplier block; public LaboratoryGlassBlock(Supplier block, Properties properties) { @@ -30,69 +30,8 @@ public LaboratoryGlassBlock(Supplier block, Properties pro this.block = block; } - @SuppressWarnings("deprecation") @Override protected @NotNull ItemInteractionResult useItemOn(ItemStack itemStackInHand, BlockState blockState, Level level, BlockPos blockPos, Player player, InteractionHand hand, BlockHitResult hitResult) { - if (itemStackInHand.is(ModItems.GLOWSTONE_PARTICLES.get()) || itemStackInHand.is(ModItems.CONFIGURATION_TOOL.get())) { - - //Applying Glowstone - if (itemStackInHand.is(ModItems.GLOWSTONE_PARTICLES.get()) && !blockState.getBlock().builtInRegistryHolder().unwrapKey().get().toString().contains("enlighted")) { - if (!player.isCreative()) { - itemStackInHand.shrink(1); - } - level.setBlock(blockPos, block.get().defaultBlockState(), 3); - level.playSound(player, blockPos, SoundEvents.RESPAWN_ANCHOR_CHARGE, SoundSource.BLOCKS, 1.0F, 1.0F); - - for (float i = 0; i <= 1; i += 0.2F) { - level.addParticle(ModParticles.APPLYING_GLOWSTONE_PARTICLE.get(), blockPos.getX() + i, blockPos.getY(), blockPos.getZ(), 0, 0, 0); - level.addParticle(ModParticles.APPLYING_GLOWSTONE_PARTICLE.get(), blockPos.getX() + i, blockPos.getY() + 1, blockPos.getZ(), 0, 0, 0); - level.addParticle(ModParticles.APPLYING_GLOWSTONE_PARTICLE.get(), blockPos.getX(), blockPos.getY() + i, blockPos.getZ(), 0, 0, 0); - level.addParticle(ModParticles.APPLYING_GLOWSTONE_PARTICLE.get(), blockPos.getX() + 1, blockPos.getY() + i, blockPos.getZ(), 0, 0, 0); - level.addParticle(ModParticles.APPLYING_GLOWSTONE_PARTICLE.get(), blockPos.getX() + i, blockPos.getY(), blockPos.getZ() + 1, 0, 0, 0); - level.addParticle(ModParticles.APPLYING_GLOWSTONE_PARTICLE.get(), blockPos.getX() + i, blockPos.getY() + 1, blockPos.getZ() + 1, 0, 0, 0); - level.addParticle(ModParticles.APPLYING_GLOWSTONE_PARTICLE.get(), blockPos.getX(), blockPos.getY() + i, blockPos.getZ() + 1, 0, 0, 0); - level.addParticle(ModParticles.APPLYING_GLOWSTONE_PARTICLE.get(), blockPos.getX() + 1, blockPos.getY() + i, blockPos.getZ() + 1, 0, 0, 0); - level.addParticle(ModParticles.APPLYING_GLOWSTONE_PARTICLE.get(), blockPos.getX(), blockPos.getY(), blockPos.getZ() + i, 0, 0, 0); - level.addParticle(ModParticles.APPLYING_GLOWSTONE_PARTICLE.get(), blockPos.getX() + 1, blockPos.getY(), blockPos.getZ() + i, 0, 0, 0); - level.addParticle(ModParticles.APPLYING_GLOWSTONE_PARTICLE.get(), blockPos.getX(), blockPos.getY() + 1, blockPos.getZ() + i, 0, 0, 0); - level.addParticle(ModParticles.APPLYING_GLOWSTONE_PARTICLE.get(), blockPos.getX() + 1, blockPos.getY() + 1, blockPos.getZ() + i, 0, 0, 0); - } - - return ItemInteractionResult.SUCCESS; - } - - // Removing Glowstone - else if (itemStackInHand.is(ModItems.CONFIGURATION_TOOL.get()) && blockState.getBlock().builtInRegistryHolder().unwrapKey().get().toString().contains("enlighted") && KeyBindingUtil.isKeyPressed(ModKeyBindings.REMOVE_GLOWSTONE_CONFIGURATION_TOOL_ACTION)) { - if (!player.isCreative()) { - if (!player.getInventory().add(new ItemStack(ModItems.GLOWSTONE_PARTICLES.get()))) { - ItemEntity itemEntity = new ItemEntity(level, blockPos.getX() + 0.5F, blockPos.getY() + 1.0F, blockPos.getZ() + 0.5F, new ItemStack(ModItems.GLOWSTONE_PARTICLES.get())); - itemEntity.setDefaultPickUpDelay(); - level.addFreshEntity(itemEntity); - } - itemStackInHand.hurtAndBreak(1, player, hand == InteractionHand.MAIN_HAND ? EquipmentSlot.MAINHAND : EquipmentSlot.OFFHAND); - } - level.setBlock(blockPos, block.get().defaultBlockState(), 3); - level.playSound(player, blockPos, SoundEvents.AXE_WAX_OFF, SoundSource.BLOCKS, 1.0F, 1.0F); - level.playSound(player, blockPos, ModSoundEvents.CONFIGURATION_TOOL_USE.get(), SoundSource.BLOCKS, 1.0F, 1.0F); - - for (float i = 0; i <= 1; i += 0.2F) { - level.addParticle(ModParticles.REMOVING_MODIFIER_PARTICLE.get(), blockPos.getX() + i, blockPos.getY(), blockPos.getZ(), 0, 0, 0); - level.addParticle(ModParticles.REMOVING_MODIFIER_PARTICLE.get(), blockPos.getX() + i, blockPos.getY() + 1, blockPos.getZ(), 0, 0, 0); - level.addParticle(ModParticles.REMOVING_MODIFIER_PARTICLE.get(), blockPos.getX(), blockPos.getY() + i, blockPos.getZ(), 0, 0, 0); - level.addParticle(ModParticles.REMOVING_MODIFIER_PARTICLE.get(), blockPos.getX() + 1, blockPos.getY() + i, blockPos.getZ(), 0, 0, 0); - level.addParticle(ModParticles.REMOVING_MODIFIER_PARTICLE.get(), blockPos.getX() + i, blockPos.getY(), blockPos.getZ() + 1, 0, 0, 0); - level.addParticle(ModParticles.REMOVING_MODIFIER_PARTICLE.get(), blockPos.getX() + i, blockPos.getY() + 1, blockPos.getZ() + 1, 0, 0, 0); - level.addParticle(ModParticles.REMOVING_MODIFIER_PARTICLE.get(), blockPos.getX(), blockPos.getY() + i, blockPos.getZ() + 1, 0, 0, 0); - level.addParticle(ModParticles.REMOVING_MODIFIER_PARTICLE.get(), blockPos.getX() + 1, blockPos.getY() + i, blockPos.getZ() + 1, 0, 0, 0); - level.addParticle(ModParticles.REMOVING_MODIFIER_PARTICLE.get(), blockPos.getX(), blockPos.getY(), blockPos.getZ() + i, 0, 0, 0); - level.addParticle(ModParticles.REMOVING_MODIFIER_PARTICLE.get(), blockPos.getX() + 1, blockPos.getY(), blockPos.getZ() + i, 0, 0, 0); - level.addParticle(ModParticles.REMOVING_MODIFIER_PARTICLE.get(), blockPos.getX(), blockPos.getY() + 1, blockPos.getZ() + i, 0, 0, 0); - level.addParticle(ModParticles.REMOVING_MODIFIER_PARTICLE.get(), blockPos.getX() + 1, blockPos.getY() + 1, blockPos.getZ() + i, 0, 0, 0); - } - - return ItemInteractionResult.SUCCESS; - } - } - return ItemInteractionResult.FAIL; + return tryApplyGlowstone(itemStackInHand, blockState, level, blockPos, player, hand, block); } } \ No newline at end of file diff --git a/src/main/java/de/artemis/laboratoryblocks/common/blocks/RedstoneControlledLaboratoryBlock.java b/src/main/java/de/artemis/laboratoryblocks/common/blocks/RedstoneControlledLaboratoryBlock.java index 1791987..501f737 100644 --- a/src/main/java/de/artemis/laboratoryblocks/common/blocks/RedstoneControlledLaboratoryBlock.java +++ b/src/main/java/de/artemis/laboratoryblocks/common/blocks/RedstoneControlledLaboratoryBlock.java @@ -26,7 +26,7 @@ import java.util.function.Supplier; -public class RedstoneControlledLaboratoryBlock extends Block { +public class RedstoneControlledLaboratoryBlock extends Block implements BaseLaboratoryBlock { private final Supplier glowstone_block; private final Supplier redstone_block; public static final BooleanProperty POWERED = BooleanProperty.create("powered"); @@ -89,50 +89,14 @@ public void tick(BlockState blockState, @NotNull ServerLevel serverLevel, @NotNu level.playSound(player, blockPos, ModSoundEvents.CONFIGURATION_TOOL_USE.get(), SoundSource.BLOCKS, 1.0F, 1.0F); - for (float i = 0; i <= 1; i += 0.2F) { - level.addParticle(ModParticles.APPLYING_REDSTONE_PARTICLE.get(), blockPos.getX() + i, blockPos.getY(), blockPos.getZ(), 0, 0, 0); - level.addParticle(ModParticles.APPLYING_REDSTONE_PARTICLE.get(), blockPos.getX() + i, blockPos.getY() + 1, blockPos.getZ(), 0, 0, 0); - level.addParticle(ModParticles.APPLYING_REDSTONE_PARTICLE.get(), blockPos.getX(), blockPos.getY() + i, blockPos.getZ(), 0, 0, 0); - level.addParticle(ModParticles.APPLYING_REDSTONE_PARTICLE.get(), blockPos.getX() + 1, blockPos.getY() + i, blockPos.getZ(), 0, 0, 0); - level.addParticle(ModParticles.APPLYING_REDSTONE_PARTICLE.get(), blockPos.getX() + i, blockPos.getY(), blockPos.getZ() + 1, 0, 0, 0); - level.addParticle(ModParticles.APPLYING_REDSTONE_PARTICLE.get(), blockPos.getX() + i, blockPos.getY() + 1, blockPos.getZ() + 1, 0, 0, 0); - level.addParticle(ModParticles.APPLYING_REDSTONE_PARTICLE.get(), blockPos.getX(), blockPos.getY() + i, blockPos.getZ() + 1, 0, 0, 0); - level.addParticle(ModParticles.APPLYING_REDSTONE_PARTICLE.get(), blockPos.getX() + 1, blockPos.getY() + i, blockPos.getZ() + 1, 0, 0, 0); - level.addParticle(ModParticles.APPLYING_REDSTONE_PARTICLE.get(), blockPos.getX(), blockPos.getY(), blockPos.getZ() + i, 0, 0, 0); - level.addParticle(ModParticles.APPLYING_REDSTONE_PARTICLE.get(), blockPos.getX() + 1, blockPos.getY(), blockPos.getZ() + i, 0, 0, 0); - level.addParticle(ModParticles.APPLYING_REDSTONE_PARTICLE.get(), blockPos.getX(), blockPos.getY() + 1, blockPos.getZ() + i, 0, 0, 0); - level.addParticle(ModParticles.APPLYING_REDSTONE_PARTICLE.get(), blockPos.getX() + 1, blockPos.getY() + 1, blockPos.getZ() + i, 0, 0, 0); - } + spawnParticles(ModParticles.APPLYING_REDSTONE_PARTICLE.get(), level, blockPos); return ItemInteractionResult.SUCCESS; } - // Applying Glowstone - if (itemStackInHand.is(ModItems.GLOWSTONE_PARTICLES.get()) && !blockState.getBlock().builtInRegistryHolder().unwrapKey().get().toString().contains("enlighted")) { - if (!player.isCreative()) { - itemStackInHand.shrink(1); - } - level.setBlock(blockPos, glowstone_block.get().defaultBlockState(), 3); - level.playSound(player, blockPos, SoundEvents.RESPAWN_ANCHOR_CHARGE, SoundSource.BLOCKS, 1.0F, 1.0F); - - for (float i = 0; i <= 1; i += 0.2F) { - level.addParticle(ModParticles.APPLYING_GLOWSTONE_PARTICLE.get(), blockPos.getX() + i, blockPos.getY(), blockPos.getZ(), 0, 0, 0); - level.addParticle(ModParticles.APPLYING_GLOWSTONE_PARTICLE.get(), blockPos.getX() + i, blockPos.getY() + 1, blockPos.getZ(), 0, 0, 0); - level.addParticle(ModParticles.APPLYING_GLOWSTONE_PARTICLE.get(), blockPos.getX(), blockPos.getY() + i, blockPos.getZ(), 0, 0, 0); - level.addParticle(ModParticles.APPLYING_GLOWSTONE_PARTICLE.get(), blockPos.getX() + 1, blockPos.getY() + i, blockPos.getZ(), 0, 0, 0); - level.addParticle(ModParticles.APPLYING_GLOWSTONE_PARTICLE.get(), blockPos.getX() + i, blockPos.getY(), blockPos.getZ() + 1, 0, 0, 0); - level.addParticle(ModParticles.APPLYING_GLOWSTONE_PARTICLE.get(), blockPos.getX() + i, blockPos.getY() + 1, blockPos.getZ() + 1, 0, 0, 0); - level.addParticle(ModParticles.APPLYING_GLOWSTONE_PARTICLE.get(), blockPos.getX(), blockPos.getY() + i, blockPos.getZ() + 1, 0, 0, 0); - level.addParticle(ModParticles.APPLYING_GLOWSTONE_PARTICLE.get(), blockPos.getX() + 1, blockPos.getY() + i, blockPos.getZ() + 1, 0, 0, 0); - level.addParticle(ModParticles.APPLYING_GLOWSTONE_PARTICLE.get(), blockPos.getX(), blockPos.getY(), blockPos.getZ() + i, 0, 0, 0); - level.addParticle(ModParticles.APPLYING_GLOWSTONE_PARTICLE.get(), blockPos.getX() + 1, blockPos.getY(), blockPos.getZ() + i, 0, 0, 0); - level.addParticle(ModParticles.APPLYING_GLOWSTONE_PARTICLE.get(), blockPos.getX(), blockPos.getY() + 1, blockPos.getZ() + i, 0, 0, 0); - level.addParticle(ModParticles.APPLYING_GLOWSTONE_PARTICLE.get(), blockPos.getX() + 1, blockPos.getY() + 1, blockPos.getZ() + i, 0, 0, 0); - } - - return ItemInteractionResult.SUCCESS; - } + ItemInteractionResult result = tryApplyGlowstone(itemStackInHand, blockState, level, blockPos, player, hand, glowstone_block); + if (result == ItemInteractionResult.SUCCESS) return result; //Applying Redstone if (itemStackInHand.is(ModItems.REDSTONE_PARTICLES.get()) && !blockState.getBlock().builtInRegistryHolder().unwrapKey().get().toString().contains("redstone")) { @@ -142,53 +106,7 @@ public void tick(BlockState blockState, @NotNull ServerLevel serverLevel, @NotNu level.setBlock(blockPos, redstone_block.get().defaultBlockState(), 3); level.playSound(player, blockPos, SoundEvents.BONE_BLOCK_PLACE, SoundSource.BLOCKS, 1.0F, 1.0F); - for (float i = 0; i <= 1; i += 0.2F) { - level.addParticle(ModParticles.APPLYING_REDSTONE_PARTICLE.get(), blockPos.getX() + i, blockPos.getY(), blockPos.getZ(), 0, 0, 0); - level.addParticle(ModParticles.APPLYING_REDSTONE_PARTICLE.get(), blockPos.getX() + i, blockPos.getY() + 1, blockPos.getZ(), 0, 0, 0); - level.addParticle(ModParticles.APPLYING_REDSTONE_PARTICLE.get(), blockPos.getX(), blockPos.getY() + i, blockPos.getZ(), 0, 0, 0); - level.addParticle(ModParticles.APPLYING_REDSTONE_PARTICLE.get(), blockPos.getX() + 1, blockPos.getY() + i, blockPos.getZ(), 0, 0, 0); - level.addParticle(ModParticles.APPLYING_REDSTONE_PARTICLE.get(), blockPos.getX() + i, blockPos.getY(), blockPos.getZ() + 1, 0, 0, 0); - level.addParticle(ModParticles.APPLYING_REDSTONE_PARTICLE.get(), blockPos.getX() + i, blockPos.getY() + 1, blockPos.getZ() + 1, 0, 0, 0); - level.addParticle(ModParticles.APPLYING_REDSTONE_PARTICLE.get(), blockPos.getX(), blockPos.getY() + i, blockPos.getZ() + 1, 0, 0, 0); - level.addParticle(ModParticles.APPLYING_REDSTONE_PARTICLE.get(), blockPos.getX() + 1, blockPos.getY() + i, blockPos.getZ() + 1, 0, 0, 0); - level.addParticle(ModParticles.APPLYING_REDSTONE_PARTICLE.get(), blockPos.getX(), blockPos.getY(), blockPos.getZ() + i, 0, 0, 0); - level.addParticle(ModParticles.APPLYING_REDSTONE_PARTICLE.get(), blockPos.getX() + 1, blockPos.getY(), blockPos.getZ() + i, 0, 0, 0); - level.addParticle(ModParticles.APPLYING_REDSTONE_PARTICLE.get(), blockPos.getX(), blockPos.getY() + 1, blockPos.getZ() + i, 0, 0, 0); - level.addParticle(ModParticles.APPLYING_REDSTONE_PARTICLE.get(), blockPos.getX() + 1, blockPos.getY() + 1, blockPos.getZ() + i, 0, 0, 0); - } - - return ItemInteractionResult.SUCCESS; - } - - // Removing Glowstone - if (itemStackInHand.is(ModItems.CONFIGURATION_TOOL.get()) && blockState.getBlock().builtInRegistryHolder().unwrapKey().get().toString().contains("enlighted") && KeyBindingUtil.isKeyPressed(ModKeyBindings.REMOVE_GLOWSTONE_CONFIGURATION_TOOL_ACTION)) { - if (!player.isCreative()) { - if (!player.getInventory().add(new ItemStack(ModItems.GLOWSTONE_PARTICLES.get()))) { - ItemEntity itemEntity = new ItemEntity(level, blockPos.getX() + 0.5F, blockPos.getY() + 1.0F, blockPos.getZ() + 0.5F, new ItemStack(ModItems.GLOWSTONE_PARTICLES.get())); - itemEntity.setDefaultPickUpDelay(); - level.addFreshEntity(itemEntity); - } - - itemStackInHand.hurtAndBreak(1, player, hand == InteractionHand.MAIN_HAND ? EquipmentSlot.MAINHAND : EquipmentSlot.OFFHAND); - } - level.setBlock(blockPos, glowstone_block.get().defaultBlockState(), 3); - level.playSound(player, blockPos, SoundEvents.AXE_WAX_OFF, SoundSource.BLOCKS, 1.0F, 1.0F); - level.playSound(player, blockPos, ModSoundEvents.CONFIGURATION_TOOL_USE.get(), SoundSource.BLOCKS, 1.0F, 1.0F); - - for (float i = 0; i <= 1; i += 0.2F) { - level.addParticle(ModParticles.REMOVING_MODIFIER_PARTICLE.get(), blockPos.getX() + i, blockPos.getY(), blockPos.getZ(), 0, 0, 0); - level.addParticle(ModParticles.REMOVING_MODIFIER_PARTICLE.get(), blockPos.getX() + i, blockPos.getY() + 1, blockPos.getZ(), 0, 0, 0); - level.addParticle(ModParticles.REMOVING_MODIFIER_PARTICLE.get(), blockPos.getX(), blockPos.getY() + i, blockPos.getZ(), 0, 0, 0); - level.addParticle(ModParticles.REMOVING_MODIFIER_PARTICLE.get(), blockPos.getX() + 1, blockPos.getY() + i, blockPos.getZ(), 0, 0, 0); - level.addParticle(ModParticles.REMOVING_MODIFIER_PARTICLE.get(), blockPos.getX() + i, blockPos.getY(), blockPos.getZ() + 1, 0, 0, 0); - level.addParticle(ModParticles.REMOVING_MODIFIER_PARTICLE.get(), blockPos.getX() + i, blockPos.getY() + 1, blockPos.getZ() + 1, 0, 0, 0); - level.addParticle(ModParticles.REMOVING_MODIFIER_PARTICLE.get(), blockPos.getX(), blockPos.getY() + i, blockPos.getZ() + 1, 0, 0, 0); - level.addParticle(ModParticles.REMOVING_MODIFIER_PARTICLE.get(), blockPos.getX() + 1, blockPos.getY() + i, blockPos.getZ() + 1, 0, 0, 0); - level.addParticle(ModParticles.REMOVING_MODIFIER_PARTICLE.get(), blockPos.getX(), blockPos.getY(), blockPos.getZ() + i, 0, 0, 0); - level.addParticle(ModParticles.REMOVING_MODIFIER_PARTICLE.get(), blockPos.getX() + 1, blockPos.getY(), blockPos.getZ() + i, 0, 0, 0); - level.addParticle(ModParticles.REMOVING_MODIFIER_PARTICLE.get(), blockPos.getX(), blockPos.getY() + 1, blockPos.getZ() + i, 0, 0, 0); - level.addParticle(ModParticles.REMOVING_MODIFIER_PARTICLE.get(), blockPos.getX() + 1, blockPos.getY() + 1, blockPos.getZ() + i, 0, 0, 0); - } + spawnParticles(ModParticles.APPLYING_REDSTONE_PARTICLE.get(), level, blockPos); return ItemInteractionResult.SUCCESS; } @@ -208,20 +126,7 @@ public void tick(BlockState blockState, @NotNull ServerLevel serverLevel, @NotNu level.playSound(player, blockPos, SoundEvents.BONE_BLOCK_BREAK, SoundSource.BLOCKS, 1.0F, 1.0F); level.playSound(player, blockPos, ModSoundEvents.CONFIGURATION_TOOL_USE.get(), SoundSource.BLOCKS, 1.0F, 1.0F); - for (float i = 0; i <= 1; i += 0.2F) { - level.addParticle(ModParticles.REMOVING_MODIFIER_PARTICLE.get(), blockPos.getX() + i, blockPos.getY(), blockPos.getZ(), 0, 0, 0); - level.addParticle(ModParticles.REMOVING_MODIFIER_PARTICLE.get(), blockPos.getX() + i, blockPos.getY() + 1, blockPos.getZ(), 0, 0, 0); - level.addParticle(ModParticles.REMOVING_MODIFIER_PARTICLE.get(), blockPos.getX(), blockPos.getY() + i, blockPos.getZ(), 0, 0, 0); - level.addParticle(ModParticles.REMOVING_MODIFIER_PARTICLE.get(), blockPos.getX() + 1, blockPos.getY() + i, blockPos.getZ(), 0, 0, 0); - level.addParticle(ModParticles.REMOVING_MODIFIER_PARTICLE.get(), blockPos.getX() + i, blockPos.getY(), blockPos.getZ() + 1, 0, 0, 0); - level.addParticle(ModParticles.REMOVING_MODIFIER_PARTICLE.get(), blockPos.getX() + i, blockPos.getY() + 1, blockPos.getZ() + 1, 0, 0, 0); - level.addParticle(ModParticles.REMOVING_MODIFIER_PARTICLE.get(), blockPos.getX(), blockPos.getY() + i, blockPos.getZ() + 1, 0, 0, 0); - level.addParticle(ModParticles.REMOVING_MODIFIER_PARTICLE.get(), blockPos.getX() + 1, blockPos.getY() + i, blockPos.getZ() + 1, 0, 0, 0); - level.addParticle(ModParticles.REMOVING_MODIFIER_PARTICLE.get(), blockPos.getX(), blockPos.getY(), blockPos.getZ() + i, 0, 0, 0); - level.addParticle(ModParticles.REMOVING_MODIFIER_PARTICLE.get(), blockPos.getX() + 1, blockPos.getY(), blockPos.getZ() + i, 0, 0, 0); - level.addParticle(ModParticles.REMOVING_MODIFIER_PARTICLE.get(), blockPos.getX(), blockPos.getY() + 1, blockPos.getZ() + i, 0, 0, 0); - level.addParticle(ModParticles.REMOVING_MODIFIER_PARTICLE.get(), blockPos.getX() + 1, blockPos.getY() + 1, blockPos.getZ() + i, 0, 0, 0); - } + spawnParticles(ModParticles.REMOVING_MODIFIER_PARTICLE.get(), level, blockPos); return ItemInteractionResult.SUCCESS; diff --git a/src/main/java/de/artemis/laboratoryblocks/common/registration/ModBlocks.java b/src/main/java/de/artemis/laboratoryblocks/common/registration/ModBlocks.java index ca9edd0..1beaedd 100644 --- a/src/main/java/de/artemis/laboratoryblocks/common/registration/ModBlocks.java +++ b/src/main/java/de/artemis/laboratoryblocks/common/registration/ModBlocks.java @@ -16,7 +16,7 @@ public class ModBlocks { private static Supplier register(String name, Supplier block) { - Supplier toReturn = Registration.BLOCKS.register(name, block); + Supplier toReturn = Registration.BLOCKS.register(name, block); Registration.ITEMS.register(name, () -> new BlockItem(toReturn.get(), new Item.Properties())); From 0dd1758032591c21e7eb7483b07b17501eb6c202 Mon Sep 17 00:00:00 2001 From: EnderTurret <36442079+EnderTurret@users.noreply.github.com> Date: Tue, 26 Nov 2024 18:50:50 -0500 Subject: [PATCH 12/16] Fix `ChiseledLaboratoryBookShelf` losing books when applying glowstone. I think this was why the code was commented out, but it's working now. --- .../ChiseledLaboratoryBookShelfBlockEntity.java | 2 +- .../common/blocks/ChiseledLaboratoryBookShelfBlock.java | 9 +++++++-- .../common/registration/ModBlockEntities.java | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/java/de/artemis/laboratoryblocks/common/blockentities/ChiseledLaboratoryBookShelfBlockEntity.java b/src/main/java/de/artemis/laboratoryblocks/common/blockentities/ChiseledLaboratoryBookShelfBlockEntity.java index 84a6fab..b4f6982 100644 --- a/src/main/java/de/artemis/laboratoryblocks/common/blockentities/ChiseledLaboratoryBookShelfBlockEntity.java +++ b/src/main/java/de/artemis/laboratoryblocks/common/blockentities/ChiseledLaboratoryBookShelfBlockEntity.java @@ -7,7 +7,7 @@ import net.minecraft.world.level.block.entity.ChiseledBookShelfBlockEntity; import net.minecraft.world.level.block.state.BlockState; -public class ChiseledLaboratoryBookShelfBlockEntity extends ChiseledBookShelfBlockEntity implements Container { +public class ChiseledLaboratoryBookShelfBlockEntity extends ChiseledBookShelfBlockEntity { public ChiseledLaboratoryBookShelfBlockEntity(BlockPos blockPos, BlockState blockState) { super(blockPos, blockState); diff --git a/src/main/java/de/artemis/laboratoryblocks/common/blocks/ChiseledLaboratoryBookShelfBlock.java b/src/main/java/de/artemis/laboratoryblocks/common/blocks/ChiseledLaboratoryBookShelfBlock.java index 60fecd0..93a36b6 100644 --- a/src/main/java/de/artemis/laboratoryblocks/common/blocks/ChiseledLaboratoryBookShelfBlock.java +++ b/src/main/java/de/artemis/laboratoryblocks/common/blocks/ChiseledLaboratoryBookShelfBlock.java @@ -38,6 +38,12 @@ public BlockState copyState(BlockState oldState, BlockState newState) { .setValue(BlockStateProperties.CHISELED_BOOKSHELF_SLOT_5_OCCUPIED, oldState.getValue(BlockStateProperties.CHISELED_BOOKSHELF_SLOT_5_OCCUPIED)); } + @Override + protected void onRemove(BlockState state, Level level, BlockPos pos, BlockState newState, boolean movedByPiston) { + if (newState.getBlock() instanceof ChiseledLaboratoryBookShelfBlock) return; + super.onRemove(state, level, pos, newState, movedByPiston); + } + @Override protected @NotNull ItemInteractionResult useItemOn(ItemStack itemStackInHand, BlockState blockState, Level level, BlockPos blockPos, Player player, InteractionHand hand, BlockHitResult hitResult) { @@ -49,9 +55,8 @@ public BlockState copyState(BlockState oldState, BlockState newState) { //Vanilla End - /* result = tryApplyGlowstone(itemStackInHand, blockState, level, blockPos, player, hand, block); - */ + return result; } diff --git a/src/main/java/de/artemis/laboratoryblocks/common/registration/ModBlockEntities.java b/src/main/java/de/artemis/laboratoryblocks/common/registration/ModBlockEntities.java index 55ea46e..e5cb38d 100644 --- a/src/main/java/de/artemis/laboratoryblocks/common/registration/ModBlockEntities.java +++ b/src/main/java/de/artemis/laboratoryblocks/common/registration/ModBlockEntities.java @@ -10,7 +10,7 @@ public class ModBlockEntities { public static final Supplier> CHISELED_LABORATORY_BOOKSHELF_BLOCK_ENTITY = Registration.BLOCK_ENTITIES.register("chiseled_laboratory_bookshelf_block_entity", () -> BlockEntityType.Builder.of(ChiseledLaboratoryBookShelfBlockEntity::new, - ModBlocks.CHISELED_LABORATORY_BOOKSHELF.get()).build(null)); + ModBlocks.CHISELED_LABORATORY_BOOKSHELF.get(), ModBlocks.ENLIGHTED_CHISELED_LABORATORY_BOOKSHELF.get()).build(null)); public static void register() { } From cbb214d6eb0beb3f9ea6819c34f83d97b13daefa Mon Sep 17 00:00:00 2001 From: EnderTurret <36442079+EnderTurret@users.noreply.github.com> Date: Tue, 26 Nov 2024 21:07:39 -0500 Subject: [PATCH 13/16] Move keybinds to the `client` package. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `KeyMappings` are client-only — they're not available on the server. --- .../laboratoryblocks/client/event/ClientEvents.java | 2 +- .../registration/ModKeyBindings.java | 2 +- .../ChiseledLaboratoryBookShelfBlockEntity.java | 1 - .../common/blocks/BaseLaboratoryBlock.java | 2 +- .../common/blocks/LaboratoryBlock.java | 10 ---------- .../common/blocks/LaboratoryCarpetBlock.java | 9 --------- .../common/blocks/LaboratoryGlassBlock.java | 9 --------- .../blocks/RedstoneControlledLaboratoryBlock.java | 2 +- .../common/items/ConfigurationToolItem.java | 2 +- 9 files changed, 5 insertions(+), 34 deletions(-) rename src/main/java/de/artemis/laboratoryblocks/{common => client}/registration/ModKeyBindings.java (95%) diff --git a/src/main/java/de/artemis/laboratoryblocks/client/event/ClientEvents.java b/src/main/java/de/artemis/laboratoryblocks/client/event/ClientEvents.java index 4fc09b3..425026d 100644 --- a/src/main/java/de/artemis/laboratoryblocks/client/event/ClientEvents.java +++ b/src/main/java/de/artemis/laboratoryblocks/client/event/ClientEvents.java @@ -1,7 +1,7 @@ package de.artemis.laboratoryblocks.client.event; import de.artemis.laboratoryblocks.LaboratoryBlocks; -import de.artemis.laboratoryblocks.common.registration.ModKeyBindings; +import de.artemis.laboratoryblocks.client.registration.ModKeyBindings; import net.neoforged.api.distmarker.Dist; import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.fml.common.EventBusSubscriber; diff --git a/src/main/java/de/artemis/laboratoryblocks/common/registration/ModKeyBindings.java b/src/main/java/de/artemis/laboratoryblocks/client/registration/ModKeyBindings.java similarity index 95% rename from src/main/java/de/artemis/laboratoryblocks/common/registration/ModKeyBindings.java rename to src/main/java/de/artemis/laboratoryblocks/client/registration/ModKeyBindings.java index b467475..a8c294a 100644 --- a/src/main/java/de/artemis/laboratoryblocks/common/registration/ModKeyBindings.java +++ b/src/main/java/de/artemis/laboratoryblocks/client/registration/ModKeyBindings.java @@ -1,4 +1,4 @@ -package de.artemis.laboratoryblocks.common.registration; +package de.artemis.laboratoryblocks.client.registration; import com.mojang.blaze3d.platform.InputConstants; import de.artemis.laboratoryblocks.LaboratoryBlocks; diff --git a/src/main/java/de/artemis/laboratoryblocks/common/blockentities/ChiseledLaboratoryBookShelfBlockEntity.java b/src/main/java/de/artemis/laboratoryblocks/common/blockentities/ChiseledLaboratoryBookShelfBlockEntity.java index b4f6982..e2f01a7 100644 --- a/src/main/java/de/artemis/laboratoryblocks/common/blockentities/ChiseledLaboratoryBookShelfBlockEntity.java +++ b/src/main/java/de/artemis/laboratoryblocks/common/blockentities/ChiseledLaboratoryBookShelfBlockEntity.java @@ -2,7 +2,6 @@ import de.artemis.laboratoryblocks.common.registration.ModBlockEntities; import net.minecraft.core.BlockPos; -import net.minecraft.world.Container; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.entity.ChiseledBookShelfBlockEntity; import net.minecraft.world.level.block.state.BlockState; diff --git a/src/main/java/de/artemis/laboratoryblocks/common/blocks/BaseLaboratoryBlock.java b/src/main/java/de/artemis/laboratoryblocks/common/blocks/BaseLaboratoryBlock.java index 4aa397e..61daa75 100644 --- a/src/main/java/de/artemis/laboratoryblocks/common/blocks/BaseLaboratoryBlock.java +++ b/src/main/java/de/artemis/laboratoryblocks/common/blocks/BaseLaboratoryBlock.java @@ -2,8 +2,8 @@ import java.util.function.Supplier; +import de.artemis.laboratoryblocks.client.registration.ModKeyBindings; import de.artemis.laboratoryblocks.common.registration.ModItems; -import de.artemis.laboratoryblocks.common.registration.ModKeyBindings; import de.artemis.laboratoryblocks.common.registration.ModParticles; import de.artemis.laboratoryblocks.common.registration.ModSoundEvents; import de.artemis.laboratoryblocks.common.util.KeyBindingUtil; diff --git a/src/main/java/de/artemis/laboratoryblocks/common/blocks/LaboratoryBlock.java b/src/main/java/de/artemis/laboratoryblocks/common/blocks/LaboratoryBlock.java index 258c4b0..c6e2aba 100644 --- a/src/main/java/de/artemis/laboratoryblocks/common/blocks/LaboratoryBlock.java +++ b/src/main/java/de/artemis/laboratoryblocks/common/blocks/LaboratoryBlock.java @@ -1,18 +1,8 @@ package de.artemis.laboratoryblocks.common.blocks; -import de.artemis.laboratoryblocks.common.registration.ModItems; -import de.artemis.laboratoryblocks.common.registration.ModKeyBindings; -import de.artemis.laboratoryblocks.common.registration.ModParticles; -import de.artemis.laboratoryblocks.common.registration.ModSoundEvents; -import de.artemis.laboratoryblocks.common.util.KeyBindingUtil; import net.minecraft.core.BlockPos; -import net.minecraft.core.particles.ParticleOptions; -import net.minecraft.sounds.SoundEvents; -import net.minecraft.sounds.SoundSource; import net.minecraft.world.InteractionHand; import net.minecraft.world.ItemInteractionResult; -import net.minecraft.world.entity.EquipmentSlot; -import net.minecraft.world.entity.item.ItemEntity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; diff --git a/src/main/java/de/artemis/laboratoryblocks/common/blocks/LaboratoryCarpetBlock.java b/src/main/java/de/artemis/laboratoryblocks/common/blocks/LaboratoryCarpetBlock.java index 5947884..d0c1a75 100644 --- a/src/main/java/de/artemis/laboratoryblocks/common/blocks/LaboratoryCarpetBlock.java +++ b/src/main/java/de/artemis/laboratoryblocks/common/blocks/LaboratoryCarpetBlock.java @@ -1,18 +1,9 @@ package de.artemis.laboratoryblocks.common.blocks; -import de.artemis.laboratoryblocks.common.registration.ModItems; -import de.artemis.laboratoryblocks.common.registration.ModKeyBindings; -import de.artemis.laboratoryblocks.common.registration.ModParticles; -import de.artemis.laboratoryblocks.common.registration.ModSoundEvents; -import de.artemis.laboratoryblocks.common.util.KeyBindingUtil; import net.minecraft.core.BlockPos; import net.minecraft.core.particles.ParticleOptions; -import net.minecraft.sounds.SoundEvents; -import net.minecraft.sounds.SoundSource; import net.minecraft.world.InteractionHand; import net.minecraft.world.ItemInteractionResult; -import net.minecraft.world.entity.EquipmentSlot; -import net.minecraft.world.entity.item.ItemEntity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; diff --git a/src/main/java/de/artemis/laboratoryblocks/common/blocks/LaboratoryGlassBlock.java b/src/main/java/de/artemis/laboratoryblocks/common/blocks/LaboratoryGlassBlock.java index 0a03561..0b4d0a5 100644 --- a/src/main/java/de/artemis/laboratoryblocks/common/blocks/LaboratoryGlassBlock.java +++ b/src/main/java/de/artemis/laboratoryblocks/common/blocks/LaboratoryGlassBlock.java @@ -1,17 +1,8 @@ package de.artemis.laboratoryblocks.common.blocks; -import de.artemis.laboratoryblocks.common.registration.ModItems; -import de.artemis.laboratoryblocks.common.registration.ModKeyBindings; -import de.artemis.laboratoryblocks.common.registration.ModParticles; -import de.artemis.laboratoryblocks.common.registration.ModSoundEvents; -import de.artemis.laboratoryblocks.common.util.KeyBindingUtil; import net.minecraft.core.BlockPos; -import net.minecraft.sounds.SoundEvents; -import net.minecraft.sounds.SoundSource; import net.minecraft.world.InteractionHand; import net.minecraft.world.ItemInteractionResult; -import net.minecraft.world.entity.EquipmentSlot; -import net.minecraft.world.entity.item.ItemEntity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; diff --git a/src/main/java/de/artemis/laboratoryblocks/common/blocks/RedstoneControlledLaboratoryBlock.java b/src/main/java/de/artemis/laboratoryblocks/common/blocks/RedstoneControlledLaboratoryBlock.java index 501f737..804b00e 100644 --- a/src/main/java/de/artemis/laboratoryblocks/common/blocks/RedstoneControlledLaboratoryBlock.java +++ b/src/main/java/de/artemis/laboratoryblocks/common/blocks/RedstoneControlledLaboratoryBlock.java @@ -1,7 +1,7 @@ package de.artemis.laboratoryblocks.common.blocks; +import de.artemis.laboratoryblocks.client.registration.ModKeyBindings; import de.artemis.laboratoryblocks.common.registration.ModItems; -import de.artemis.laboratoryblocks.common.registration.ModKeyBindings; import de.artemis.laboratoryblocks.common.registration.ModParticles; import de.artemis.laboratoryblocks.common.registration.ModSoundEvents; import de.artemis.laboratoryblocks.common.util.KeyBindingUtil; diff --git a/src/main/java/de/artemis/laboratoryblocks/common/items/ConfigurationToolItem.java b/src/main/java/de/artemis/laboratoryblocks/common/items/ConfigurationToolItem.java index f49d24c..d8d4199 100644 --- a/src/main/java/de/artemis/laboratoryblocks/common/items/ConfigurationToolItem.java +++ b/src/main/java/de/artemis/laboratoryblocks/common/items/ConfigurationToolItem.java @@ -1,6 +1,6 @@ package de.artemis.laboratoryblocks.common.items; -import de.artemis.laboratoryblocks.common.registration.ModKeyBindings; +import de.artemis.laboratoryblocks.client.registration.ModKeyBindings; import de.artemis.laboratoryblocks.common.util.KeyBindingUtil; import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; From a30cf50ed274f251331cff37cfaa4a97dd775944 Mon Sep 17 00:00:00 2001 From: EnderTurret <36442079+EnderTurret@users.noreply.github.com> Date: Tue, 26 Nov 2024 21:56:52 -0500 Subject: [PATCH 14/16] Fix a likely dedicated server crash involving keybinds. Keybinds are a client concept; the server doesn't know about them, and attempts to use them on the server will cause `NoClassDefFoundError`s (or whatever `Error`/`Exception` the JVM feels like throwing). Instead, the configuration tool now has different modes which can be cycled through by shift-right-clicking. (Also the 'show details' keybind was removed from the configuration tool since it didn't seem very useful to me, and the tooltip method *is* available and used on both sides, contrary to earlier versions of Minecraft.) Also fix redstone-controlled blocks not updating correctly when inverting the redstone state. --- .../73115db2fadf9a5adb458c178689d36af3ada434 | 4 +- .../assets/laboratoryblocks/lang/en_us.json | 10 +-- .../client/event/ClientEvents.java | 4 +- .../client/registration/ModKeyBindings.java | 4 +- .../util/KeyBindingUtil.java | 2 +- .../common/blocks/BaseLaboratoryBlock.java | 5 +- .../RedstoneControlledLaboratoryBlock.java | 11 ++-- .../common/data/LanguageProvider.java | 11 ++-- .../common/items/ConfigurationToolItem.java | 65 +++++++++++++++++-- .../registration/ModDataComponents.java | 19 ++++++ .../common/registration/Registration.java | 4 ++ 11 files changed, 103 insertions(+), 36 deletions(-) rename src/main/java/de/artemis/laboratoryblocks/{common => client}/util/KeyBindingUtil.java (96%) create mode 100644 src/main/java/de/artemis/laboratoryblocks/common/registration/ModDataComponents.java diff --git a/src/generated/resources/.cache/73115db2fadf9a5adb458c178689d36af3ada434 b/src/generated/resources/.cache/73115db2fadf9a5adb458c178689d36af3ada434 index 47da219..60363fd 100644 --- a/src/generated/resources/.cache/73115db2fadf9a5adb458c178689d36af3ada434 +++ b/src/generated/resources/.cache/73115db2fadf9a5adb458c178689d36af3ada434 @@ -1,2 +1,2 @@ -// 1.21.1 2024-11-26T04:25:40.17343013 Languages: en_us for mod: laboratoryblocks -631eef174ba0bc7a8cbc79ab3fe8d865c4a92a8c assets/laboratoryblocks/lang/en_us.json +// 1.21.1 2024-11-26T21:44:20.277142359 Languages: en_us for mod: laboratoryblocks +469f32919fe94d61a47c4fea29c6082e8be46d42 assets/laboratoryblocks/lang/en_us.json diff --git a/src/generated/resources/assets/laboratoryblocks/lang/en_us.json b/src/generated/resources/assets/laboratoryblocks/lang/en_us.json index 702719a..0ec091a 100644 --- a/src/generated/resources/assets/laboratoryblocks/lang/en_us.json +++ b/src/generated/resources/assets/laboratoryblocks/lang/en_us.json @@ -102,9 +102,9 @@ "item.laboratoryblocks.starch": "Starch", "itemGroup.laboratoryblocks": "Artemis' Laboratory Blocks", "keybind.laboratoryblocks.category": "Artemis' Laboratory Blocks", - "keybind.laboratoryblocks.remove_glowstone_configuration_tool_action": "Remove Glowstone with Configuration Tool", - "keybind.laboratoryblocks.remove_redstone_configuration_tool_action": "Remove Redstone with Configuration Tool", - "keybind.laboratoryblocks.show_information": "Show information", - "tooltip.laboratoryblocks.configuration_tool": "Press %s to remove Glowstone Particles and %s Right Click to remove Redstone Particles.", - "tooltip.laboratoryblocks.configuration_tool_preview": "Hold %s for details." + "tooltip.laboratoryblocks.configuration_tool.state.remove_glowstone": "Remove Glowstone", + "tooltip.laboratoryblocks.configuration_tool.state.remove_redstone": "Remove Redstone", + "tooltip.laboratoryblocks.configuration_tool.state.reverse_redstone_control": "Reverse Redstone Control", + "tooltip.laboratoryblocks.configuration_tool_1": "Current mode: %s.", + "tooltip.laboratoryblocks.configuration_tool_2": "Crouch-Right-Click to cycle modes." } \ No newline at end of file diff --git a/src/main/java/de/artemis/laboratoryblocks/client/event/ClientEvents.java b/src/main/java/de/artemis/laboratoryblocks/client/event/ClientEvents.java index 425026d..b21c77b 100644 --- a/src/main/java/de/artemis/laboratoryblocks/client/event/ClientEvents.java +++ b/src/main/java/de/artemis/laboratoryblocks/client/event/ClientEvents.java @@ -12,8 +12,6 @@ public class ClientEvents { @SubscribeEvent public static void onRegisterKeyMappingEvent(RegisterKeyMappingsEvent event) { - event.register(ModKeyBindings.REMOVE_REDSTONE_CONFIGURATION_TOOL_ACTION); - event.register(ModKeyBindings.REMOVE_GLOWSTONE_CONFIGURATION_TOOL_ACTION); - event.register(ModKeyBindings.SHOW_INFORMATION); + //event.register(ModKeyBindings.SHOW_INFORMATION); } } diff --git a/src/main/java/de/artemis/laboratoryblocks/client/registration/ModKeyBindings.java b/src/main/java/de/artemis/laboratoryblocks/client/registration/ModKeyBindings.java index a8c294a..74bcb03 100644 --- a/src/main/java/de/artemis/laboratoryblocks/client/registration/ModKeyBindings.java +++ b/src/main/java/de/artemis/laboratoryblocks/client/registration/ModKeyBindings.java @@ -9,8 +9,6 @@ public class ModKeyBindings { - public static final KeyMapping REMOVE_GLOWSTONE_CONFIGURATION_TOOL_ACTION = new KeyMapping("keybind." + LaboratoryBlocks.MOD_ID + ".remove_glowstone_configuration_tool_action", KeyConflictContext.UNIVERSAL, KeyModifier.NONE, InputConstants.Type.KEYSYM.getOrCreate(GLFW.GLFW_KEY_LEFT_CONTROL), "keybind." + LaboratoryBlocks.MOD_ID + ".category"); - public static final KeyMapping REMOVE_REDSTONE_CONFIGURATION_TOOL_ACTION = new KeyMapping("keybind." + LaboratoryBlocks.MOD_ID + ".remove_redstone_configuration_tool_action", KeyConflictContext.UNIVERSAL, KeyModifier.NONE, InputConstants.Type.KEYSYM.getOrCreate(GLFW.GLFW_KEY_LEFT_ALT), "keybind." + LaboratoryBlocks.MOD_ID + ".category"); - public static final KeyMapping SHOW_INFORMATION = new KeyMapping("keybind." + LaboratoryBlocks.MOD_ID + ".show_information", KeyConflictContext.UNIVERSAL, KeyModifier.NONE, InputConstants.Type.KEYSYM.getOrCreate(GLFW.GLFW_KEY_LEFT_CONTROL), "keybind." + LaboratoryBlocks.MOD_ID + ".category"); + //public static final KeyMapping SHOW_INFORMATION = new KeyMapping("keybind." + LaboratoryBlocks.MOD_ID + ".show_information", KeyConflictContext.UNIVERSAL, KeyModifier.NONE, InputConstants.Type.KEYSYM.getOrCreate(GLFW.GLFW_KEY_LEFT_CONTROL), "keybind." + LaboratoryBlocks.MOD_ID + ".category"); } diff --git a/src/main/java/de/artemis/laboratoryblocks/common/util/KeyBindingUtil.java b/src/main/java/de/artemis/laboratoryblocks/client/util/KeyBindingUtil.java similarity index 96% rename from src/main/java/de/artemis/laboratoryblocks/common/util/KeyBindingUtil.java rename to src/main/java/de/artemis/laboratoryblocks/client/util/KeyBindingUtil.java index 60881a7..9ff7563 100644 --- a/src/main/java/de/artemis/laboratoryblocks/common/util/KeyBindingUtil.java +++ b/src/main/java/de/artemis/laboratoryblocks/client/util/KeyBindingUtil.java @@ -1,4 +1,4 @@ -package de.artemis.laboratoryblocks.common.util; +package de.artemis.laboratoryblocks.client.util; import com.mojang.blaze3d.platform.InputConstants; import net.minecraft.client.KeyMapping; diff --git a/src/main/java/de/artemis/laboratoryblocks/common/blocks/BaseLaboratoryBlock.java b/src/main/java/de/artemis/laboratoryblocks/common/blocks/BaseLaboratoryBlock.java index 61daa75..323c2a0 100644 --- a/src/main/java/de/artemis/laboratoryblocks/common/blocks/BaseLaboratoryBlock.java +++ b/src/main/java/de/artemis/laboratoryblocks/common/blocks/BaseLaboratoryBlock.java @@ -2,11 +2,10 @@ import java.util.function.Supplier; -import de.artemis.laboratoryblocks.client.registration.ModKeyBindings; +import de.artemis.laboratoryblocks.common.items.ConfigurationToolItem; import de.artemis.laboratoryblocks.common.registration.ModItems; import de.artemis.laboratoryblocks.common.registration.ModParticles; import de.artemis.laboratoryblocks.common.registration.ModSoundEvents; -import de.artemis.laboratoryblocks.common.util.KeyBindingUtil; import net.minecraft.core.BlockPos; import net.minecraft.core.particles.ParticleOptions; import net.minecraft.sounds.SoundEvents; @@ -60,7 +59,7 @@ public default ItemInteractionResult tryApplyGlowstone(ItemStack itemStackInHand } // Removing Glowstone - if (itemStackInHand.is(ModItems.CONFIGURATION_TOOL.get()) && blockState.getBlock().builtInRegistryHolder().unwrapKey().get().toString().contains("enlighted") && KeyBindingUtil.isKeyPressed(ModKeyBindings.REMOVE_GLOWSTONE_CONFIGURATION_TOOL_ACTION)) { + if (itemStackInHand.getItem() instanceof ConfigurationToolItem tool && tool.getState(itemStackInHand) == ConfigurationToolItem.State.REMOVE_GLOWSTONE && blockState.getBlock().builtInRegistryHolder().unwrapKey().get().toString().contains("enlighted")) { if (!player.isCreative()) { if (!player.getInventory().add(new ItemStack(ModItems.GLOWSTONE_PARTICLES.get()))) { ItemEntity itemEntity = new ItemEntity(level, blockPos.getX() + 0.5F, blockPos.getY() + 1.0F, blockPos.getZ() + 0.5F, new ItemStack(ModItems.GLOWSTONE_PARTICLES.get())); diff --git a/src/main/java/de/artemis/laboratoryblocks/common/blocks/RedstoneControlledLaboratoryBlock.java b/src/main/java/de/artemis/laboratoryblocks/common/blocks/RedstoneControlledLaboratoryBlock.java index 804b00e..445ad9b 100644 --- a/src/main/java/de/artemis/laboratoryblocks/common/blocks/RedstoneControlledLaboratoryBlock.java +++ b/src/main/java/de/artemis/laboratoryblocks/common/blocks/RedstoneControlledLaboratoryBlock.java @@ -1,10 +1,9 @@ package de.artemis.laboratoryblocks.common.blocks; -import de.artemis.laboratoryblocks.client.registration.ModKeyBindings; +import de.artemis.laboratoryblocks.common.items.ConfigurationToolItem; import de.artemis.laboratoryblocks.common.registration.ModItems; import de.artemis.laboratoryblocks.common.registration.ModParticles; import de.artemis.laboratoryblocks.common.registration.ModSoundEvents; -import de.artemis.laboratoryblocks.common.util.KeyBindingUtil; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundEvents; @@ -71,7 +70,7 @@ public void tick(BlockState blockState, @NotNull ServerLevel serverLevel, @NotNu shouldBePowered = !shouldBePowered; } - if (blockState.getValue(POWERED) && !shouldBePowered) { + if (blockState.getValue(POWERED) != shouldBePowered) { serverLevel.setBlock(blockPos, blockState.cycle(POWERED), 2); } } @@ -79,10 +78,10 @@ public void tick(BlockState blockState, @NotNull ServerLevel serverLevel, @NotNu @SuppressWarnings("deprecation") @Override protected @NotNull ItemInteractionResult useItemOn(ItemStack itemStackInHand, BlockState blockState, Level level, BlockPos blockPos, Player player, InteractionHand hand, BlockHitResult hitResult) { - if (itemStackInHand.is(ModItems.GLOWSTONE_PARTICLES.get()) || itemStackInHand.is(ModItems.CONFIGURATION_TOOL.get()) || itemStackInHand.is(ModItems.REDSTONE_PARTICLES.get())) { + { // Reversing Redstone Control - if (itemStackInHand.is(ModItems.CONFIGURATION_TOOL.get()) && blockState.getBlock().builtInRegistryHolder().unwrapKey().get().toString().contains("redstone")) { + if (itemStackInHand.getItem() instanceof ConfigurationToolItem tool && tool.getState(itemStackInHand) == ConfigurationToolItem.State.REVERSE_REDSTONE_CONTROL && blockState.getBlock().builtInRegistryHolder().unwrapKey().get().toString().contains("redstone")) { level.setBlock(blockPos, blockState.cycle(INVERTED), 2); level.scheduleTick(blockPos, this, 4); level.blockUpdated(blockPos, blockState.getBlock()); @@ -112,7 +111,7 @@ public void tick(BlockState blockState, @NotNull ServerLevel serverLevel, @NotNu } // Removing Redstone - if (itemStackInHand.is(ModItems.CONFIGURATION_TOOL.get()) && blockState.getBlock().builtInRegistryHolder().unwrapKey().get().toString().contains("redstone") && KeyBindingUtil.isKeyPressed(ModKeyBindings.REMOVE_REDSTONE_CONFIGURATION_TOOL_ACTION)) { + if (itemStackInHand.getItem() instanceof ConfigurationToolItem tool && tool.getState(itemStackInHand) == ConfigurationToolItem.State.REMOVE_REDSTONE && blockState.getBlock().builtInRegistryHolder().unwrapKey().get().toString().contains("redstone")) { if (!player.isCreative()) { if (!player.getInventory().add(new ItemStack(ModItems.REDSTONE_PARTICLES.get()))) { ItemEntity itemEntity = new ItemEntity(level, blockPos.getX() + 0.5F, blockPos.getY() + 1.0F, blockPos.getZ() + 0.5F, new ItemStack(ModItems.REDSTONE_PARTICLES.get())); diff --git a/src/main/java/de/artemis/laboratoryblocks/common/data/LanguageProvider.java b/src/main/java/de/artemis/laboratoryblocks/common/data/LanguageProvider.java index 353f1a7..2301055 100644 --- a/src/main/java/de/artemis/laboratoryblocks/common/data/LanguageProvider.java +++ b/src/main/java/de/artemis/laboratoryblocks/common/data/LanguageProvider.java @@ -15,12 +15,11 @@ protected void addTranslations() { add("itemGroup.laboratoryblocks", "Artemis' Laboratory Blocks"); add("keybind.laboratoryblocks.category", "Artemis' Laboratory Blocks"); - add("tooltip.laboratoryblocks.configuration_tool", "Press %s to remove Glowstone Particles and %s Right Click to remove Redstone Particles."); - add("tooltip.laboratoryblocks.configuration_tool_preview", "Hold %s for details."); - - add("keybind.laboratoryblocks.remove_redstone_configuration_tool_action", "Remove Redstone with Configuration Tool"); - add("keybind.laboratoryblocks.remove_glowstone_configuration_tool_action", "Remove Glowstone with Configuration Tool"); - add("keybind.laboratoryblocks.show_information", "Show information"); + add("tooltip.laboratoryblocks.configuration_tool_1", "Current mode: %s."); + add("tooltip.laboratoryblocks.configuration_tool_2", "Crouch-Right-Click to cycle modes."); + add("tooltip.laboratoryblocks.configuration_tool.state.remove_glowstone", "Remove Glowstone"); + add("tooltip.laboratoryblocks.configuration_tool.state.remove_redstone", "Remove Redstone"); + add("tooltip.laboratoryblocks.configuration_tool.state.reverse_redstone_control", "Reverse Redstone Control"); add(ModItems.STARCH.get(), "Starch"); add(ModItems.COMPRESSED_STARCH.get(), "Compressed Starch"); diff --git a/src/main/java/de/artemis/laboratoryblocks/common/items/ConfigurationToolItem.java b/src/main/java/de/artemis/laboratoryblocks/common/items/ConfigurationToolItem.java index d8d4199..f2fbc08 100644 --- a/src/main/java/de/artemis/laboratoryblocks/common/items/ConfigurationToolItem.java +++ b/src/main/java/de/artemis/laboratoryblocks/common/items/ConfigurationToolItem.java @@ -1,29 +1,80 @@ package de.artemis.laboratoryblocks.common.items; -import de.artemis.laboratoryblocks.client.registration.ModKeyBindings; -import de.artemis.laboratoryblocks.common.util.KeyBindingUtil; +import de.artemis.laboratoryblocks.common.registration.ModDataComponents; +import io.netty.buffer.ByteBuf; import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.Style; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.util.StringRepresentable; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResultHolder; +import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; +import net.minecraft.world.level.Level; import org.jetbrains.annotations.NotNull; import java.util.List; +import com.mojang.serialization.Codec; + public class ConfigurationToolItem extends Item { public ConfigurationToolItem(Properties properties) { super(properties); } + public State getState(ItemStack stack) { + return stack.getOrDefault(ModDataComponents.CONFIGURATION_TOOL_STATE, State.REMOVE_GLOWSTONE); + } + @Override - public void appendHoverText(@NotNull ItemStack itemStack, @NotNull TooltipContext context, @NotNull List tooltip, @NotNull TooltipFlag flag) { - if (KeyBindingUtil.isKeyPressed(ModKeyBindings.SHOW_INFORMATION)) { - tooltip.add(Component.translatable("tooltip.laboratoryblocks.configuration_tool", Component.literal(ModKeyBindings.REMOVE_GLOWSTONE_CONFIGURATION_TOOL_ACTION.getKey().getDisplayName().getString()).withStyle(Style.EMPTY.withColor(0x549CFC)), Component.literal(ModKeyBindings.REMOVE_REDSTONE_CONFIGURATION_TOOL_ACTION.getKey().getDisplayName().getString()).withStyle(Style.EMPTY.withColor(0x549CFC))).withStyle(ChatFormatting.GRAY)); - } else { - tooltip.add(Component.translatable("tooltip.laboratoryblocks.configuration_tool_preview", Component.literal(ModKeyBindings.REMOVE_GLOWSTONE_CONFIGURATION_TOOL_ACTION.getKey().getDisplayName().getString()).withStyle(Style.EMPTY.withColor(0x549CFC))).withStyle(ChatFormatting.GRAY)); + public InteractionResultHolder use(Level level, Player player, InteractionHand usedHand) { + ItemStack usedStack = player.getItemInHand(usedHand); + + if (player.isCrouching()) { + usedStack.set(ModDataComponents.CONFIGURATION_TOOL_STATE, getState(usedStack).next()); + return InteractionResultHolder.success(usedStack); } + return InteractionResultHolder.pass(usedStack); + } + + @Override + public void appendHoverText(@NotNull ItemStack itemStack, @NotNull TooltipContext context, @NotNull List tooltip, @NotNull TooltipFlag flag) { + tooltip.add(Component.translatable("tooltip.laboratoryblocks.configuration_tool_1", Component.translatable("tooltip.laboratoryblocks.configuration_tool.state." + getState(itemStack).serializedName).withStyle(Style.EMPTY.withColor(0x549CFC))).withStyle(ChatFormatting.GRAY)); + tooltip.add(Component.translatable("tooltip.laboratoryblocks.configuration_tool_2").withStyle(ChatFormatting.GRAY)); + super.appendHoverText(itemStack, context, tooltip, flag); } + + public static enum State implements StringRepresentable { + + REMOVE_GLOWSTONE("remove_glowstone"), + REMOVE_REDSTONE("remove_redstone"), + REVERSE_REDSTONE_CONTROL("reverse_redstone_control"); + + public static final Codec CODEC = StringRepresentable.fromValues(State::values); + public static final StreamCodec STREAM_CODEC = ByteBufCodecs.VAR_INT.map(id -> State.values()[id], State::ordinal); + + private final String serializedName; + + private State(String serializedName) { + this.serializedName = serializedName; + } + + public State next() { + return switch (this) { + case REMOVE_GLOWSTONE -> REMOVE_REDSTONE; + case REMOVE_REDSTONE -> REVERSE_REDSTONE_CONTROL; + case REVERSE_REDSTONE_CONTROL -> REMOVE_GLOWSTONE; + }; + } + + @Override + public String getSerializedName() { + return serializedName; + } + } } diff --git a/src/main/java/de/artemis/laboratoryblocks/common/registration/ModDataComponents.java b/src/main/java/de/artemis/laboratoryblocks/common/registration/ModDataComponents.java new file mode 100644 index 0000000..28ec7a2 --- /dev/null +++ b/src/main/java/de/artemis/laboratoryblocks/common/registration/ModDataComponents.java @@ -0,0 +1,19 @@ +package de.artemis.laboratoryblocks.common.registration; + +import static de.artemis.laboratoryblocks.common.registration.Registration.DATA_COMPONENTS; + +import de.artemis.laboratoryblocks.common.items.ConfigurationToolItem; +import net.minecraft.core.component.DataComponentType; +import net.neoforged.neoforge.registries.DeferredHolder; + +public class ModDataComponents { + + public static final DeferredHolder, DataComponentType> CONFIGURATION_TOOL_STATE = DATA_COMPONENTS.register("configuration_tool_state", + () -> DataComponentType.builder() + .persistent(ConfigurationToolItem.State.CODEC) + .networkSynchronized(ConfigurationToolItem.State.STREAM_CODEC) + .build()); + + public static void register() { + } +} diff --git a/src/main/java/de/artemis/laboratoryblocks/common/registration/Registration.java b/src/main/java/de/artemis/laboratoryblocks/common/registration/Registration.java index c90d020..c5e24cc 100644 --- a/src/main/java/de/artemis/laboratoryblocks/common/registration/Registration.java +++ b/src/main/java/de/artemis/laboratoryblocks/common/registration/Registration.java @@ -1,6 +1,7 @@ package de.artemis.laboratoryblocks.common.registration; import de.artemis.laboratoryblocks.LaboratoryBlocks; +import net.minecraft.core.component.DataComponentType; import net.minecraft.core.particles.ParticleType; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.sounds.SoundEvent; @@ -18,6 +19,7 @@ public class Registration { public static final DeferredRegister> PARTICLE_TYPES = DeferredRegister.create(BuiltInRegistries.PARTICLE_TYPE, LaboratoryBlocks.MOD_ID); public static final DeferredRegister CREATIVE_MODE_TABS = DeferredRegister.create(BuiltInRegistries.CREATIVE_MODE_TAB, LaboratoryBlocks.MOD_ID); public static final DeferredRegister> BLOCK_ENTITIES = DeferredRegister.create(BuiltInRegistries.BLOCK_ENTITY_TYPE, LaboratoryBlocks.MOD_ID); + public static final DeferredRegister> DATA_COMPONENTS = DeferredRegister.create(BuiltInRegistries.DATA_COMPONENT_TYPE, LaboratoryBlocks.MOD_ID); public static void register(IEventBus eventBus) { BLOCKS.register(eventBus); @@ -26,6 +28,7 @@ public static void register(IEventBus eventBus) { PARTICLE_TYPES.register(eventBus); CREATIVE_MODE_TABS.register(eventBus); BLOCK_ENTITIES.register(eventBus); + DATA_COMPONENTS.register(eventBus); ModBlocks.register(); ModItems.register(); @@ -33,5 +36,6 @@ public static void register(IEventBus eventBus) { ModParticles.register(); ModCreativeModeTabs.register(); ModBlockEntities.register(); + ModDataComponents.register(); } } \ No newline at end of file From 98d32cc040a54f55feebcb22b131ef057f0e062a Mon Sep 17 00:00:00 2001 From: EnderTurret <36442079+EnderTurret@users.noreply.github.com> Date: Tue, 26 Nov 2024 22:43:16 -0500 Subject: [PATCH 15/16] Fix tags, move some recipes that were in the wrong namespace. --- .../9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e | 16 ++++++++-------- .../f751b48f3773cf4dc85aeb52cf48d6ac806b7c33 | 4 ++-- .../f95c7003282837dabaa33e3ffceec4e6865b5218 | 8 ++++---- ..._vent_connecting_and_glowstone_particles.json | 4 ++-- ...glowstone_dust_from_glowstone_particles.json} | 4 ++-- .../redstone_dust_from_redstone_particles.json} | 4 ++-- .../enlighted_laboratory_vent_connecting.json | 2 +- ..._vent_connecting_and_glowstone_particles.json | 0 ...glowstone_dust_from_glowstone_particles.json} | 0 .../redstone_dust_from_redstone_particles.json} | 0 .../tags/{items => item}/starch_ingredient.json | 0 .../enchantment_power_provider.json | 0 .../tags/{blocks => block}/mineable/axe.json | 0 .../tags/{blocks => block}/mineable/pickaxe.json | 0 .../common/data/RecipesProvider.java | 8 ++++---- .../common/data/TagsProvider.java | 4 ++-- 16 files changed, 27 insertions(+), 27 deletions(-) rename src/generated/resources/data/{minecraft => laboratoryblocks}/advancement/recipes/building_blocks/enlighted_laboratory_vent_connecting_from_laboratory_vent_connecting_and_glowstone_particles.json (76%) rename src/generated/resources/data/{minecraft/advancement/recipes/misc/glowstone_dust.json => laboratoryblocks/advancement/recipes/misc/glowstone_dust_from_glowstone_particles.json} (78%) rename src/generated/resources/data/{minecraft/advancement/recipes/misc/from_redstone_particles.json => laboratoryblocks/advancement/recipes/misc/redstone_dust_from_redstone_particles.json} (79%) rename src/generated/resources/data/{minecraft => laboratoryblocks}/recipe/enlighted_laboratory_vent_connecting_from_laboratory_vent_connecting_and_glowstone_particles.json (100%) rename src/generated/resources/data/{minecraft/recipe/glowstone_dust.json => laboratoryblocks/recipe/glowstone_dust_from_glowstone_particles.json} (100%) rename src/generated/resources/data/{minecraft/recipe/from_redstone_particles.json => laboratoryblocks/recipe/redstone_dust_from_redstone_particles.json} (100%) rename src/generated/resources/data/laboratoryblocks/tags/{items => item}/starch_ingredient.json (100%) rename src/generated/resources/data/minecraft/tags/{blocks => block}/enchantment_power_provider.json (100%) rename src/generated/resources/data/minecraft/tags/{blocks => block}/mineable/axe.json (100%) rename src/generated/resources/data/minecraft/tags/{blocks => block}/mineable/pickaxe.json (100%) diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e index 19a9789..3a26652 100644 --- a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e +++ b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e @@ -1,4 +1,4 @@ -// 1.21.1 2024-11-26T04:25:40.171390455 Recipes +// 1.21.1 2024-11-26T22:40:22.802290306 Recipes 4dfe63a8176fd392ad0f0647c7ba1ed8204c7907 data/laboratoryblocks/advancement/recipes/building_blocks/acacia_laboratory_floor.json 82e70b1fb1ac6e62b11e927493713bbfc6cc33e5 data/laboratoryblocks/advancement/recipes/building_blocks/acacia_laboratory_tiles.json 87eecb03bdb370dfa7982f9789ca495d7d9d894c data/laboratoryblocks/advancement/recipes/building_blocks/bamboo_laboratory_floor.json @@ -40,6 +40,7 @@ f2aed2edfcb3cee112527aa73002c7efcc453209 data/laboratoryblocks/advancement/recip 2a7d724e34c4d3d1bce7ad408bb28c752560db4d data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_laboratory_tiles.json 0651ebeee2a858f6d3f811759cd1cd1d215dd9aa data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_laboratory_vent.json ad68559264f605bd96297abddef526b611c71641 data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_laboratory_vent_connecting.json +6bfbca47dd0a46627b0d4fff7568f6d92a6ab85c data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_laboratory_vent_connecting_from_laboratory_vent_connecting_and_glowstone_particles.json 0d2b274048d4d4238d12c4c7b3df5c1844dc8494 data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_left-faced_blue_signaling_laboratory_block.json 666039c6f554f6f7bae9384c49425ab14e0cf50b data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_left-faced_green_signaling_laboratory_block.json 91064285b504d7764ebc9c687dd5a40e3879eb69 data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_left-faced_red_signaling_laboratory_block.json @@ -95,9 +96,11 @@ edbc73181961538803d58b88a05ebcf86e830903 data/laboratoryblocks/advancement/recip 6e25042f7ad53a61cfcc47ddb76b0874df16810a data/laboratoryblocks/advancement/recipes/building_blocks/warped_laboratory_tiles.json da7dd4feab7cd796d2d710dd8933cf12dec38392 data/laboratoryblocks/advancement/recipes/misc/compressed_starch.json cc1e4ec045d35468bd68f5feae60f676514865f9 data/laboratoryblocks/advancement/recipes/misc/configuration_tool.json +7125076f1bac0ade68eca6937535130d5fad84b3 data/laboratoryblocks/advancement/recipes/misc/glowstone_dust_from_glowstone_particles.json c0db8f7a9f9ae121e60ac3757c17af81f0514d6f data/laboratoryblocks/advancement/recipes/misc/glowstone_particles.json 1ff832817e5e3d013439a2eff4433465e279f4b2 data/laboratoryblocks/advancement/recipes/misc/iron_screw.json ba720c8af55706b19deeb7f36f9038a9692d4142 data/laboratoryblocks/advancement/recipes/misc/pla_sheets.json +c6c6e55d7f065b902569eda4e204d9d3b2509ae8 data/laboratoryblocks/advancement/recipes/misc/redstone_dust_from_redstone_particles.json 2cf908e2834b16cf5cf79cb00b68039c360052d5 data/laboratoryblocks/advancement/recipes/misc/redstone_particles.json b7f4a38abf51771eb55cc3d0e95d413754efd8a9 data/laboratoryblocks/advancement/recipes/misc/starch.json 48d78a655eb18e012b61ad68c82b9246726ef259 data/laboratoryblocks/recipe/acacia_laboratory_floor.json @@ -142,7 +145,8 @@ d4a69ce5a86f490be0e64454fdbd8da07e1ee01a data/laboratoryblocks/recipe/enlighted_ 8c1e3c4c9d7a7b0fea3a542b949cd98da8b1ab65 data/laboratoryblocks/recipe/enlighted_laboratory_pillar.json 4c3361955c2be3f96ca77862d29924e9f81751cc data/laboratoryblocks/recipe/enlighted_laboratory_tiles.json 8c9a7a84faaf6e03b4dd65f7fdf101e9cdf9fa9b data/laboratoryblocks/recipe/enlighted_laboratory_vent.json -1f051e285cee8a40be7788e494b73e6c423dd0fd data/laboratoryblocks/recipe/enlighted_laboratory_vent_connecting.json +c2b64dc0eee79a571a39edfb040967fc9725c483 data/laboratoryblocks/recipe/enlighted_laboratory_vent_connecting.json +58e258fada29787bd5d157ce67e48b146329eee0 data/laboratoryblocks/recipe/enlighted_laboratory_vent_connecting_from_laboratory_vent_connecting_and_glowstone_particles.json eee609722448506ecba0c037748eb5060df2fb45 data/laboratoryblocks/recipe/enlighted_left-faced_blue_signaling_laboratory_block.json 14b325a1b900e6c668aad975a89920780d35aadf data/laboratoryblocks/recipe/enlighted_left-faced_green_signaling_laboratory_block.json 49874e0da010b828aed07f7ede80c42eba2da283 data/laboratoryblocks/recipe/enlighted_left-faced_red_signaling_laboratory_block.json @@ -163,6 +167,7 @@ f040a1471dee0473eeabd7988eef62c1198b7fe8 data/laboratoryblocks/recipe/enlighted_ 4f88ffcf99b5cbc6335be2bdb0a4a4ae6efbda85 data/laboratoryblocks/recipe/enlighted_tiled_pla_flooring.json b3429b72579287617d5fee2bc869a44f7c0e9e41 data/laboratoryblocks/recipe/enlighted_warped_laboratory_floor.json 79d4d9595c0c1f3efba6ee72cceb9c15c7183812 data/laboratoryblocks/recipe/enlighted_warped_laboratory_tiles.json +07e98276bead92dd4a7f10032e7e5f25048c9b32 data/laboratoryblocks/recipe/glowstone_dust_from_glowstone_particles.json f258ad93d88cececd7cddf8c2a7a12f93e6622f8 data/laboratoryblocks/recipe/glowstone_particles.json 67c0b189c80be5f8e22af8e62742d3dff31dc31d data/laboratoryblocks/recipe/gray_laboratory_pillar.json 1f0cab99c3229e61463fb0c6392ff2c9a7f77e91 data/laboratoryblocks/recipe/gray_laboratory_tiles.json @@ -190,6 +195,7 @@ c53e5c0a4310c55ef9da24816b56331202a448ab data/laboratoryblocks/recipe/pla_block. ea0e467ff0334a0a67525e1a71f79783b17e3dd3 data/laboratoryblocks/recipe/pla_flooring.json c179ee76049421675a08e4280f76e24599abdabf data/laboratoryblocks/recipe/pla_sheets.json f02e7486fec5da4aba95c0d734e260c0fb340358 data/laboratoryblocks/recipe/pla_tiles.json +4b81e6aa97a5651a58289bcf85d81784b1abb30f data/laboratoryblocks/recipe/redstone_dust_from_redstone_particles.json 3b8b66199fe9971a1aeb478490c239d8c83029f0 data/laboratoryblocks/recipe/redstone_particles.json c99b53f5433b302ed3965d3996618ed00ccb9712 data/laboratoryblocks/recipe/right-faced_blue_signaling_laboratory_block.json 8d3c6bcd266603d9e79020b9f75878fc8658d27f data/laboratoryblocks/recipe/right-faced_green_signaling_laboratory_block.json @@ -201,9 +207,3 @@ ee9176cc44b6e580ea56151f50835f067a05d9dd data/laboratoryblocks/recipe/spruce_lab 99b3a5f70a499fa593202b851354f1eeeaa3e757 data/laboratoryblocks/recipe/tiled_pla_flooring.json d3b7c2a90fd810adf644585b68127a92e6dd7cbf data/laboratoryblocks/recipe/warped_laboratory_floor.json ab8588d7b727955e877f1754a1b377a1402dfe79 data/laboratoryblocks/recipe/warped_laboratory_tiles.json -53370893805f4d68d7ca2d72f9d087015f2eecf8 data/minecraft/advancement/recipes/building_blocks/enlighted_laboratory_vent_connecting_from_laboratory_vent_connecting_and_glowstone_particles.json -66bacfd548b41f38ab09f9e94b87ce688a07f4b6 data/minecraft/advancement/recipes/misc/from_redstone_particles.json -ea1878c64b4152ea0521a332bb58eb850e71f73d data/minecraft/advancement/recipes/misc/glowstone_dust.json -58e258fada29787bd5d157ce67e48b146329eee0 data/minecraft/recipe/enlighted_laboratory_vent_connecting_from_laboratory_vent_connecting_and_glowstone_particles.json -4b81e6aa97a5651a58289bcf85d81784b1abb30f data/minecraft/recipe/from_redstone_particles.json -07e98276bead92dd4a7f10032e7e5f25048c9b32 data/minecraft/recipe/glowstone_dust.json diff --git a/src/generated/resources/.cache/f751b48f3773cf4dc85aeb52cf48d6ac806b7c33 b/src/generated/resources/.cache/f751b48f3773cf4dc85aeb52cf48d6ac806b7c33 index a18352f..3ce031c 100644 --- a/src/generated/resources/.cache/f751b48f3773cf4dc85aeb52cf48d6ac806b7c33 +++ b/src/generated/resources/.cache/f751b48f3773cf4dc85aeb52cf48d6ac806b7c33 @@ -1,2 +1,2 @@ -// 1.21.1 2024-11-26T04:25:40.172202466 Item tags -18466411c3d10dab4e780625d1b26804786bcafe data/laboratoryblocks/tags/items/starch_ingredient.json +// 1.21.1 2024-11-26T22:40:22.804142645 Item tags +18466411c3d10dab4e780625d1b26804786bcafe data/laboratoryblocks/tags/item/starch_ingredient.json diff --git a/src/generated/resources/.cache/f95c7003282837dabaa33e3ffceec4e6865b5218 b/src/generated/resources/.cache/f95c7003282837dabaa33e3ffceec4e6865b5218 index a26d90c..0a26453 100644 --- a/src/generated/resources/.cache/f95c7003282837dabaa33e3ffceec4e6865b5218 +++ b/src/generated/resources/.cache/f95c7003282837dabaa33e3ffceec4e6865b5218 @@ -1,4 +1,4 @@ -// 1.21.1 2024-11-26T04:25:40.169440136 Block tags -f21974f84055bb49768b83efad1e6b907f60ede3 data/minecraft/tags/blocks/enchantment_power_provider.json -f2b017a5219760ee54cbc09f61a3c76ca456b52d data/minecraft/tags/blocks/mineable/axe.json -76b45cff44678f533784c659a7a999ce73b040d8 data/minecraft/tags/blocks/mineable/pickaxe.json +// 1.21.1 2024-11-26T22:40:22.801498215 Block tags +f21974f84055bb49768b83efad1e6b907f60ede3 data/minecraft/tags/block/enchantment_power_provider.json +f2b017a5219760ee54cbc09f61a3c76ca456b52d data/minecraft/tags/block/mineable/axe.json +76b45cff44678f533784c659a7a999ce73b040d8 data/minecraft/tags/block/mineable/pickaxe.json diff --git a/src/generated/resources/data/minecraft/advancement/recipes/building_blocks/enlighted_laboratory_vent_connecting_from_laboratory_vent_connecting_and_glowstone_particles.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_laboratory_vent_connecting_from_laboratory_vent_connecting_and_glowstone_particles.json similarity index 76% rename from src/generated/resources/data/minecraft/advancement/recipes/building_blocks/enlighted_laboratory_vent_connecting_from_laboratory_vent_connecting_and_glowstone_particles.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_laboratory_vent_connecting_from_laboratory_vent_connecting_and_glowstone_particles.json index 287131d..6b83cc7 100644 --- a/src/generated/resources/data/minecraft/advancement/recipes/building_blocks/enlighted_laboratory_vent_connecting_from_laboratory_vent_connecting_and_glowstone_particles.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/building_blocks/enlighted_laboratory_vent_connecting_from_laboratory_vent_connecting_and_glowstone_particles.json @@ -23,7 +23,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "minecraft:enlighted_laboratory_vent_connecting_from_laboratory_vent_connecting_and_glowstone_particles" + "recipe": "laboratoryblocks:enlighted_laboratory_vent_connecting_from_laboratory_vent_connecting_and_glowstone_particles" }, "trigger": "minecraft:recipe_unlocked" } @@ -37,7 +37,7 @@ ], "rewards": { "recipes": [ - "minecraft:enlighted_laboratory_vent_connecting_from_laboratory_vent_connecting_and_glowstone_particles" + "laboratoryblocks:enlighted_laboratory_vent_connecting_from_laboratory_vent_connecting_and_glowstone_particles" ] } } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancement/recipes/misc/glowstone_dust.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/misc/glowstone_dust_from_glowstone_particles.json similarity index 78% rename from src/generated/resources/data/minecraft/advancement/recipes/misc/glowstone_dust.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/misc/glowstone_dust_from_glowstone_particles.json index bae0cff..759fb64 100644 --- a/src/generated/resources/data/minecraft/advancement/recipes/misc/glowstone_dust.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/misc/glowstone_dust_from_glowstone_particles.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "minecraft:glowstone_dust" + "recipe": "laboratoryblocks:glowstone_dust_from_glowstone_particles" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "minecraft:glowstone_dust" + "laboratoryblocks:glowstone_dust_from_glowstone_particles" ] } } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancement/recipes/misc/from_redstone_particles.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/misc/redstone_dust_from_redstone_particles.json similarity index 79% rename from src/generated/resources/data/minecraft/advancement/recipes/misc/from_redstone_particles.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/misc/redstone_dust_from_redstone_particles.json index 6ae1566..a1746e0 100644 --- a/src/generated/resources/data/minecraft/advancement/recipes/misc/from_redstone_particles.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/misc/redstone_dust_from_redstone_particles.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "minecraft:from_redstone_particles" + "recipe": "laboratoryblocks:redstone_dust_from_redstone_particles" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "minecraft:from_redstone_particles" + "laboratoryblocks:redstone_dust_from_redstone_particles" ] } } \ No newline at end of file diff --git a/src/generated/resources/data/laboratoryblocks/recipe/enlighted_laboratory_vent_connecting.json b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_laboratory_vent_connecting.json index c1a0c2b..fb6810e 100644 --- a/src/generated/resources/data/laboratoryblocks/recipe/enlighted_laboratory_vent_connecting.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_laboratory_vent_connecting.json @@ -3,7 +3,7 @@ "category": "building", "ingredients": [ { - "item": "laboratoryblocks:enlighted_laboratory_vent_connecting" + "item": "laboratoryblocks:enlighted_laboratory_vent" } ], "result": { diff --git a/src/generated/resources/data/minecraft/recipe/enlighted_laboratory_vent_connecting_from_laboratory_vent_connecting_and_glowstone_particles.json b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_laboratory_vent_connecting_from_laboratory_vent_connecting_and_glowstone_particles.json similarity index 100% rename from src/generated/resources/data/minecraft/recipe/enlighted_laboratory_vent_connecting_from_laboratory_vent_connecting_and_glowstone_particles.json rename to src/generated/resources/data/laboratoryblocks/recipe/enlighted_laboratory_vent_connecting_from_laboratory_vent_connecting_and_glowstone_particles.json diff --git a/src/generated/resources/data/minecraft/recipe/glowstone_dust.json b/src/generated/resources/data/laboratoryblocks/recipe/glowstone_dust_from_glowstone_particles.json similarity index 100% rename from src/generated/resources/data/minecraft/recipe/glowstone_dust.json rename to src/generated/resources/data/laboratoryblocks/recipe/glowstone_dust_from_glowstone_particles.json diff --git a/src/generated/resources/data/minecraft/recipe/from_redstone_particles.json b/src/generated/resources/data/laboratoryblocks/recipe/redstone_dust_from_redstone_particles.json similarity index 100% rename from src/generated/resources/data/minecraft/recipe/from_redstone_particles.json rename to src/generated/resources/data/laboratoryblocks/recipe/redstone_dust_from_redstone_particles.json diff --git a/src/generated/resources/data/laboratoryblocks/tags/items/starch_ingredient.json b/src/generated/resources/data/laboratoryblocks/tags/item/starch_ingredient.json similarity index 100% rename from src/generated/resources/data/laboratoryblocks/tags/items/starch_ingredient.json rename to src/generated/resources/data/laboratoryblocks/tags/item/starch_ingredient.json diff --git a/src/generated/resources/data/minecraft/tags/blocks/enchantment_power_provider.json b/src/generated/resources/data/minecraft/tags/block/enchantment_power_provider.json similarity index 100% rename from src/generated/resources/data/minecraft/tags/blocks/enchantment_power_provider.json rename to src/generated/resources/data/minecraft/tags/block/enchantment_power_provider.json diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json b/src/generated/resources/data/minecraft/tags/block/mineable/axe.json similarity index 100% rename from src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json rename to src/generated/resources/data/minecraft/tags/block/mineable/axe.json diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json similarity index 100% rename from src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json rename to src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json diff --git a/src/main/java/de/artemis/laboratoryblocks/common/data/RecipesProvider.java b/src/main/java/de/artemis/laboratoryblocks/common/data/RecipesProvider.java index 5f68a5a..67511a0 100644 --- a/src/main/java/de/artemis/laboratoryblocks/common/data/RecipesProvider.java +++ b/src/main/java/de/artemis/laboratoryblocks/common/data/RecipesProvider.java @@ -29,9 +29,9 @@ protected void buildRecipes(@NotNull RecipeOutput consumer) { SimpleCookingRecipeBuilder.smelting(Ingredient.of(ModItems.COMPRESSED_STARCH.get()), RecipeCategory.MISC, ModItems.PLA_SHEETS.get().asItem(), 0.35F, 200).unlockedBy("has_compressed_starch", has(ModItems.COMPRESSED_STARCH.get())).save(consumer); ShapedRecipeBuilder.shaped(RecipeCategory.MISC, ModItems.IRON_SCREW.get(), 16).define('A', Items.IRON_NUGGET).define('B', Items.IRON_INGOT).pattern("ABA").pattern(" A ").unlockedBy("has_iron_nugget", has(Items.IRON_NUGGET)).unlockedBy("has_iron_ingot", has(Items.IRON_INGOT)).save(consumer); ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, ModItems.GLOWSTONE_PARTICLES.get(), 8).requires(Items.GLOWSTONE_DUST).unlockedBy("has_glowstone_dust", has(Items.GLOWSTONE_DUST)).save(consumer); - ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, Items.GLOWSTONE_DUST, 1).requires(ModItems.GLOWSTONE_PARTICLES.get(), 8).unlockedBy("has_glowstone_particles", has(ModItems.GLOWSTONE_PARTICLES.get())).save(consumer); + ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, Items.GLOWSTONE_DUST, 1).requires(ModItems.GLOWSTONE_PARTICLES.get(), 8).unlockedBy("has_glowstone_particles", has(ModItems.GLOWSTONE_PARTICLES.get())).save(consumer, "laboratoryblocks:glowstone_dust_from_glowstone_particles"); ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, ModItems.REDSTONE_PARTICLES.get(), 8).requires(Items.REDSTONE).unlockedBy("has_redstone", has(Items.REDSTONE)).save(consumer); - ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, Items.REDSTONE, 1).requires(ModItems.REDSTONE_PARTICLES.get(), 8).unlockedBy("has_redstone_particles", has(ModItems.REDSTONE_PARTICLES.get())).save(consumer, "from_redstone_particles"); + ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, Items.REDSTONE, 1).requires(ModItems.REDSTONE_PARTICLES.get(), 8).unlockedBy("has_redstone_particles", has(ModItems.REDSTONE_PARTICLES.get())).save(consumer, "laboratoryblocks:redstone_dust_from_redstone_particles"); ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, ModBlocks.CLEAR_LABORATORY_SCREEN.get(), 4).define('A', ModBlocks.LABORATORY_BLOCK.get()).define('B', ModItems.IRON_SCREW.get()).define('C', ModItems.PLA_SHEETS.get()).pattern("BAB").pattern("ACA").pattern("BAB").unlockedBy("has_laboratory_block", has(ModBlocks.LABORATORY_BLOCK.get())).unlockedBy("has_iron_screw", has(ModItems.IRON_SCREW.get())).unlockedBy("has_pla_sheets", has(ModItems.PLA_SHEETS.get())).save(consumer); ShapelessRecipeBuilder.shapeless(RecipeCategory.BUILDING_BLOCKS, ModBlocks.ENLIGHTED_CLEAR_LABORATORY_SCREEN.get(), 1).requires(ModBlocks.CLEAR_LABORATORY_SCREEN.get()).requires(ModItems.GLOWSTONE_PARTICLES.get()).unlockedBy("has_clear_laboratory_screen", has(ModBlocks.CLEAR_LABORATORY_SCREEN.get())).unlockedBy("has_glowstone_particles", has(ModItems.GLOWSTONE_PARTICLES.get())).save(consumer); @@ -116,8 +116,8 @@ protected void buildRecipes(@NotNull RecipeOutput consumer) { ShapelessRecipeBuilder.shapeless(RecipeCategory.BUILDING_BLOCKS, ModBlocks.ENLIGHTED_LABORATORY_VENT.get(), 1).requires(ModBlocks.LABORATORY_VENT.get()).requires(ModItems.GLOWSTONE_PARTICLES.get()).unlockedBy("has_laboratory_vent", has(ModBlocks.LABORATORY_VENT.get())).unlockedBy("has_glowstone_particles", has(ModItems.GLOWSTONE_PARTICLES.get())).save(consumer); ShapelessRecipeBuilder.shapeless(RecipeCategory.BUILDING_BLOCKS, ModBlocks.LABORATORY_VENT_CONNECTING.get(), 1).requires(ModBlocks.LABORATORY_VENT.get()).unlockedBy("has_laboratory_vent", has(ModBlocks.LABORATORY_VENT.get())).save(consumer); - ShapelessRecipeBuilder.shapeless(RecipeCategory.BUILDING_BLOCKS, ModBlocks.ENLIGHTED_LABORATORY_VENT_CONNECTING.get(), 1).requires(ModBlocks.ENLIGHTED_LABORATORY_VENT_CONNECTING.get()).unlockedBy("has_laboratory_vent_connecting", has(ModBlocks.LABORATORY_VENT_CONNECTING.get())).save(consumer); - ShapelessRecipeBuilder.shapeless(RecipeCategory.BUILDING_BLOCKS, ModBlocks.ENLIGHTED_LABORATORY_VENT_CONNECTING.get(), 1).requires(ModBlocks.LABORATORY_VENT_CONNECTING.get()).requires(ModItems.GLOWSTONE_PARTICLES.get()).unlockedBy("has_laboratory_vent_connecting", has(ModBlocks.LABORATORY_VENT_CONNECTING.get())).unlockedBy("has_glowstone_particles", has(ModItems.GLOWSTONE_PARTICLES.get())).save(consumer, "enlighted_laboratory_vent_connecting_from_laboratory_vent_connecting_and_glowstone_particles"); + ShapelessRecipeBuilder.shapeless(RecipeCategory.BUILDING_BLOCKS, ModBlocks.ENLIGHTED_LABORATORY_VENT_CONNECTING.get(), 1).requires(ModBlocks.ENLIGHTED_LABORATORY_VENT.get()).unlockedBy("has_laboratory_vent_connecting", has(ModBlocks.LABORATORY_VENT_CONNECTING.get())).save(consumer); + ShapelessRecipeBuilder.shapeless(RecipeCategory.BUILDING_BLOCKS, ModBlocks.ENLIGHTED_LABORATORY_VENT_CONNECTING.get(), 1).requires(ModBlocks.LABORATORY_VENT_CONNECTING.get()).requires(ModItems.GLOWSTONE_PARTICLES.get()).unlockedBy("has_laboratory_vent_connecting", has(ModBlocks.LABORATORY_VENT_CONNECTING.get())).unlockedBy("has_glowstone_particles", has(ModItems.GLOWSTONE_PARTICLES.get())).save(consumer, "laboratoryblocks:enlighted_laboratory_vent_connecting_from_laboratory_vent_connecting_and_glowstone_particles"); ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, ModBlocks.RIGHT_FACED_BLUE_SIGNALING_LABORATORY_BLOCK.get(), 8).define('A', ModBlocks.LABORATORY_BLOCK.get()).define('B', Blocks.BLUE_WOOL).define('C', Blocks.BLACK_WOOL).pattern("AAA").pattern("BCB").pattern("AAA").unlockedBy("has_laboratory_block", has(ModBlocks.LABORATORY_BLOCK.get())).unlockedBy("has_wool", has(ItemTags.WOOL)).save(consumer); diff --git a/src/main/java/de/artemis/laboratoryblocks/common/data/TagsProvider.java b/src/main/java/de/artemis/laboratoryblocks/common/data/TagsProvider.java index ce9a82a..023f894 100644 --- a/src/main/java/de/artemis/laboratoryblocks/common/data/TagsProvider.java +++ b/src/main/java/de/artemis/laboratoryblocks/common/data/TagsProvider.java @@ -42,7 +42,7 @@ private ResourceKey getKey(Block block) { @NotNull @Override protected Path getPath(ResourceLocation location) { - return this.packOutput.getOutputFolder().resolve("data/" + location.getNamespace() + "/tags/blocks/" + location.getPath() + ".json"); + return this.packOutput.getOutputFolder().resolve("data/" + location.getNamespace() + "/tags/block/" + location.getPath() + ".json"); } @NotNull @@ -72,7 +72,7 @@ private ResourceKey getKey(Item item) { @NotNull @Override protected Path getPath(ResourceLocation location) { - return this.packOutput.getOutputFolder().resolve("data/" + location.getNamespace() + "/tags/items/" + location.getPath() + ".json"); + return this.packOutput.getOutputFolder().resolve("data/" + location.getNamespace() + "/tags/item/" + location.getPath() + ".json"); } @NotNull From 53d886c380fbc9be0448d531d42b4a8760ccd48a Mon Sep 17 00:00:00 2001 From: EnderTurret <36442079+EnderTurret@users.noreply.github.com> Date: Tue, 26 Nov 2024 23:03:28 -0500 Subject: [PATCH 16/16] Fix a tab that snuck into `build.gradle` while I wasn't looking. --- README.md | 2 +- build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 29d7938..da4d60e 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Get ready to upgrade your builds! This mod adds modern and futuristic looking la ## Supported Connected Textures Mod * CTM | 1.18 - 1.19 -* Fusion | 1.20 +* Fusion | 1.20 - 1.21 ## Acknowledgments * This project uses sound files from the [Chisel Github Repository](https://github.com/Chisel-Team/Chisel) diff --git a/build.gradle b/build.gradle index 13ffa97..b8d07af 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { id 'maven-publish' - id 'net.neoforged.moddev' version '1.0.21' + id 'net.neoforged.moddev' version '1.0.21' } group = 'de.artemis.laboratoryblocks'