diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 8046ae0..7ca3ebd 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -22,17 +22,18 @@ jobs: 17, # Current Java LTS & minimum supported by Minecraft ] # and run on both Linux and Windows - os: [ubuntu-20.04, windows-2022] + os: [ubuntu-22.04, windows-2022] runs-on: ${{ matrix.os }} steps: - name: checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: validate gradle wrapper uses: gradle/wrapper-validation-action@v1 - name: setup jdk ${{ matrix.java }} - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: java-version: ${{ matrix.java }} + distribution: "microsoft" - name: make gradle wrapper executable if: ${{ runner.os != 'Windows' }} run: chmod +x ./gradlew @@ -40,7 +41,7 @@ jobs: run: ./gradlew build - name: capture build artifacts if: ${{ runner.os == 'Linux' && matrix.java == '17' }} # Only upload artifacts built from latest java on one OS - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: Artifacts path: build/libs/ diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index ea84115..7f4d70b 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -6,36 +6,30 @@ on: jobs: publish: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 env: JAVA_VERSION: 17 - steps: - name: checkout repository - uses: actions/checkout@v2 - + uses: actions/checkout@v3 - name: checkout mcmod repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: repository: Aton-Kish/mcmod ref: maven token: ${{ secrets.API_TOKEN_GITHUB }} path: build/maven - - name: validate gradle wrapper uses: gradle/wrapper-validation-action@v1 - - name: setup jdk ${{ env.JAVA_VERSION }} - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: java-version: ${{ env.JAVA_VERSION }} - + distribution: "microsoft" - name: make gradle wrapper executable run: chmod +x ./gradlew - - name: publish run: ./gradlew publish - - name: push to mcmod repository uses: cpina/github-action-push-to-another-repository@main env: diff --git a/.gitignore b/.gitignore index 09cd281..c476faf 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,10 @@ bin/ # fabric run/ + +# java + +hs_err_*.log +replay_*.log +*.hprof +*.jfr diff --git a/build.gradle b/build.gradle index 16a7a81..3633cf2 100644 --- a/build.gradle +++ b/build.gradle @@ -37,6 +37,15 @@ repositories { url "https://maven.kyrptonaught.dev" } + // <-- workaround + maven { + url "https://www.cursemaven.com" + content { + includeGroup "curse.maven" + } + } + // --> + // Shulker Box Tooltip maven { url "https://maven.misterpemodder.com/libs-release" @@ -65,10 +74,15 @@ dependencies { modImplementation "atonkish.reinfchest:reinforced-chests:${project.reinforced_chests_version}" // Quick Shulker - modImplementation "net.kyrptonaught:quickshulker:${project.quick_shulker_version}" + // modImplementation "net.kyrptonaught:quickshulker:${project.quick_shulker_version}" + // <-- workaround + modImplementation "curse.maven:quick-shulker-362669:${project.quick_shulker_file_id}" + modImplementation "net.kyrptonaught:kyrptconfig:${project.kyrptconfig_version}" + modImplementation "net.kyrptonaught:shulkerutils:${project.shulkerutils_version}" + // --> // Shulker Box Tooltip - modImplementation "com.misterpemodder:shulkerboxtooltip:${project.shulker_box_tooltip_version}" + modImplementation "com.misterpemodder:shulkerboxtooltip-fabric:${project.shulker_box_tooltip_version}" } processResources { diff --git a/gradle.properties b/gradle.properties index 564398d..7c42572 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,20 +1,26 @@ # Done to increase the memory available to gradle. org.gradle.jvmargs=-Xmx1G +org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop - minecraft_version=1.19.2 - yarn_mappings=1.19.2+build.20 - loader_version=0.14.9 + minecraft_version=1.19.3 + yarn_mappings=1.19.3+build.3 + loader_version=0.14.11 # Mod Properties - mod_version=2.2.0+1.19 + mod_version=2.3.0+1.19 maven_group=atonkish.reinfshulker archives_base_name=reinforced-shulker-boxes # Dependencies - fabric_version=0.62.0+1.19.2 - reinforced_core_version=3.0.3+1.19 - reinforced_chests_version=2.2.0+1.19 - quick_shulker_version=1.3.9-1.19 - shulker_box_tooltip_version=3.0.10+1.19 + fabric_version=0.69.1+1.19.3 + reinforced_core_version=3.0.4+1.19 + reinforced_chests_version=2.3.0+1.19 + # quick_shulker_version=1.3.10-1.19.3 + # <-- workaround + quick_shulker_file_id=4171682 + kyrptconfig_version=1.5.1-1.19.3 + shulkerutils_version=1.0.4-1.19 + # --> + shulker_box_tooltip_version=3.2.3+1.19.3 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180..943f0cb 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 41dfb87..f398c33 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 1b6c787..65dcd68 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,10 +80,10 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' @@ -143,12 +143,16 @@ fi if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -205,6 +209,12 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/gradlew.bat b/gradlew.bat index 107acd3..6689b85 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,89 +1,92 @@ -@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=. -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%" == "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%"=="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! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -: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 + +@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 diff --git a/src/main/java/atonkish/reinfshulker/ReinforcedShulkerBoxesClientMod.java b/src/main/java/atonkish/reinfshulker/ReinforcedShulkerBoxesClientMod.java index d632ac9..8417f9b 100644 --- a/src/main/java/atonkish/reinfshulker/ReinforcedShulkerBoxesClientMod.java +++ b/src/main/java/atonkish/reinfshulker/ReinforcedShulkerBoxesClientMod.java @@ -57,10 +57,6 @@ private static void initializeReinforcedShulkerBoxesClient() { ReinforcingMaterial material = materialSettings.getMaterial(); // Textured Render Layers - ReinforcedShulkerBoxesClientRegistry.registerMaterialAtlasTexture(ReinforcedShulkerBoxesMod.MOD_ID, - material); - ReinforcedShulkerBoxesClientRegistry.registerMaterialRenderLayer(ReinforcedShulkerBoxesMod.MOD_ID, - material); ReinforcedShulkerBoxesClientRegistry.registerMaterialDefaultSprite(ReinforcedShulkerBoxesMod.MOD_ID, material); ReinforcedShulkerBoxesClientRegistry.registerMaterialColoringSprites(ReinforcedShulkerBoxesMod.MOD_ID, diff --git a/src/main/java/atonkish/reinfshulker/api/ReinforcedShulkerBoxesClientRegistry.java b/src/main/java/atonkish/reinfshulker/api/ReinforcedShulkerBoxesClientRegistry.java index 9cc729a..a69a7e9 100644 --- a/src/main/java/atonkish/reinfshulker/api/ReinforcedShulkerBoxesClientRegistry.java +++ b/src/main/java/atonkish/reinfshulker/api/ReinforcedShulkerBoxesClientRegistry.java @@ -6,6 +6,7 @@ import net.fabricmc.api.Environment; import net.minecraft.client.render.RenderLayer; +import net.minecraft.client.render.TexturedRenderLayers; import net.minecraft.client.util.SpriteIdentifier; import net.minecraft.util.Identifier; @@ -14,12 +15,14 @@ @Environment(EnvType.CLIENT) public class ReinforcedShulkerBoxesClientRegistry { + @Deprecated public static Identifier registerMaterialAtlasTexture(String namespace, ReinforcingMaterial material) { - return ModTexturedRenderLayers.registerMaterialAtlasTexture(namespace, material); + return TexturedRenderLayers.SHULKER_BOXES_ATLAS_TEXTURE; } + @Deprecated public static RenderLayer registerMaterialRenderLayer(String namespace, ReinforcingMaterial material) { - return ModTexturedRenderLayers.registerMaterialRenderLayer(material); + return TexturedRenderLayers.getShulkerBoxes(); } public static SpriteIdentifier registerMaterialDefaultSprite(String namespace, ReinforcingMaterial material) { diff --git a/src/main/java/atonkish/reinfshulker/block/ModBlocks.java b/src/main/java/atonkish/reinfshulker/block/ModBlocks.java index f05de2d..863be8a 100644 --- a/src/main/java/atonkish/reinfshulker/block/ModBlocks.java +++ b/src/main/java/atonkish/reinfshulker/block/ModBlocks.java @@ -4,9 +4,10 @@ import java.util.Map; import net.minecraft.block.Block; +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; import net.minecraft.util.DyeColor; import net.minecraft.util.Identifier; -import net.minecraft.util.registry.Registry; import atonkish.reinfcore.util.ReinforcingMaterial; @@ -32,7 +33,7 @@ public static Block registerMaterialDyeColor(String namespace, ReinforcingMateri String id = color == null ? material.getName() + "_shulker_box" : color.getName() + "_" + material.getName() + "_shulker_box"; - Block block = register(namespace, id, new ReinforcedShulkerBoxBlock(material, color, settings)); + Block block = ModBlocks.register(namespace, id, new ReinforcedShulkerBoxBlock(material, color, settings)); REINFORCED_SHULKER_BOX_MAP.get(material).put(color, block); } @@ -40,6 +41,6 @@ public static Block registerMaterialDyeColor(String namespace, ReinforcingMateri } private static Block register(String namespace, String id, Block block) { - return Registry.register(Registry.BLOCK, new Identifier(namespace, id), block); + return Registry.register(Registries.BLOCK, new Identifier(namespace, id), block); } } diff --git a/src/main/java/atonkish/reinfshulker/block/entity/ModBlockEntityType.java b/src/main/java/atonkish/reinfshulker/block/entity/ModBlockEntityType.java index 8e54d32..3ea0115 100644 --- a/src/main/java/atonkish/reinfshulker/block/entity/ModBlockEntityType.java +++ b/src/main/java/atonkish/reinfshulker/block/entity/ModBlockEntityType.java @@ -8,9 +8,10 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.registry.Registry; import atonkish.reinfcore.util.ReinforcingMaterial; import atonkish.reinfshulker.block.ModBlocks; @@ -24,8 +25,9 @@ public static BlockEntityType registerMaterial( String id = material.getName() + "_shulker_box"; Block[] blocks = ModBlocks.REINFORCED_SHULKER_BOX_MAP.get(material).values().toArray(new Block[0]); FabricBlockEntityTypeBuilder builder = FabricBlockEntityTypeBuilder - .create(createBlockEntityTypeFactory(material), blocks); - BlockEntityType blockEntityType = create(namespace, id, builder); + .create(ModBlockEntityType.createBlockEntityTypeFactory(material), blocks); + BlockEntityType blockEntityType = ModBlockEntityType + .create(namespace, id, builder); REINFORCED_SHULKER_BOX_MAP.put(material, blockEntityType); } @@ -34,7 +36,7 @@ public static BlockEntityType registerMaterial( private static BlockEntityType create(String namespace, String id, FabricBlockEntityTypeBuilder builder) { - return Registry.register(Registry.BLOCK_ENTITY_TYPE, new Identifier(namespace, id), + return Registry.register(Registries.BLOCK_ENTITY_TYPE, new Identifier(namespace, id), builder.build(null)); } diff --git a/src/main/java/atonkish/reinfshulker/client/render/ModTexturedRenderLayers.java b/src/main/java/atonkish/reinfshulker/client/render/ModTexturedRenderLayers.java index 4cfb3a5..daca82d 100644 --- a/src/main/java/atonkish/reinfshulker/client/render/ModTexturedRenderLayers.java +++ b/src/main/java/atonkish/reinfshulker/client/render/ModTexturedRenderLayers.java @@ -9,9 +9,8 @@ import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.fabricmc.fabric.api.event.client.ClientSpriteRegistryCallback; -import net.minecraft.client.render.RenderLayer; +import net.minecraft.client.render.TexturedRenderLayers; import net.minecraft.client.util.SpriteIdentifier; import net.minecraft.util.DyeColor; import net.minecraft.util.Identifier; @@ -20,46 +19,12 @@ @Environment(EnvType.CLIENT) public class ModTexturedRenderLayers { - public static final Identifier SHULKER_BOXES_ATLAS_TEXTURE = new Identifier("textures/atlas/shulker_boxes.png"); - public static final Map REINFORCED_SHULKER_BOXES_ATLAS_TEXTURE_MAP = new LinkedHashMap<>(); - private static final Map REINFORCED_SHULKER_BOXES_RENDER_LAYER_MAP = new LinkedHashMap<>(); public static final Map REINFORCED_SHULKER_TEXTURE_ID_MAP = new LinkedHashMap<>(); public static final Map> COLORED_REINFORCED_SHULKER_BOXES_TEXTURES_MAP = new LinkedHashMap<>(); - public static Identifier registerMaterialAtlasTexture(String namespace, ReinforcingMaterial material) { - if (!REINFORCED_SHULKER_BOXES_ATLAS_TEXTURE_MAP.containsKey(material)) { - Identifier identifier = new Identifier(namespace, - "textures/atlas/" + material.getName() + "_shulker_boxes.png"); - - ClientSpriteRegistryCallback.event(identifier).register((atlasTexture, registry) -> { - String nonColorPath = "entity/reinforced_shulker/" + material.getName() + "/shulker"; - registry.register(new Identifier(namespace, nonColorPath)); - for (DyeColor color : DyeColor.values()) { - String colorPath = nonColorPath + "_" + color.getName(); - registry.register(new Identifier(namespace, colorPath)); - } - }); - - REINFORCED_SHULKER_BOXES_ATLAS_TEXTURE_MAP.put(material, identifier); - } - - return REINFORCED_SHULKER_BOXES_ATLAS_TEXTURE_MAP.get(material); - } - - public static RenderLayer registerMaterialRenderLayer(ReinforcingMaterial material) { - if (!REINFORCED_SHULKER_BOXES_RENDER_LAYER_MAP.containsKey(material)) { - RenderLayer renderLayer = RenderLayer - .getEntityCutout(REINFORCED_SHULKER_BOXES_ATLAS_TEXTURE_MAP.get(material)); - REINFORCED_SHULKER_BOXES_RENDER_LAYER_MAP.put(material, renderLayer); - } - - return REINFORCED_SHULKER_BOXES_RENDER_LAYER_MAP.get(material); - } - public static SpriteIdentifier registerMaterialDefaultSprite(String namespace, ReinforcingMaterial material) { if (!REINFORCED_SHULKER_TEXTURE_ID_MAP.containsKey(material)) { - SpriteIdentifier identifier = new SpriteIdentifier( - REINFORCED_SHULKER_BOXES_ATLAS_TEXTURE_MAP.get(material), + SpriteIdentifier identifier = new SpriteIdentifier(TexturedRenderLayers.SHULKER_BOXES_ATLAS_TEXTURE, new Identifier(namespace, "entity/reinforced_shulker/" + material.getName() + "/shulker")); REINFORCED_SHULKER_TEXTURE_ID_MAP.put(material, identifier); } @@ -71,7 +36,7 @@ public static List registerMaterialColoringSprites(String name ReinforcingMaterial material) { if (!COLORED_REINFORCED_SHULKER_BOXES_TEXTURES_MAP.containsKey(material)) { List identifiers = Stream.of(DyeColor.values()).map((color) -> { - return new SpriteIdentifier(REINFORCED_SHULKER_BOXES_ATLAS_TEXTURE_MAP.get(material), + return new SpriteIdentifier(TexturedRenderLayers.SHULKER_BOXES_ATLAS_TEXTURE, new Identifier(namespace, "entity/reinforced_shulker/" + material.getName() + "/shulker_" + color.getName())); }).collect(ImmutableList.toImmutableList()); @@ -80,8 +45,4 @@ public static List registerMaterialColoringSprites(String name return COLORED_REINFORCED_SHULKER_BOXES_TEXTURES_MAP.get(material); } - - public static RenderLayer getReinforcedShulkerBoxes(ReinforcingMaterial material) { - return REINFORCED_SHULKER_BOXES_RENDER_LAYER_MAP.get(material); - } } diff --git a/src/main/java/atonkish/reinfshulker/integration/shulkerboxtooltip/ReinforcedShulkerBoxPreviewProvider.java b/src/main/java/atonkish/reinfshulker/integration/shulkerboxtooltip/ReinforcedShulkerBoxPreviewProvider.java index af03afe..b4e5cdd 100644 --- a/src/main/java/atonkish/reinfshulker/integration/shulkerboxtooltip/ReinforcedShulkerBoxPreviewProvider.java +++ b/src/main/java/atonkish/reinfshulker/integration/shulkerboxtooltip/ReinforcedShulkerBoxPreviewProvider.java @@ -30,7 +30,7 @@ public boolean showTooltipHints(PreviewContext context) { @Override public float[] getWindowColor(PreviewContext context) { - DyeColor dye = ((ReinforcedShulkerBoxBlock) Block.getBlockFromItem(context.getStack().getItem())).getColor(); + DyeColor dye = ((ReinforcedShulkerBoxBlock) Block.getBlockFromItem(context.stack().getItem())).getColor(); if (dye != null) { float[] components = dye.getColorComponents(); return new float[] { Math.max(0.15f, components[0]), Math.max(0.15f, components[1]), diff --git a/src/main/java/atonkish/reinfshulker/item/ModItems.java b/src/main/java/atonkish/reinfshulker/item/ModItems.java index 565a655..d4ca153 100644 --- a/src/main/java/atonkish/reinfshulker/item/ModItems.java +++ b/src/main/java/atonkish/reinfshulker/item/ModItems.java @@ -3,12 +3,15 @@ import java.util.LinkedHashMap; import java.util.Map; +import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; + import net.minecraft.block.Block; import net.minecraft.item.BlockItem; import net.minecraft.item.Item; +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; import net.minecraft.util.DyeColor; import net.minecraft.util.Identifier; -import net.minecraft.util.registry.Registry; import atonkish.reinfcore.item.ModItemGroup; import atonkish.reinfcore.util.ReinforcingMaterial; @@ -33,9 +36,10 @@ public static Item registerMaterialDyeColor(ReinforcingMaterial material, DyeCol } if (!REINFORCED_SHULKER_BOX_MAP.get(material).containsKey(color)) { - Item item = register( + Item item = ModItems.register( new BlockItem(ModBlocks.REINFORCED_SHULKER_BOX_MAP.get(material).get(color), REINFORCED_SHULKER_BOX_SETTINGS_MAP.get(material).get(color))); + ItemGroupEvents.modifyEntriesEvent(ModItemGroup.REINFORCED_STORAGE).register(content -> content.add(item)); REINFORCED_SHULKER_BOX_MAP.get(material).put(color, item); } @@ -48,11 +52,11 @@ public static void registerMaterialDyeColorItemGroupIcon(ReinforcingMaterial mat } private static Item register(BlockItem item) { - return register(item.getBlock(), (Item) item); + return ModItems.register(item.getBlock(), (Item) item); } protected static Item register(Block block, Item item) { - return register(Registry.BLOCK.getId(block), item); + return ModItems.register(Registries.BLOCK.getId(block), item); } private static Item register(Identifier id, Item item) { @@ -60,6 +64,6 @@ private static Item register(Identifier id, Item item) { ((BlockItem) item).appendBlocks(Item.BLOCK_ITEMS, item); } - return Registry.register(Registry.ITEM, id, item); + return Registry.register(Registries.ITEM, id, item); } } diff --git a/src/main/java/atonkish/reinfshulker/recipe/ModRecipeSerializer.java b/src/main/java/atonkish/reinfshulker/recipe/ModRecipeSerializer.java index 2a003e0..42da345 100644 --- a/src/main/java/atonkish/reinfshulker/recipe/ModRecipeSerializer.java +++ b/src/main/java/atonkish/reinfshulker/recipe/ModRecipeSerializer.java @@ -3,8 +3,9 @@ import net.minecraft.recipe.Recipe; import net.minecraft.recipe.RecipeSerializer; import net.minecraft.recipe.SpecialRecipeSerializer; +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; import net.minecraft.util.Identifier; -import net.minecraft.util.registry.Registry; import atonkish.reinfshulker.ReinforcedShulkerBoxesMod; @@ -17,7 +18,7 @@ public static void init() { private static , T extends Recipe> S register(String id, S serializer) { Identifier identifier = new Identifier(ReinforcedShulkerBoxesMod.MOD_ID, id); - return Registry.register(Registry.RECIPE_SERIALIZER, identifier, serializer); + return Registry.register(Registries.RECIPE_SERIALIZER, identifier, serializer); } static { diff --git a/src/main/java/atonkish/reinfshulker/recipe/ReinforcedShulkerBoxColoringRecipe.java b/src/main/java/atonkish/reinfshulker/recipe/ReinforcedShulkerBoxColoringRecipe.java index ff764ef..a65e690 100644 --- a/src/main/java/atonkish/reinfshulker/recipe/ReinforcedShulkerBoxColoringRecipe.java +++ b/src/main/java/atonkish/reinfshulker/recipe/ReinforcedShulkerBoxColoringRecipe.java @@ -8,6 +8,7 @@ import net.minecraft.item.Items; import net.minecraft.recipe.RecipeSerializer; import net.minecraft.recipe.SpecialCraftingRecipe; +import net.minecraft.recipe.book.CraftingRecipeCategory; import net.minecraft.util.Identifier; import net.minecraft.world.World; @@ -16,8 +17,8 @@ import atonkish.reinfshulker.block.ReinforcedShulkerBoxBlock; public class ReinforcedShulkerBoxColoringRecipe extends SpecialCraftingRecipe { - public ReinforcedShulkerBoxColoringRecipe(Identifier identifier) { - super(identifier); + public ReinforcedShulkerBoxColoringRecipe(Identifier identifier, CraftingRecipeCategory category) { + super(identifier, category); } @Override diff --git a/src/main/java/atonkish/reinfshulker/recipe/ReinforcedShulkerBoxCraftingRecipe.java b/src/main/java/atonkish/reinfshulker/recipe/ReinforcedShulkerBoxCraftingRecipe.java index 31aceab..f9a75cb 100644 --- a/src/main/java/atonkish/reinfshulker/recipe/ReinforcedShulkerBoxCraftingRecipe.java +++ b/src/main/java/atonkish/reinfshulker/recipe/ReinforcedShulkerBoxCraftingRecipe.java @@ -19,25 +19,15 @@ import net.minecraft.recipe.Ingredient; import net.minecraft.recipe.RecipeSerializer; import net.minecraft.recipe.ShapedRecipe; +import net.minecraft.recipe.book.CraftingRecipeCategory; import net.minecraft.util.Identifier; import net.minecraft.util.JsonHelper; import net.minecraft.util.collection.DefaultedList; public class ReinforcedShulkerBoxCraftingRecipe extends ShapedRecipe { - final int width; - final int height; - final DefaultedList input; - final ItemStack output; - final String group; - - public ReinforcedShulkerBoxCraftingRecipe(Identifier id, String group, int width, int height, - DefaultedList input, ItemStack output) { - super(id, group, width, height, input, output); - this.group = group; - this.width = width; - this.height = height; - this.input = input; - this.output = output; + public ReinforcedShulkerBoxCraftingRecipe(Identifier id, String group, CraftingRecipeCategory category, + int width, int height, DefaultedList input, ItemStack output) { + super(id, group, category, width, height, input, output); } @Override @@ -222,6 +212,8 @@ public static class Serializer implements RecipeSerializer map = ReinforcedShulkerBoxCraftingRecipe .readSymbols(JsonHelper.getObject(jsonObject, "key")); String[] strings = ReinforcedShulkerBoxCraftingRecipe.removePadding( @@ -232,7 +224,8 @@ public ReinforcedShulkerBoxCraftingRecipe read(Identifier identifier, JsonObject map, i, j); ItemStack itemStack = ReinforcedShulkerBoxCraftingRecipe .outputFromJson(JsonHelper.getObject(jsonObject, "result")); - return new ReinforcedShulkerBoxCraftingRecipe(identifier, string, i, j, defaultedList, itemStack); + return new ReinforcedShulkerBoxCraftingRecipe(identifier, string, craftingRecipeCategory, + i, j, defaultedList, itemStack); } @Override @@ -240,6 +233,8 @@ public ReinforcedShulkerBoxCraftingRecipe read(Identifier identifier, PacketByte int i = packetByteBuf.readVarInt(); int j = packetByteBuf.readVarInt(); String string = packetByteBuf.readString(); + CraftingRecipeCategory craftingRecipeCategory = packetByteBuf + .readEnumConstant(CraftingRecipeCategory.class); DefaultedList defaultedList = DefaultedList.ofSize(i * j, Ingredient.EMPTY); for (int k = 0; k < defaultedList.size(); ++k) { @@ -247,22 +242,23 @@ public ReinforcedShulkerBoxCraftingRecipe read(Identifier identifier, PacketByte } ItemStack itemStack = packetByteBuf.readItemStack(); - return new ReinforcedShulkerBoxCraftingRecipe(identifier, string, i, j, defaultedList, itemStack); + return new ReinforcedShulkerBoxCraftingRecipe(identifier, string, craftingRecipeCategory, + i, j, defaultedList, itemStack); } @Override public void write(PacketByteBuf packetByteBuf, ReinforcedShulkerBoxCraftingRecipe recipe) { - packetByteBuf.writeVarInt(recipe.width); - packetByteBuf.writeVarInt(recipe.height); - packetByteBuf.writeString(recipe.group); - Iterator var3 = recipe.input.iterator(); + packetByteBuf.writeVarInt(recipe.getWidth()); + packetByteBuf.writeVarInt(recipe.getHeight()); + packetByteBuf.writeString(recipe.getGroup()); + Iterator var3 = recipe.getIngredients().iterator(); while (var3.hasNext()) { Ingredient ingredient = (Ingredient) var3.next(); ingredient.write(packetByteBuf); } - packetByteBuf.writeItemStack(recipe.output); + packetByteBuf.writeItemStack(recipe.getOutput()); } } } diff --git a/src/main/java/atonkish/reinfshulker/stat/ModStats.java b/src/main/java/atonkish/reinfshulker/stat/ModStats.java index 24815ea..2a15528 100644 --- a/src/main/java/atonkish/reinfshulker/stat/ModStats.java +++ b/src/main/java/atonkish/reinfshulker/stat/ModStats.java @@ -3,10 +3,11 @@ import java.util.LinkedHashMap; import java.util.Map; +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; import net.minecraft.stat.StatFormatter; import net.minecraft.stat.Stats; import net.minecraft.util.Identifier; -import net.minecraft.util.registry.Registry; import atonkish.reinfcore.util.ReinforcingMaterial; @@ -36,7 +37,7 @@ public static Identifier registerMaterialClean(String namespace, ReinforcingMate private static Identifier register(String namespace, String id, StatFormatter formatter) { Identifier identifier = new Identifier(namespace, id); - Registry.register(Registry.CUSTOM_STAT, id, identifier); + Registry.register(Registries.CUSTOM_STAT, id, identifier); Stats.CUSTOM.getOrCreateStat(identifier, formatter); return identifier; } diff --git a/src/main/java/atonkish/reinfshulker/util/ReinforcingMaterialSettings.java b/src/main/java/atonkish/reinfshulker/util/ReinforcingMaterialSettings.java index ce5405e..6c33eb2 100644 --- a/src/main/java/atonkish/reinfshulker/util/ReinforcingMaterialSettings.java +++ b/src/main/java/atonkish/reinfshulker/util/ReinforcingMaterialSettings.java @@ -12,25 +12,24 @@ import net.minecraft.sound.BlockSoundGroup; import atonkish.reinfcore.api.ReinforcedCoreRegistry; -import atonkish.reinfcore.item.ModItemGroup; import atonkish.reinfcore.util.ReinforcingMaterial; public enum ReinforcingMaterialSettings { COPPER(ReinforcedCoreRegistry.registerReinforcingMaterial("copper", 45, Items.COPPER_INGOT), FabricBlockSettings.of(Material.SHULKER_BOX).strength(2.0F, 6.0F).sounds(BlockSoundGroup.COPPER), - new Item.Settings().maxCount(1).group(ModItemGroup.REINFORCED_STORAGE)), + new Item.Settings().maxCount(1)), IRON(ReinforcedCoreRegistry.registerReinforcingMaterial("iron", 54, Items.IRON_INGOT), FabricBlockSettings.of(Material.SHULKER_BOX).strength(2.0F, 6.0F).sounds(BlockSoundGroup.METAL), - new Item.Settings().maxCount(1).group(ModItemGroup.REINFORCED_STORAGE)), + new Item.Settings().maxCount(1)), GOLD(ReinforcedCoreRegistry.registerReinforcingMaterial("gold", 81, Items.GOLD_INGOT), FabricBlockSettings.of(Material.SHULKER_BOX).strength(2.0F, 6.0F).sounds(BlockSoundGroup.METAL), - new Item.Settings().maxCount(1).group(ModItemGroup.REINFORCED_STORAGE)), + new Item.Settings().maxCount(1)), DIAMOND(ReinforcedCoreRegistry.registerReinforcingMaterial("diamond", 108, Items.DIAMOND), FabricBlockSettings.of(Material.SHULKER_BOX).strength(2.0F, 6.0F).sounds(BlockSoundGroup.METAL), - new Item.Settings().maxCount(1).group(ModItemGroup.REINFORCED_STORAGE)), + new Item.Settings().maxCount(1)), NETHERITE(ReinforcedCoreRegistry.registerReinforcingMaterial("netherite", 108, Items.NETHERITE_INGOT), FabricBlockSettings.of(Material.SHULKER_BOX).strength(2.0F, 1200.0F).sounds(BlockSoundGroup.NETHERITE), - new Item.Settings().maxCount(1).group(ModItemGroup.REINFORCED_STORAGE).fireproof()); + new Item.Settings().maxCount(1).fireproof()); private final ReinforcingMaterial material; private final Block.Settings blockSettings; diff --git a/src/main/resources/assets/minecraft/atlases/shulker_boxes.json b/src/main/resources/assets/minecraft/atlases/shulker_boxes.json new file mode 100644 index 0000000..0b9e4a2 --- /dev/null +++ b/src/main/resources/assets/minecraft/atlases/shulker_boxes.json @@ -0,0 +1,29 @@ +{ + "sources": [ + { + "type": "directory", + "source": "entity/reinforced_shulker/copper", + "prefix": "entity/reinforced_shulker/copper/" + }, + { + "type": "directory", + "source": "entity/reinforced_shulker/iron", + "prefix": "entity/reinforced_shulker/iron/" + }, + { + "type": "directory", + "source": "entity/reinforced_shulker/gold", + "prefix": "entity/reinforced_shulker/gold/" + }, + { + "type": "directory", + "source": "entity/reinforced_shulker/diamond", + "prefix": "entity/reinforced_shulker/diamond/" + }, + { + "type": "directory", + "source": "entity/reinforced_shulker/netherite", + "prefix": "entity/reinforced_shulker/netherite/" + } + ] +} diff --git a/src/main/resources/data/reinfshulker/recipes/black_copper_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/black_copper_shulker_box.json index ac364bb..cafdaa5 100644 --- a/src/main/resources/data/reinfshulker/recipes/black_copper_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/black_copper_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/data/reinfshulker/recipes/black_diamond_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/black_diamond_shulker_box.json index 26d4f70..b763fed 100644 --- a/src/main/resources/data/reinfshulker/recipes/black_diamond_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/black_diamond_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/data/reinfshulker/recipes/black_gold_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/black_gold_shulker_box.json index 5b7fbfc..5278c03 100644 --- a/src/main/resources/data/reinfshulker/recipes/black_gold_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/black_gold_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/data/reinfshulker/recipes/black_iron_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/black_iron_shulker_box.json index 4c44abe..b65e48d 100644 --- a/src/main/resources/data/reinfshulker/recipes/black_iron_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/black_iron_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/data/reinfshulker/recipes/blue_copper_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/blue_copper_shulker_box.json index 3e9bc0e..d48b4e0 100644 --- a/src/main/resources/data/reinfshulker/recipes/blue_copper_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/blue_copper_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/data/reinfshulker/recipes/blue_diamond_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/blue_diamond_shulker_box.json index 36b80bb..a7deb42 100644 --- a/src/main/resources/data/reinfshulker/recipes/blue_diamond_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/blue_diamond_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/data/reinfshulker/recipes/blue_gold_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/blue_gold_shulker_box.json index fce6659..900cae7 100644 --- a/src/main/resources/data/reinfshulker/recipes/blue_gold_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/blue_gold_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/data/reinfshulker/recipes/blue_iron_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/blue_iron_shulker_box.json index 711ba93..cc87079 100644 --- a/src/main/resources/data/reinfshulker/recipes/blue_iron_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/blue_iron_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/data/reinfshulker/recipes/brown_copper_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/brown_copper_shulker_box.json index 861377c..9ba0ad5 100644 --- a/src/main/resources/data/reinfshulker/recipes/brown_copper_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/brown_copper_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/data/reinfshulker/recipes/brown_diamond_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/brown_diamond_shulker_box.json index fa42ae2..5b0a760 100644 --- a/src/main/resources/data/reinfshulker/recipes/brown_diamond_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/brown_diamond_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/data/reinfshulker/recipes/brown_gold_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/brown_gold_shulker_box.json index 9f9a64d..57e9fc5 100644 --- a/src/main/resources/data/reinfshulker/recipes/brown_gold_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/brown_gold_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/data/reinfshulker/recipes/brown_iron_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/brown_iron_shulker_box.json index 798db2a..3d59611 100644 --- a/src/main/resources/data/reinfshulker/recipes/brown_iron_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/brown_iron_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/data/reinfshulker/recipes/copper_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/copper_shulker_box.json index db68a9c..1f2dabb 100644 --- a/src/main/resources/data/reinfshulker/recipes/copper_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/copper_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/data/reinfshulker/recipes/copper_shulker_box_from_copper_chest.json b/src/main/resources/data/reinfshulker/recipes/copper_shulker_box_from_copper_chest.json index 87e08fd..dcb3141 100644 --- a/src/main/resources/data/reinfshulker/recipes/copper_shulker_box_from_copper_chest.json +++ b/src/main/resources/data/reinfshulker/recipes/copper_shulker_box_from_copper_chest.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shaped", + "category": "misc", "pattern": ["S", "C", "S"], "key": { "C": { diff --git a/src/main/resources/data/reinfshulker/recipes/cyan_copper_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/cyan_copper_shulker_box.json index 89379bb..8016bda 100644 --- a/src/main/resources/data/reinfshulker/recipes/cyan_copper_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/cyan_copper_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/data/reinfshulker/recipes/cyan_diamond_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/cyan_diamond_shulker_box.json index 79ac550..ec45179 100644 --- a/src/main/resources/data/reinfshulker/recipes/cyan_diamond_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/cyan_diamond_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/data/reinfshulker/recipes/cyan_gold_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/cyan_gold_shulker_box.json index 8cb1229..df2a8c0 100644 --- a/src/main/resources/data/reinfshulker/recipes/cyan_gold_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/cyan_gold_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/data/reinfshulker/recipes/cyan_iron_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/cyan_iron_shulker_box.json index 13eb425..8fa98c8 100644 --- a/src/main/resources/data/reinfshulker/recipes/cyan_iron_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/cyan_iron_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/data/reinfshulker/recipes/diamond_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/diamond_shulker_box.json index 0285eb2..b5996a8 100644 --- a/src/main/resources/data/reinfshulker/recipes/diamond_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/diamond_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/data/reinfshulker/recipes/diamond_shulker_box_from_diamond_chest.json b/src/main/resources/data/reinfshulker/recipes/diamond_shulker_box_from_diamond_chest.json index 9b6e2d7..de004c4 100644 --- a/src/main/resources/data/reinfshulker/recipes/diamond_shulker_box_from_diamond_chest.json +++ b/src/main/resources/data/reinfshulker/recipes/diamond_shulker_box_from_diamond_chest.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shaped", + "category": "misc", "pattern": ["S", "C", "S"], "key": { "C": { diff --git a/src/main/resources/data/reinfshulker/recipes/gold_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/gold_shulker_box.json index 3598052..20a07cf 100644 --- a/src/main/resources/data/reinfshulker/recipes/gold_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/gold_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/data/reinfshulker/recipes/gold_shulker_box_from_gold_chest.json b/src/main/resources/data/reinfshulker/recipes/gold_shulker_box_from_gold_chest.json index ecc6967..8d22a63 100644 --- a/src/main/resources/data/reinfshulker/recipes/gold_shulker_box_from_gold_chest.json +++ b/src/main/resources/data/reinfshulker/recipes/gold_shulker_box_from_gold_chest.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shaped", + "category": "misc", "pattern": ["S", "C", "S"], "key": { "C": { diff --git a/src/main/resources/data/reinfshulker/recipes/gray_copper_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/gray_copper_shulker_box.json index fcbba70..0fb0682 100644 --- a/src/main/resources/data/reinfshulker/recipes/gray_copper_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/gray_copper_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/data/reinfshulker/recipes/gray_diamond_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/gray_diamond_shulker_box.json index 129383a..64ce51d 100644 --- a/src/main/resources/data/reinfshulker/recipes/gray_diamond_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/gray_diamond_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/data/reinfshulker/recipes/gray_gold_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/gray_gold_shulker_box.json index 49b58fe..19a6ab2 100644 --- a/src/main/resources/data/reinfshulker/recipes/gray_gold_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/gray_gold_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/data/reinfshulker/recipes/gray_iron_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/gray_iron_shulker_box.json index efc96cc..4f8e564 100644 --- a/src/main/resources/data/reinfshulker/recipes/gray_iron_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/gray_iron_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/data/reinfshulker/recipes/green_copper_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/green_copper_shulker_box.json index dd8a507..652eddd 100644 --- a/src/main/resources/data/reinfshulker/recipes/green_copper_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/green_copper_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/data/reinfshulker/recipes/green_diamond_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/green_diamond_shulker_box.json index 1c2bb9f..bbddb2a 100644 --- a/src/main/resources/data/reinfshulker/recipes/green_diamond_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/green_diamond_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/data/reinfshulker/recipes/green_gold_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/green_gold_shulker_box.json index 1bf77cd..581e8b8 100644 --- a/src/main/resources/data/reinfshulker/recipes/green_gold_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/green_gold_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/data/reinfshulker/recipes/green_iron_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/green_iron_shulker_box.json index d3d4cf1..3b11c67 100644 --- a/src/main/resources/data/reinfshulker/recipes/green_iron_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/green_iron_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/data/reinfshulker/recipes/iron_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/iron_shulker_box.json index 4ebf411..ed0b8b6 100644 --- a/src/main/resources/data/reinfshulker/recipes/iron_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/iron_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/data/reinfshulker/recipes/iron_shulker_box_from_iron_chest.json b/src/main/resources/data/reinfshulker/recipes/iron_shulker_box_from_iron_chest.json index c11adda..29417c7 100644 --- a/src/main/resources/data/reinfshulker/recipes/iron_shulker_box_from_iron_chest.json +++ b/src/main/resources/data/reinfshulker/recipes/iron_shulker_box_from_iron_chest.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shaped", + "category": "misc", "pattern": ["S", "C", "S"], "key": { "C": { diff --git a/src/main/resources/data/reinfshulker/recipes/light_blue_copper_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/light_blue_copper_shulker_box.json index 3d814bf..f265847 100644 --- a/src/main/resources/data/reinfshulker/recipes/light_blue_copper_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/light_blue_copper_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/data/reinfshulker/recipes/light_blue_diamond_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/light_blue_diamond_shulker_box.json index fe53590..ff19abe 100644 --- a/src/main/resources/data/reinfshulker/recipes/light_blue_diamond_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/light_blue_diamond_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/data/reinfshulker/recipes/light_blue_gold_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/light_blue_gold_shulker_box.json index 3482343..0e3e6b5 100644 --- a/src/main/resources/data/reinfshulker/recipes/light_blue_gold_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/light_blue_gold_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/data/reinfshulker/recipes/light_blue_iron_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/light_blue_iron_shulker_box.json index abb88aa..c1773a1 100644 --- a/src/main/resources/data/reinfshulker/recipes/light_blue_iron_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/light_blue_iron_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/data/reinfshulker/recipes/light_gray_copper_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/light_gray_copper_shulker_box.json index d45f233..299b5ae 100644 --- a/src/main/resources/data/reinfshulker/recipes/light_gray_copper_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/light_gray_copper_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/data/reinfshulker/recipes/light_gray_diamond_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/light_gray_diamond_shulker_box.json index 5fd9509..5548250 100644 --- a/src/main/resources/data/reinfshulker/recipes/light_gray_diamond_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/light_gray_diamond_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/data/reinfshulker/recipes/light_gray_gold_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/light_gray_gold_shulker_box.json index cc51d4b..d054c41 100644 --- a/src/main/resources/data/reinfshulker/recipes/light_gray_gold_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/light_gray_gold_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/data/reinfshulker/recipes/light_gray_iron_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/light_gray_iron_shulker_box.json index f5b6b09..adf124d 100644 --- a/src/main/resources/data/reinfshulker/recipes/light_gray_iron_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/light_gray_iron_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/data/reinfshulker/recipes/lime_copper_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/lime_copper_shulker_box.json index 15f1417..e73819a 100644 --- a/src/main/resources/data/reinfshulker/recipes/lime_copper_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/lime_copper_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/data/reinfshulker/recipes/lime_diamond_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/lime_diamond_shulker_box.json index 7d92f0e..30ac973 100644 --- a/src/main/resources/data/reinfshulker/recipes/lime_diamond_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/lime_diamond_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/data/reinfshulker/recipes/lime_gold_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/lime_gold_shulker_box.json index 6d841ea..24b3088 100644 --- a/src/main/resources/data/reinfshulker/recipes/lime_gold_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/lime_gold_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/data/reinfshulker/recipes/lime_iron_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/lime_iron_shulker_box.json index 5a1d4b1..c221f90 100644 --- a/src/main/resources/data/reinfshulker/recipes/lime_iron_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/lime_iron_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/data/reinfshulker/recipes/magenta_copper_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/magenta_copper_shulker_box.json index b47d4a6..3757a04 100644 --- a/src/main/resources/data/reinfshulker/recipes/magenta_copper_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/magenta_copper_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/data/reinfshulker/recipes/magenta_diamond_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/magenta_diamond_shulker_box.json index e9f1cd9..1544faf 100644 --- a/src/main/resources/data/reinfshulker/recipes/magenta_diamond_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/magenta_diamond_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/data/reinfshulker/recipes/magenta_gold_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/magenta_gold_shulker_box.json index 69960f5..578fb87 100644 --- a/src/main/resources/data/reinfshulker/recipes/magenta_gold_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/magenta_gold_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/data/reinfshulker/recipes/magenta_iron_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/magenta_iron_shulker_box.json index d53506c..6cdb107 100644 --- a/src/main/resources/data/reinfshulker/recipes/magenta_iron_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/magenta_iron_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/data/reinfshulker/recipes/netherite_shulker_box_from_netherite_chest.json b/src/main/resources/data/reinfshulker/recipes/netherite_shulker_box_from_netherite_chest.json index c2e3a83..f5f53de 100644 --- a/src/main/resources/data/reinfshulker/recipes/netherite_shulker_box_from_netherite_chest.json +++ b/src/main/resources/data/reinfshulker/recipes/netherite_shulker_box_from_netherite_chest.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shaped", + "category": "misc", "pattern": ["S", "C", "S"], "key": { "C": { diff --git a/src/main/resources/data/reinfshulker/recipes/orange_copper_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/orange_copper_shulker_box.json index 4183684..c6f80dd 100644 --- a/src/main/resources/data/reinfshulker/recipes/orange_copper_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/orange_copper_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/data/reinfshulker/recipes/orange_diamond_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/orange_diamond_shulker_box.json index 1bf992f..ce244b2 100644 --- a/src/main/resources/data/reinfshulker/recipes/orange_diamond_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/orange_diamond_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/data/reinfshulker/recipes/orange_gold_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/orange_gold_shulker_box.json index 6424095..ad2c713 100644 --- a/src/main/resources/data/reinfshulker/recipes/orange_gold_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/orange_gold_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/data/reinfshulker/recipes/orange_iron_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/orange_iron_shulker_box.json index ab7102e..6a00c5f 100644 --- a/src/main/resources/data/reinfshulker/recipes/orange_iron_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/orange_iron_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/data/reinfshulker/recipes/pink_copper_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/pink_copper_shulker_box.json index 4e5c279..9b27cd9 100644 --- a/src/main/resources/data/reinfshulker/recipes/pink_copper_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/pink_copper_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/data/reinfshulker/recipes/pink_diamond_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/pink_diamond_shulker_box.json index 15f49ed..9f7c86e 100644 --- a/src/main/resources/data/reinfshulker/recipes/pink_diamond_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/pink_diamond_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/data/reinfshulker/recipes/pink_gold_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/pink_gold_shulker_box.json index 272063b..aadda6e 100644 --- a/src/main/resources/data/reinfshulker/recipes/pink_gold_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/pink_gold_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/data/reinfshulker/recipes/pink_iron_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/pink_iron_shulker_box.json index 2e123da..744b54c 100644 --- a/src/main/resources/data/reinfshulker/recipes/pink_iron_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/pink_iron_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/data/reinfshulker/recipes/purple_copper_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/purple_copper_shulker_box.json index 9c1300c..1ca7bc7 100644 --- a/src/main/resources/data/reinfshulker/recipes/purple_copper_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/purple_copper_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/data/reinfshulker/recipes/purple_diamond_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/purple_diamond_shulker_box.json index c054bd3..cee3f38 100644 --- a/src/main/resources/data/reinfshulker/recipes/purple_diamond_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/purple_diamond_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/data/reinfshulker/recipes/purple_gold_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/purple_gold_shulker_box.json index 105f841..4bc4d7d 100644 --- a/src/main/resources/data/reinfshulker/recipes/purple_gold_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/purple_gold_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/data/reinfshulker/recipes/purple_iron_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/purple_iron_shulker_box.json index ba6e674..26d6fcb 100644 --- a/src/main/resources/data/reinfshulker/recipes/purple_iron_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/purple_iron_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/data/reinfshulker/recipes/red_copper_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/red_copper_shulker_box.json index e974300..699e2b4 100644 --- a/src/main/resources/data/reinfshulker/recipes/red_copper_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/red_copper_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/data/reinfshulker/recipes/red_diamond_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/red_diamond_shulker_box.json index 6f6ea1a..255e042 100644 --- a/src/main/resources/data/reinfshulker/recipes/red_diamond_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/red_diamond_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/data/reinfshulker/recipes/red_gold_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/red_gold_shulker_box.json index a243f90..c9aade6 100644 --- a/src/main/resources/data/reinfshulker/recipes/red_gold_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/red_gold_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/data/reinfshulker/recipes/red_iron_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/red_iron_shulker_box.json index 4069659..1a3df09 100644 --- a/src/main/resources/data/reinfshulker/recipes/red_iron_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/red_iron_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/data/reinfshulker/recipes/white_copper_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/white_copper_shulker_box.json index 6c17a10..dbcf3af 100644 --- a/src/main/resources/data/reinfshulker/recipes/white_copper_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/white_copper_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/data/reinfshulker/recipes/white_diamond_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/white_diamond_shulker_box.json index 24c16af..590a7d2 100644 --- a/src/main/resources/data/reinfshulker/recipes/white_diamond_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/white_diamond_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/data/reinfshulker/recipes/white_gold_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/white_gold_shulker_box.json index 8041f3d..3110eb4 100644 --- a/src/main/resources/data/reinfshulker/recipes/white_gold_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/white_gold_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/data/reinfshulker/recipes/white_iron_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/white_iron_shulker_box.json index ed3a103..fa1de36 100644 --- a/src/main/resources/data/reinfshulker/recipes/white_iron_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/white_iron_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/data/reinfshulker/recipes/yellow_copper_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/yellow_copper_shulker_box.json index 87029a8..0f2b24e 100644 --- a/src/main/resources/data/reinfshulker/recipes/yellow_copper_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/yellow_copper_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/data/reinfshulker/recipes/yellow_diamond_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/yellow_diamond_shulker_box.json index 91ed218..80a98e4 100644 --- a/src/main/resources/data/reinfshulker/recipes/yellow_diamond_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/yellow_diamond_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/data/reinfshulker/recipes/yellow_gold_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/yellow_gold_shulker_box.json index c8fb765..d89a4d0 100644 --- a/src/main/resources/data/reinfshulker/recipes/yellow_gold_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/yellow_gold_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/data/reinfshulker/recipes/yellow_iron_shulker_box.json b/src/main/resources/data/reinfshulker/recipes/yellow_iron_shulker_box.json index a8d1bf7..e3aac3e 100644 --- a/src/main/resources/data/reinfshulker/recipes/yellow_iron_shulker_box.json +++ b/src/main/resources/data/reinfshulker/recipes/yellow_iron_shulker_box.json @@ -1,5 +1,6 @@ { "type": "reinfshulker:crafting_special_reinforcedshulkerbox", + "category": "misc", "pattern": ["MMM", "MSM", "MMM"], "key": { "S": { diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 7ada97b..72d86ba 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -2,6 +2,7 @@ "schemaVersion": 1, "id": "reinfshulker", "version": "${version}", + "name": "Reinforced Shulker Boxes", "description": "Adds reinforced shulker boxes.", "authors": ["Aton-Kish"], @@ -10,8 +11,10 @@ "sources": "https://github.com/Aton-Kish/reinforced-shulker-boxes", "issues": "https://github.com/Aton-Kish/reinforced-shulker-boxes/issues" }, + "license": "MIT", "icon": "assets/reinfshulker/icon.png", + "environment": "*", "entrypoints": { "main": ["atonkish.reinfshulker.ReinforcedShulkerBoxesMod"], @@ -28,10 +31,17 @@ "modmenu": ["atonkish.reinfcore.integration.modmenu.ModMenu"] }, "mixins": ["reinfshulker.mixins.json"], + "depends": { - "fabricloader": ">=0.14.6", - "fabric": "*", - "minecraft": "~1.19", + "fabricloader": ">=0.14.11", + "fabric-api": "*", + "minecraft": "~1.19.3", "java": ">=17" + }, + "suggests": { + "modmenu": "*", + "reinfchest": "*", + "quickshulker": "*", + "shulkerboxtooltip": "*" } }