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 - 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 de3c856..b8d07af 100644 --- a/build.gradle +++ b/build.gradle @@ -1,124 +1,62 @@ -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 = '7.5.1' + 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' + programArguments.addAll '--mod', "laboratoryblocks", '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath() } } } -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 +71,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 +88,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/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7f93135..a4b76b9 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ 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 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 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..60363fd --- /dev/null +++ b/src/generated/resources/.cache/73115db2fadf9a5adb458c178689d36af3ada434 @@ -0,0 +1,2 @@ +// 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/.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..3a26652 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-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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 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..3ce031c 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 -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 764996b..0a26453 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 -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/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/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/minecraft/advancements/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 55% 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/laboratoryblocks/advancement/recipes/building_blocks/enlighted_laboratory_vent_connecting_from_laboratory_vent_connecting_and_glowstone_particles.json index d41ff6d..6b83cc7 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/laboratoryblocks/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" } ] }, @@ -27,22 +23,21 @@ }, "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" } }, "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" + "laboratoryblocks: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/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/minecraft/advancements/recipes/misc/glowstone_dust.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/misc/glowstone_dust_from_glowstone_particles.json similarity index 61% rename from src/generated/resources/data/minecraft/advancements/recipes/misc/glowstone_dust.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/misc/glowstone_dust_from_glowstone_particles.json index 881729d..759fb64 100644 --- a/src/generated/resources/data/minecraft/advancements/recipes/misc/glowstone_dust.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/misc/glowstone_dust_from_glowstone_particles.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:glowstone_particles" - ] + "items": "laboratoryblocks:glowstone_particles" } ] }, @@ -15,21 +13,20 @@ }, "has_the_recipe": { "conditions": { - "recipe": "minecraft:glowstone_dust" + "recipe": "laboratoryblocks:glowstone_dust_from_glowstone_particles" }, "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_glowstone_particles", - "has_the_recipe" + "has_the_recipe", + "has_glowstone_particles" ] ], "rewards": { "recipes": [ - "minecraft:glowstone_dust" + "laboratoryblocks:glowstone_dust_from_glowstone_particles" ] - }, - "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/minecraft/advancements/recipes/misc/from_redstone_particles.json b/src/generated/resources/data/laboratoryblocks/advancement/recipes/misc/redstone_dust_from_redstone_particles.json similarity index 59% rename from src/generated/resources/data/minecraft/advancements/recipes/misc/from_redstone_particles.json rename to src/generated/resources/data/laboratoryblocks/advancement/recipes/misc/redstone_dust_from_redstone_particles.json index 1ca5a9f..a1746e0 100644 --- a/src/generated/resources/data/minecraft/advancements/recipes/misc/from_redstone_particles.json +++ b/src/generated/resources/data/laboratoryblocks/advancement/recipes/misc/redstone_dust_from_redstone_particles.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "laboratoryblocks:redstone_particles" - ] + "items": "laboratoryblocks:redstone_particles" } ] }, @@ -15,21 +13,20 @@ }, "has_the_recipe": { "conditions": { - "recipe": "minecraft:from_redstone_particles" + "recipe": "laboratoryblocks:redstone_dust_from_redstone_particles" }, "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_redstone_particles", - "has_the_recipe" + "has_the_recipe", + "has_redstone_particles" ] ], "rewards": { "recipes": [ - "minecraft:from_redstone_particles" + "laboratoryblocks:redstone_dust_from_redstone_particles" ] - }, - "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/recipe/enlighted_laboratory_vent_connecting.json b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_laboratory_vent_connecting.json new file mode 100644 index 0000000..fb6810e --- /dev/null +++ b/src/generated/resources/data/laboratoryblocks/recipe/enlighted_laboratory_vent_connecting.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "ingredients": [ + { + "item": "laboratoryblocks:enlighted_laboratory_vent" + } + ], + "result": { + "count": 1, + "id": "laboratoryblocks:enlighted_laboratory_vent_connecting" + } +} \ 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/laboratoryblocks/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/laboratoryblocks/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/laboratoryblocks/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/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/minecraft/recipes/glowstone_dust.json b/src/generated/resources/data/laboratoryblocks/recipe/glowstone_dust_from_glowstone_particles.json similarity index 92% rename from src/generated/resources/data/minecraft/recipes/glowstone_dust.json rename to src/generated/resources/data/laboratoryblocks/recipe/glowstone_dust_from_glowstone_particles.json index 884b47c..bd9b0c7 100644 --- a/src/generated/resources/data/minecraft/recipes/glowstone_dust.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/glowstone_dust_from_glowstone_particles.json @@ -28,6 +28,7 @@ } ], "result": { - "item": "minecraft:glowstone_dust" + "count": 1, + "id": "minecraft:glowstone_dust" } } \ 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/minecraft/recipes/from_redstone_particles.json b/src/generated/resources/data/laboratoryblocks/recipe/redstone_dust_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/laboratoryblocks/recipe/redstone_dust_from_redstone_particles.json index 43d7812..6669b8a 100644 --- a/src/generated/resources/data/minecraft/recipes/from_redstone_particles.json +++ b/src/generated/resources/data/laboratoryblocks/recipe/redstone_dust_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/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/laboratoryblocks/recipes/enlighted_laboratory_vent_connecting.json b/src/generated/resources/data/laboratoryblocks/recipes/enlighted_laboratory_vent_connecting.json deleted file mode 100644 index 8205465..0000000 --- a/src/generated/resources/data/laboratoryblocks/recipes/enlighted_laboratory_vent_connecting.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "building", - "ingredients": [ - { - "item": "laboratoryblocks:enlighted_laboratory_vent_connecting" - } - ], - "result": { - "item": "laboratoryblocks:enlighted_laboratory_vent_connecting" - } -} \ No newline at end of file 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/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..b21c77b 100644 --- a/src/main/java/de/artemis/laboratoryblocks/client/event/ClientEvents.java +++ b/src/main/java/de/artemis/laboratoryblocks/client/event/ClientEvents.java @@ -1,19 +1,17 @@ package de.artemis.laboratoryblocks.client.event; 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 de.artemis.laboratoryblocks.client.registration.ModKeyBindings; +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 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/particle/custom/ApplyingGlowstoneParticle.java b/src/main/java/de/artemis/laboratoryblocks/client/particle/custom/ApplyingGlowstoneParticle.java index 9b85a6a..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 @@ -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) { 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); } diff --git a/src/main/java/de/artemis/laboratoryblocks/client/registration/ModKeyBindings.java b/src/main/java/de/artemis/laboratoryblocks/client/registration/ModKeyBindings.java new file mode 100644 index 0000000..74bcb03 --- /dev/null +++ b/src/main/java/de/artemis/laboratoryblocks/client/registration/ModKeyBindings.java @@ -0,0 +1,14 @@ +package de.artemis.laboratoryblocks.client.registration; + +import com.mojang.blaze3d.platform.InputConstants; +import de.artemis.laboratoryblocks.LaboratoryBlocks; +import net.minecraft.client.KeyMapping; +import net.neoforged.neoforge.client.settings.KeyConflictContext; +import net.neoforged.neoforge.client.settings.KeyModifier; +import org.lwjgl.glfw.GLFW; + +public class ModKeyBindings { + + //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 92% 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 26e85af..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,9 +1,9 @@ -package de.artemis.laboratoryblocks.common.util; +package de.artemis.laboratoryblocks.client.util; 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 { 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..e2f01a7 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,19 @@ 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 { 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; - } - - 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(); + super(blockPos, blockState); } - 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/BaseLaboratoryBlock.java b/src/main/java/de/artemis/laboratoryblocks/common/blocks/BaseLaboratoryBlock.java new file mode 100644 index 0000000..323c2a0 --- /dev/null +++ b/src/main/java/de/artemis/laboratoryblocks/common/blocks/BaseLaboratoryBlock.java @@ -0,0 +1,83 @@ +package de.artemis.laboratoryblocks.common.blocks; + +import java.util.function.Supplier; + +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 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.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())); + 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 8dba45a..93a36b6 100644 --- a/src/main/java/de/artemis/laboratoryblocks/common/blocks/ChiseledLaboratoryBookShelfBlock.java +++ b/src/main/java/de/artemis/laboratoryblocks/common/blocks/ChiseledLaboratoryBookShelfBlock.java @@ -1,44 +1,24 @@ 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 { +public class ChiseledLaboratoryBookShelfBlock extends ChiseledBookShelfBlock implements BaseLaboratoryBlock { private final Supplier block; @@ -47,222 +27,41 @@ 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; - } + @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); } - private static int getHitSlot(Vec2 pHitPos) { - int $$1 = pHitPos.y >= 0.5F ? 0 : 1; - int $$2 = getSection(pHitPos.x); - return $$2 + $$1 * 3; - } + @Override + protected @NotNull ItemInteractionResult useItemOn(ItemStack itemStackInHand, BlockState blockState, Level level, BlockPos blockPos, Player player, InteractionHand hand, BlockHitResult hitResult) { - 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; - } - } + //Vanilla Begin - 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); - } + ItemInteractionResult result = super.useItemOn(itemStackInHand, blockState, level, blockPos, player, hand, hitResult); + if (result != ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION) + return result; - level.gameEvent(player, GameEvent.BLOCK_CHANGE, blockPos); - } - } + //Vanilla End - 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); - } + result = tryApplyGlowstone(itemStackInHand, blockState, level, blockPos, player, hand, block); - pLevel.gameEvent(pPlayer, GameEvent.BLOCK_CHANGE, pPos); - } + return result; } + @Override 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; - } - } - } } 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..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,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.util.RandomSource; 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.level.Level; @@ -22,7 +13,7 @@ import java.util.function.Supplier; -public class LaboratoryBlock extends Block { +public class LaboratoryBlock extends Block implements BaseLaboratoryBlock { private final Supplier block; public LaboratoryBlock(Supplier block, Properties properties) { @@ -30,72 +21,8 @@ public LaboratoryBlock(Supplier block, Properties properties) { this.block = block; } - @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); - - 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 InteractionResult.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.hurt(1, RandomSource.create(), null); - } - 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 InteractionResult.SUCCESS; - } - } - return InteractionResult.FAIL; + protected @NotNull ItemInteractionResult useItemOn(ItemStack itemStackInHand, BlockState blockState, Level level, BlockPos blockPos, Player player, InteractionHand hand, BlockHitResult hitResult) { + 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 714f373..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,17 +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.sounds.SoundEvents; -import net.minecraft.sounds.SoundSource; -import net.minecraft.util.RandomSource; +import net.minecraft.core.particles.ParticleOptions; 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.level.Level; @@ -22,7 +14,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,57 +22,19 @@ public LaboratoryCarpetBlock(Supplier block, Properties p this.block = block; } - @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); - - 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 InteractionResult.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.hurt(1, RandomSource.create(), null); - } - 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 InteractionResult.SUCCESS; - } + 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); } - return InteractionResult.FAIL; } -} + @SuppressWarnings("deprecation") + @Override + protected @NotNull ItemInteractionResult useItemOn(ItemStack itemStackInHand, BlockState blockState, Level level, BlockPos blockPos, Player player, InteractionHand hand, BlockHitResult hitResult) { + 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 4fd92e9..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,28 +1,19 @@ 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.util.RandomSource; 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.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 implements BaseLaboratoryBlock { private final Supplier block; public LaboratoryGlassBlock(Supplier block, Properties properties) { @@ -30,71 +21,8 @@ public LaboratoryGlassBlock(Supplier block, Properties pro this.block = block; } - @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); - - 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 InteractionResult.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.hurt(1, RandomSource.create(), null); - } - 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 InteractionResult.SUCCESS; - } - } - return InteractionResult.FAIL; + protected @NotNull ItemInteractionResult useItemOn(ItemStack itemStackInHand, BlockState blockState, Level level, BlockPos blockPos, Player player, InteractionHand hand, BlockHitResult hitResult) { + 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 f09171c..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,17 +1,17 @@ package de.artemis.laboratoryblocks.common.blocks; +import de.artemis.laboratoryblocks.common.items.ConfigurationToolItem; 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.server.level.ServerLevel; 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; @@ -25,7 +25,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"); @@ -70,70 +70,32 @@ 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); } } @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); - - if (itemStackInHand.is(ModItems.GLOWSTONE_PARTICLES.get()) || itemStackInHand.is(ModItems.CONFIGURATION_TOOL.get()) || itemStackInHand.is(ModItems.REDSTONE_PARTICLES.get())) { + protected @NotNull ItemInteractionResult useItemOn(ItemStack itemStackInHand, BlockState blockState, Level level, BlockPos blockPos, Player player, InteractionHand hand, BlockHitResult hitResult) { + { // 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()); 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 InteractionResult.SUCCESS; + 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 InteractionResult.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")) { @@ -143,59 +105,13 @@ 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 InteractionResult.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); - } + spawnParticles(ModParticles.APPLYING_REDSTONE_PARTICLE.get(), level, blockPos); - itemStackInHand.hurt(1, RandomSource.create(), null); - } - 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); - } - - return InteractionResult.SUCCESS; + return ItemInteractionResult.SUCCESS; } // 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())); @@ -203,33 +119,20 @@ 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); 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 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..2301055 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); } @@ -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/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..67511a0 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); @@ -28,9 +29,9 @@ protected void buildRecipes(@NotNull Consumer 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); @@ -115,8 +116,8 @@ protected void buildRecipes(@NotNull Consumer 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 ac40cd4..023f894 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,13 +36,13 @@ 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 @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 @@ -66,13 +66,13 @@ 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 @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 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..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,32 +1,80 @@ package de.artemis.laboratoryblocks.common.items; -import de.artemis.laboratoryblocks.common.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 org.jetbrains.annotations.Nullable; - 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 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, @Nullable Level level, @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 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; } - super.appendHoverText(itemStack, level, tooltip, flag); + 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/ModBlockEntities.java b/src/main/java/de/artemis/laboratoryblocks/common/registration/ModBlockEntities.java index 20f0ecc..e5cb38d 100644 --- a/src/main/java/de/artemis/laboratoryblocks/common/registration/ModBlockEntities.java +++ b/src/main/java/de/artemis/laboratoryblocks/common/registration/ModBlockEntities.java @@ -1,15 +1,16 @@ 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)); + ModBlocks.CHISELED_LABORATORY_BOOKSHELF.get(), ModBlocks.ENLIGHTED_CHISELED_LABORATORY_BOOKSHELF.get()).build(null)); public static void register() { } 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..1beaedd 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/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/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 deleted file mode 100644 index 1001658..0000000 --- a/src/main/java/de/artemis/laboratoryblocks/common/registration/ModKeyBindings.java +++ /dev/null @@ -1,16 +0,0 @@ -package de.artemis.laboratoryblocks.common.registration; - -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 org.lwjgl.glfw.GLFW; - -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"); - -} 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..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,35 +1,34 @@ 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.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 final DeferredRegister> DATA_COMPONENTS = DeferredRegister.create(BuiltInRegistries.DATA_COMPONENT_TYPE, LaboratoryBlocks.MOD_ID); + public static void register(IEventBus eventBus) { BLOCKS.register(eventBus); ITEMS.register(eventBus); SOUND_EVENTS.register(eventBus); PARTICLE_TYPES.register(eventBus); CREATIVE_MODE_TABS.register(eventBus); BLOCK_ENTITIES.register(eventBus); + DATA_COMPONENTS.register(eventBus); ModBlocks.register(); ModItems.register(); @@ -37,5 +36,6 @@ public static void register() { ModParticles.register(); ModCreativeModeTabs.register(); ModBlockEntities.register(); + ModDataComponents.register(); } } \ No newline at end of file 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/data/laboratoryblocks/advancements/glassworking.json b/src/main/resources/data/laboratoryblocks/advancement/glassworking.json similarity index 93% rename from src/main/resources/data/laboratoryblocks/advancements/glassworking.json rename to src/main/resources/data/laboratoryblocks/advancement/glassworking.json index 72f0dc0..8929f0e 100644 --- a/src/main/resources/data/laboratoryblocks/advancements/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/advancements/i_have_spoken.json b/src/main/resources/data/laboratoryblocks/advancement/i_have_spoken.json similarity index 90% rename from src/main/resources/data/laboratoryblocks/advancements/i_have_spoken.json rename to src/main/resources/data/laboratoryblocks/advancement/i_have_spoken.json index 2784026..afb2d55 100644 --- a/src/main/resources/data/laboratoryblocks/advancements/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/advancements/i_said_the_real_tile.json b/src/main/resources/data/laboratoryblocks/advancement/i_said_the_real_tile.json similarity index 92% 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 index d9e2e84..ca24612 100644 --- 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 @@ -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/advancements/ironworks.json b/src/main/resources/data/laboratoryblocks/advancement/ironworks.json similarity index 93% rename from src/main/resources/data/laboratoryblocks/advancements/ironworks.json rename to src/main/resources/data/laboratoryblocks/advancement/ironworks.json index 5f5bcc4..aa3a98f 100644 --- a/src/main/resources/data/laboratoryblocks/advancements/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/advancements/it_glows.json b/src/main/resources/data/laboratoryblocks/advancement/it_glows.json similarity index 92% rename from src/main/resources/data/laboratoryblocks/advancements/it_glows.json rename to src/main/resources/data/laboratoryblocks/advancement/it_glows.json index 5e8abcc..b7514f0 100644 --- a/src/main/resources/data/laboratoryblocks/advancements/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/advancements/lab_assistant.json b/src/main/resources/data/laboratoryblocks/advancement/lab_assistant.json similarity index 93% rename from src/main/resources/data/laboratoryblocks/advancements/lab_assistant.json rename to src/main/resources/data/laboratoryblocks/advancement/lab_assistant.json index 681a558..6a46dfc 100644 --- a/src/main/resources/data/laboratoryblocks/advancements/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/advancements/librarian.json b/src/main/resources/data/laboratoryblocks/advancement/librarian.json similarity index 92% rename from src/main/resources/data/laboratoryblocks/advancements/librarian.json rename to src/main/resources/data/laboratoryblocks/advancement/librarian.json index 57d89d5..42c5586 100644 --- a/src/main/resources/data/laboratoryblocks/advancements/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/advancements/librarian_but_fancy.json b/src/main/resources/data/laboratoryblocks/advancement/librarian_but_fancy.json similarity index 91% rename from src/main/resources/data/laboratoryblocks/advancements/librarian_but_fancy.json rename to src/main/resources/data/laboratoryblocks/advancement/librarian_but_fancy.json index 1bd3cbc..5c48e9c 100644 --- a/src/main/resources/data/laboratoryblocks/advancements/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/advancements/perfection.json b/src/main/resources/data/laboratoryblocks/advancement/perfection.json similarity index 92% rename from src/main/resources/data/laboratoryblocks/advancements/perfection.json rename to src/main/resources/data/laboratoryblocks/advancement/perfection.json index 0c73e39..f87de65 100644 --- a/src/main/resources/data/laboratoryblocks/advancements/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/advancements/pla_enthusiast.json b/src/main/resources/data/laboratoryblocks/advancement/pla_enthusiast.json similarity index 93% rename from src/main/resources/data/laboratoryblocks/advancements/pla_enthusiast.json rename to src/main/resources/data/laboratoryblocks/advancement/pla_enthusiast.json index 886c441..8f65561 100644 --- a/src/main/resources/data/laboratoryblocks/advancements/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/advancements/pla_master.json b/src/main/resources/data/laboratoryblocks/advancement/pla_master.json similarity index 93% rename from src/main/resources/data/laboratoryblocks/advancements/pla_master.json rename to src/main/resources/data/laboratoryblocks/advancement/pla_master.json index dd9e281..f2104ce 100644 --- a/src/main/resources/data/laboratoryblocks/advancements/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/advancements/pla_tiling.json b/src/main/resources/data/laboratoryblocks/advancement/pla_tiling.json similarity index 93% rename from src/main/resources/data/laboratoryblocks/advancements/pla_tiling.json rename to src/main/resources/data/laboratoryblocks/advancement/pla_tiling.json index e01621e..d9e9571 100644 --- a/src/main/resources/data/laboratoryblocks/advancements/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/advancements/ready_for_work.json b/src/main/resources/data/laboratoryblocks/advancement/ready_for_work.json similarity index 92% rename from src/main/resources/data/laboratoryblocks/advancements/ready_for_work.json rename to src/main/resources/data/laboratoryblocks/advancement/ready_for_work.json index 77c438b..0ddb703 100644 --- a/src/main/resources/data/laboratoryblocks/advancements/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/advancements/screen_time.json b/src/main/resources/data/laboratoryblocks/advancement/screen_time.json similarity index 92% rename from src/main/resources/data/laboratoryblocks/advancements/screen_time.json rename to src/main/resources/data/laboratoryblocks/advancement/screen_time.json index bea09b4..415478d 100644 --- a/src/main/resources/data/laboratoryblocks/advancements/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/advancements/show_me_the_real_tile.json b/src/main/resources/data/laboratoryblocks/advancement/show_me_the_real_tile.json similarity index 93% 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 index 4326e8b..251e4e9 100644 --- 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 @@ -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/advancements/show_me_the_way.json b/src/main/resources/data/laboratoryblocks/advancement/show_me_the_way.json similarity index 90% 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 index 1ac96e7..0ca107b 100644 --- a/src/main/resources/data/laboratoryblocks/advancements/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/advancements/this_is_the_way.json b/src/main/resources/data/laboratoryblocks/advancement/this_is_the_way.json similarity index 90% 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 index 3b6b003..cb213ef 100644 --- a/src/main/resources/data/laboratoryblocks/advancements/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/advancements/welcome_to_the_lab.json b/src/main/resources/data/laboratoryblocks/advancement/welcome_to_the_lab.json similarity index 92% 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 index 4b441ba..307d192 100644 --- a/src/main/resources/data/laboratoryblocks/advancements/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/advancements/you_spin_me_round.json b/src/main/resources/data/laboratoryblocks/advancement/you_spin_me_round.json similarity index 93% 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 index d03ea99..5857b58 100644 --- a/src/main/resources/data/laboratoryblocks/advancements/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/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 91% 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 index 66bc9de..f61aba0 100644 --- 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 @@ -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", 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 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 - } -}