From 32103443c3e471b7f7fbc5ba99f7b05ccdc22a71 Mon Sep 17 00:00:00 2001 From: MattiDragon Date: Sun, 23 Jun 2024 12:06:27 +0300 Subject: [PATCH] Update to 1.21 and fix normals --- build.gradle | 6 +-- changelog/3.0.0+1.21.md | 2 + changelog/3.0.0-beta.1+1.20.6.md | 3 -- gradle.properties | 14 +++--- gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 2 +- .../client/config/ConfigScreenFactory.java | 2 +- .../client/config/IdentifierController.java | 4 +- .../client/mixin/RenderSystemAccess.java | 14 ++++++ .../AbstractDrawerBlockEntityRenderer.java | 43 ++++++++++--------- .../extended_drawers.client.mixins.json | 3 +- .../recipes/decorations/access_point.json | 0 .../decorations/compacting_drawer.json | 0 .../recipes/decorations/connector.json | 0 .../recipes/decorations/double_drawer.json | 0 .../recipes/decorations/quad_drawer.json | 0 .../recipes/decorations/shadow_drawer.json | 0 .../recipes/decorations/single_drawer.json | 0 .../recipes/misc/t1_upgrade.json | 0 .../recipes/misc/t2_upgrade.json | 0 .../recipes/misc/t3_upgrade.json | 0 .../recipes/misc/t4_upgrade.json | 0 .../recipes/misc/upgrade_frame.json | 0 .../recipes/redstone/limiter.json | 0 .../recipes/tools/lock.json | 0 .../blocks/access_point.json | 0 .../blocks/compacting_drawer.json | 0 .../blocks/connector.json | 0 .../blocks/double_drawer.json | 0 .../blocks/quad_drawer.json | 0 .../blocks/shadow_drawer.json | 0 .../blocks/single_drawer.json | 0 .../{recipes => recipe}/access_point.json | 0 .../compacting_drawer.json | 0 .../{recipes => recipe}/connector.json | 0 .../{recipes => recipe}/copy_limiter.json | 0 .../{recipes => recipe}/double_drawer.json | 0 .../{recipes => recipe}/limiter.json | 0 .../{recipes => recipe}/lock.json | 0 .../{recipes => recipe}/quad_drawer.json | 0 .../{recipes => recipe}/shadow_drawer.json | 0 .../{recipes => recipe}/single_drawer.json | 0 .../{recipes => recipe}/t1_upgrade.json | 0 .../{recipes => recipe}/t2_upgrade.json | 0 .../{recipes => recipe}/t3_upgrade.json | 0 .../{recipes => recipe}/t4_upgrade.json | 0 .../{recipes => recipe}/upgrade_frame.json | 0 .../tags/{blocks => block}/drawers.json | 0 .../{blocks => block}/network_components.json | 0 .../tags/{items => item}/drawers.json | 0 .../tags/{items => item}/toggle/duping.json | 0 .../tags/{items => item}/toggle/hidden.json | 0 .../tags/{items => item}/toggle/lock.json | 0 .../tags/{items => item}/toggle/voiding.json | 0 .../tags/{items => item}/upgrade.json | 0 .../tags/{blocks => block}/mineable/axe.json | 0 .../{blocks => block}/mineable/pickaxe.json | 0 .../extendeddrawers/ExtendedDrawers.java | 2 +- .../block/CompactingDrawerBlock.java | 2 +- .../extendeddrawers/block/DrawerBlock.java | 2 +- .../compacting/CompressionOverrideLoader.java | 2 +- .../compacting/CompressionRecipeManager.java | 22 +++------- .../config/category/ClientCategory.java | 2 +- .../extendeddrawers/item/LimiterItem.java | 2 +- .../recipe/CopyLimiterRecipe.java | 16 +++---- .../registry/ModDataComponents.java | 8 ++-- src/main/resources/fabric.mod.json | 6 +-- 67 files changed, 82 insertions(+), 77 deletions(-) create mode 100644 changelog/3.0.0+1.21.md delete mode 100644 changelog/3.0.0-beta.1+1.20.6.md create mode 100644 src/client/java/io/github/mattidragon/extendeddrawers/client/mixin/RenderSystemAccess.java rename src/main/generated/data/extended_drawers/{advancements => advancement}/recipes/decorations/access_point.json (100%) rename src/main/generated/data/extended_drawers/{advancements => advancement}/recipes/decorations/compacting_drawer.json (100%) rename src/main/generated/data/extended_drawers/{advancements => advancement}/recipes/decorations/connector.json (100%) rename src/main/generated/data/extended_drawers/{advancements => advancement}/recipes/decorations/double_drawer.json (100%) rename src/main/generated/data/extended_drawers/{advancements => advancement}/recipes/decorations/quad_drawer.json (100%) rename src/main/generated/data/extended_drawers/{advancements => advancement}/recipes/decorations/shadow_drawer.json (100%) rename src/main/generated/data/extended_drawers/{advancements => advancement}/recipes/decorations/single_drawer.json (100%) rename src/main/generated/data/extended_drawers/{advancements => advancement}/recipes/misc/t1_upgrade.json (100%) rename src/main/generated/data/extended_drawers/{advancements => advancement}/recipes/misc/t2_upgrade.json (100%) rename src/main/generated/data/extended_drawers/{advancements => advancement}/recipes/misc/t3_upgrade.json (100%) rename src/main/generated/data/extended_drawers/{advancements => advancement}/recipes/misc/t4_upgrade.json (100%) rename src/main/generated/data/extended_drawers/{advancements => advancement}/recipes/misc/upgrade_frame.json (100%) rename src/main/generated/data/extended_drawers/{advancements => advancement}/recipes/redstone/limiter.json (100%) rename src/main/generated/data/extended_drawers/{advancements => advancement}/recipes/tools/lock.json (100%) rename src/main/generated/data/extended_drawers/{loot_tables => loot_table}/blocks/access_point.json (100%) rename src/main/generated/data/extended_drawers/{loot_tables => loot_table}/blocks/compacting_drawer.json (100%) rename src/main/generated/data/extended_drawers/{loot_tables => loot_table}/blocks/connector.json (100%) rename src/main/generated/data/extended_drawers/{loot_tables => loot_table}/blocks/double_drawer.json (100%) rename src/main/generated/data/extended_drawers/{loot_tables => loot_table}/blocks/quad_drawer.json (100%) rename src/main/generated/data/extended_drawers/{loot_tables => loot_table}/blocks/shadow_drawer.json (100%) rename src/main/generated/data/extended_drawers/{loot_tables => loot_table}/blocks/single_drawer.json (100%) rename src/main/generated/data/extended_drawers/{recipes => recipe}/access_point.json (100%) rename src/main/generated/data/extended_drawers/{recipes => recipe}/compacting_drawer.json (100%) rename src/main/generated/data/extended_drawers/{recipes => recipe}/connector.json (100%) rename src/main/generated/data/extended_drawers/{recipes => recipe}/copy_limiter.json (100%) rename src/main/generated/data/extended_drawers/{recipes => recipe}/double_drawer.json (100%) rename src/main/generated/data/extended_drawers/{recipes => recipe}/limiter.json (100%) rename src/main/generated/data/extended_drawers/{recipes => recipe}/lock.json (100%) rename src/main/generated/data/extended_drawers/{recipes => recipe}/quad_drawer.json (100%) rename src/main/generated/data/extended_drawers/{recipes => recipe}/shadow_drawer.json (100%) rename src/main/generated/data/extended_drawers/{recipes => recipe}/single_drawer.json (100%) rename src/main/generated/data/extended_drawers/{recipes => recipe}/t1_upgrade.json (100%) rename src/main/generated/data/extended_drawers/{recipes => recipe}/t2_upgrade.json (100%) rename src/main/generated/data/extended_drawers/{recipes => recipe}/t3_upgrade.json (100%) rename src/main/generated/data/extended_drawers/{recipes => recipe}/t4_upgrade.json (100%) rename src/main/generated/data/extended_drawers/{recipes => recipe}/upgrade_frame.json (100%) rename src/main/generated/data/extended_drawers/tags/{blocks => block}/drawers.json (100%) rename src/main/generated/data/extended_drawers/tags/{blocks => block}/network_components.json (100%) rename src/main/generated/data/extended_drawers/tags/{items => item}/drawers.json (100%) rename src/main/generated/data/extended_drawers/tags/{items => item}/toggle/duping.json (100%) rename src/main/generated/data/extended_drawers/tags/{items => item}/toggle/hidden.json (100%) rename src/main/generated/data/extended_drawers/tags/{items => item}/toggle/lock.json (100%) rename src/main/generated/data/extended_drawers/tags/{items => item}/toggle/voiding.json (100%) rename src/main/generated/data/extended_drawers/tags/{items => item}/upgrade.json (100%) rename src/main/generated/data/minecraft/tags/{blocks => block}/mineable/axe.json (100%) rename src/main/generated/data/minecraft/tags/{blocks => block}/mineable/pickaxe.json (100%) diff --git a/build.gradle b/build.gradle index f4da15a..1f344ce 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.6-SNAPSHOT' + id 'fabric-loom' version '1.7-SNAPSHOT' id 'maven-publish' } @@ -33,8 +33,8 @@ dependencies { modImplementation "net.fabricmc.fabric-api:fabric-api:$fabric_version" // Dependencies - include modImplementation("com.kneelawk.graphlib:core-fabric:$graphlib_version") - modLocalRuntime("com.kneelawk.graphlib:debugrender-fabric:$graphlib_version") + include modImplementation("com.kneelawk.graphlib:graphlib-core-fabric:$graphlib_version") + modLocalRuntime("com.kneelawk.graphlib:graphlib-debugrender-fabric:$graphlib_version") //modImplementation "vazkii.patchouli:Patchouli:$patchouli_version" modImplementation annotationProcessor(include("com.github.mattidragon:ConfigToolkit:$configtoolkit_version")) diff --git a/changelog/3.0.0+1.21.md b/changelog/3.0.0+1.21.md new file mode 100644 index 0000000..dbb5e13 --- /dev/null +++ b/changelog/3.0.0+1.21.md @@ -0,0 +1,2 @@ +* Updated to 1.21 +* Fix longstanding issues with lighting of items in drawers \ No newline at end of file diff --git a/changelog/3.0.0-beta.1+1.20.6.md b/changelog/3.0.0-beta.1+1.20.6.md deleted file mode 100644 index 5f620c4..0000000 --- a/changelog/3.0.0-beta.1+1.20.6.md +++ /dev/null @@ -1,3 +0,0 @@ -*Currently in beta due to graphlib being in alpha* -* Updated to 1.20.6 -* Compacting drawers no longer show all slots in tooltips due to technical limitations \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index ae93e2d..8e761ba 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,17 +1,17 @@ org.gradle.jvmargs=-Xmx1G -minecraft_version=1.20.6 -yarn_mappings=1.20.6+build.1 +minecraft_version=1.21 +yarn_mappings=1.21+build.2 loader_version=0.15.11 -mod_version=3.0.0-beta.1 +mod_version=3.0.0 maven_group=io.github.mattidragon archives_base_name=ExtendedDrawers -fabric_version=0.98.0+1.20.6 -graphlib_version=2.0.0-alpha.16+1.20.6 +fabric_version=0.100.3+1.21 +graphlib_version=2.0.0+1.21 patchouli_version=1.20.1-81-FABRIC -yacl_version=3.4.2+1.20.5 -modmenu_version=10.0.0-beta.1 +yacl_version=3.5.0+1.21 +modmenu_version=11.0.1 configtoolkit_version=1.1.1 noindium_version=1.1.0+1.20.4 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b82aa23..a441313 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-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 1aa94a4..b740cf1 100644 --- 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/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/. diff --git a/src/client/java/io/github/mattidragon/extendeddrawers/client/config/ConfigScreenFactory.java b/src/client/java/io/github/mattidragon/extendeddrawers/client/config/ConfigScreenFactory.java index 2f47065..3365134 100644 --- a/src/client/java/io/github/mattidragon/extendeddrawers/client/config/ConfigScreenFactory.java +++ b/src/client/java/io/github/mattidragon/extendeddrawers/client/config/ConfigScreenFactory.java @@ -345,7 +345,7 @@ public int render(DrawContext context, int x, int y, int renderWidth, float tick matrices.multiply(RotationAxis.POSITIVE_X.rotationDegrees(180)); matrices.translate(0.5, -0.5, 0); - var voidingSprite = atlas.apply(new Identifier("minecraft", "item/lava_bucket")); + var voidingSprite = atlas.apply(Identifier.ofVanilla("item/lava_bucket")); var lockSprite = atlas.apply(id("item/lock")); var upgrade2Sprite = atlas.apply(id("item/t2_upgrade")); var upgrade4Sprite = atlas.apply(id("item/t4_upgrade")); diff --git a/src/client/java/io/github/mattidragon/extendeddrawers/client/config/IdentifierController.java b/src/client/java/io/github/mattidragon/extendeddrawers/client/config/IdentifierController.java index cafb8a3..c65592c 100644 --- a/src/client/java/io/github/mattidragon/extendeddrawers/client/config/IdentifierController.java +++ b/src/client/java/io/github/mattidragon/extendeddrawers/client/config/IdentifierController.java @@ -18,12 +18,12 @@ public String getString() { @Override public void setFromString(String value) { - option.requestSet(Objects.requireNonNullElse(Identifier.tryParse(value), new Identifier("air"))); + option.requestSet(Objects.requireNonNullElse(Identifier.tryParse(value), Identifier.ofVanilla("air"))); } @Override public boolean isInputValid(String input) { - return Identifier.isValid(input); + return !Identifier.validate(input).isError(); } @Override diff --git a/src/client/java/io/github/mattidragon/extendeddrawers/client/mixin/RenderSystemAccess.java b/src/client/java/io/github/mattidragon/extendeddrawers/client/mixin/RenderSystemAccess.java new file mode 100644 index 0000000..ac7b687 --- /dev/null +++ b/src/client/java/io/github/mattidragon/extendeddrawers/client/mixin/RenderSystemAccess.java @@ -0,0 +1,14 @@ +package io.github.mattidragon.extendeddrawers.client.mixin; + +import com.mojang.blaze3d.systems.RenderSystem; +import org.joml.Vector3f; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Accessor; + +@Mixin(RenderSystem.class) +public interface RenderSystemAccess { + @Accessor + static Vector3f[] getShaderLightDirections() { + throw new AssertionError(); + } +} diff --git a/src/client/java/io/github/mattidragon/extendeddrawers/client/renderer/AbstractDrawerBlockEntityRenderer.java b/src/client/java/io/github/mattidragon/extendeddrawers/client/renderer/AbstractDrawerBlockEntityRenderer.java index b40564c..985cb85 100644 --- a/src/client/java/io/github/mattidragon/extendeddrawers/client/renderer/AbstractDrawerBlockEntityRenderer.java +++ b/src/client/java/io/github/mattidragon/extendeddrawers/client/renderer/AbstractDrawerBlockEntityRenderer.java @@ -1,6 +1,7 @@ package io.github.mattidragon.extendeddrawers.client.renderer; import io.github.mattidragon.extendeddrawers.ExtendedDrawers; +import io.github.mattidragon.extendeddrawers.client.mixin.RenderSystemAccess; import net.fabricmc.fabric.api.renderer.v1.RendererAccess; import net.fabricmc.fabric.api.renderer.v1.mesh.MutableQuadView; import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant; @@ -27,6 +28,7 @@ import org.jetbrains.annotations.Nullable; import org.joml.Matrix4f; import org.joml.Quaternionf; +import org.joml.Vector3f; import java.util.List; import java.util.Objects; @@ -37,7 +39,6 @@ public abstract class AbstractDrawerBlockEntityRenderer i private final ItemRenderer itemRenderer; private final TextRenderer textRenderer; - private boolean isGui = false; public AbstractDrawerBlockEntityRenderer(ItemRenderer itemRenderer, TextRenderer textRenderer) { this.itemRenderer = itemRenderer; @@ -49,13 +50,11 @@ public AbstractDrawerBlockEntityRenderer(ItemRenderer itemRenderer, TextRenderer */ public static AbstractDrawerBlockEntityRenderer createRendererTool() { var client = MinecraftClient.getInstance(); - AbstractDrawerBlockEntityRenderer renderer = new AbstractDrawerBlockEntityRenderer<>(client.getItemRenderer(), client.textRenderer) { + return new AbstractDrawerBlockEntityRenderer<>(client.getItemRenderer(), client.textRenderer) { @Override public void render(BlockEntity entity, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay) { } }; - renderer.isGui = true; - return renderer; } public void renderSlot(ItemVariant item, @Nullable String amount, boolean small, boolean hidden, List icons, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay, int seed, BlockPos pos, World world) { @@ -134,26 +133,29 @@ public void renderItem(ItemVariant item, boolean small, int light, MatrixStack m matrices.push(); matrices.scale(itemScale, itemScale, 1); matrices.scale(0.75f, 0.75f, 1); - matrices.multiplyPositionMatrix(new Matrix4f().scale(1, 1, 0.01f)); - + matrices.peek().getPositionMatrix().mul(new Matrix4f().scale(1, 1, 0.01f)); + var stack = item.toStack(); var model = itemRenderer.getModel(stack, world, null, seed); - if (isGui) { - DiffuseLighting.disableGuiDepthLighting(); + // Copy existing light configuration + var lights = new Vector3f[2]; + System.arraycopy(RenderSystemAccess.getShaderLightDirections(), 0, lights, 0, 2); + + // Set up gui lighting + if (model.isSideLit()) { + matrices.peek().getNormalMatrix().rotate(ITEM_LIGHT_ROTATION_3D); + DiffuseLighting.enableGuiDepthLighting(); } else { - // Stolen from storage drawers - if (model.isSideLit()) { - matrices.peek().getNormalMatrix().rotate(ITEM_LIGHT_ROTATION_3D); - } else { - matrices.peek().getNormalMatrix().rotate(ITEM_LIGHT_ROTATION_FLAT); - } + matrices.peek().getNormalMatrix().rotate(ITEM_LIGHT_ROTATION_FLAT); + DiffuseLighting.disableGuiDepthLighting(); } itemRenderer.renderItem(stack, ModelTransformationMode.GUI, false, matrices, vertexConsumers, light, OverlayTexture.DEFAULT_UV, model); - if (isGui) DiffuseLighting.enableGuiDepthLighting(); - + // Restore light configuration + System.arraycopy(lights, 0, RenderSystemAccess.getShaderLightDirections(), 0, 2); + matrices.pop(); } @@ -182,12 +184,13 @@ protected void alignMatrices(MatrixStack matrices, Direction dir, BlockFace face default -> dir.getUnitVector(); }; matrices.translate(pos.x / 2 + 0.5, pos.y / 2 + 0.5, pos.z / 2 + 0.5); - matrices.multiplyPositionMatrix(new Matrix4f().rotation(dir.getRotationQuaternion())); + // We only transform the position matrix as the normals have to stay in the old configuration for item lighting + matrices.peek().getPositionMatrix().rotate(dir.getRotationQuaternion()); switch (face) { - case FLOOR -> matrices.multiplyPositionMatrix(new Matrix4f().rotation(RotationAxis.POSITIVE_X.rotationDegrees(-90))); - case CEILING -> matrices.multiplyPositionMatrix(new Matrix4f().rotation(RotationAxis.POSITIVE_X.rotationDegrees(90))); + case FLOOR -> matrices.peek().getPositionMatrix().rotate(RotationAxis.POSITIVE_X.rotationDegrees(-90)); + case CEILING -> matrices.peek().getPositionMatrix().rotate(RotationAxis.POSITIVE_X.rotationDegrees(90)); } - matrices.multiplyPositionMatrix(new Matrix4f().rotation(RotationAxis.POSITIVE_X.rotationDegrees(-90))); + matrices.peek().getPositionMatrix().rotate(RotationAxis.POSITIVE_X.rotationDegrees(-90)); matrices.translate(0, 0, 0.01); } } diff --git a/src/client/resources/extended_drawers.client.mixins.json b/src/client/resources/extended_drawers.client.mixins.json index 4d57fe8..702be7a 100644 --- a/src/client/resources/extended_drawers.client.mixins.json +++ b/src/client/resources/extended_drawers.client.mixins.json @@ -5,7 +5,8 @@ "compatibilityLevel": "JAVA_17", "client": [ "ClientPlayerEntityMixin", - "ClientPlayerInteractionManagerMixin" + "ClientPlayerInteractionManagerMixin", + "RenderSystemAccess" ], "injectors": { "defaultRequire": 1 diff --git a/src/main/generated/data/extended_drawers/advancements/recipes/decorations/access_point.json b/src/main/generated/data/extended_drawers/advancement/recipes/decorations/access_point.json similarity index 100% rename from src/main/generated/data/extended_drawers/advancements/recipes/decorations/access_point.json rename to src/main/generated/data/extended_drawers/advancement/recipes/decorations/access_point.json diff --git a/src/main/generated/data/extended_drawers/advancements/recipes/decorations/compacting_drawer.json b/src/main/generated/data/extended_drawers/advancement/recipes/decorations/compacting_drawer.json similarity index 100% rename from src/main/generated/data/extended_drawers/advancements/recipes/decorations/compacting_drawer.json rename to src/main/generated/data/extended_drawers/advancement/recipes/decorations/compacting_drawer.json diff --git a/src/main/generated/data/extended_drawers/advancements/recipes/decorations/connector.json b/src/main/generated/data/extended_drawers/advancement/recipes/decorations/connector.json similarity index 100% rename from src/main/generated/data/extended_drawers/advancements/recipes/decorations/connector.json rename to src/main/generated/data/extended_drawers/advancement/recipes/decorations/connector.json diff --git a/src/main/generated/data/extended_drawers/advancements/recipes/decorations/double_drawer.json b/src/main/generated/data/extended_drawers/advancement/recipes/decorations/double_drawer.json similarity index 100% rename from src/main/generated/data/extended_drawers/advancements/recipes/decorations/double_drawer.json rename to src/main/generated/data/extended_drawers/advancement/recipes/decorations/double_drawer.json diff --git a/src/main/generated/data/extended_drawers/advancements/recipes/decorations/quad_drawer.json b/src/main/generated/data/extended_drawers/advancement/recipes/decorations/quad_drawer.json similarity index 100% rename from src/main/generated/data/extended_drawers/advancements/recipes/decorations/quad_drawer.json rename to src/main/generated/data/extended_drawers/advancement/recipes/decorations/quad_drawer.json diff --git a/src/main/generated/data/extended_drawers/advancements/recipes/decorations/shadow_drawer.json b/src/main/generated/data/extended_drawers/advancement/recipes/decorations/shadow_drawer.json similarity index 100% rename from src/main/generated/data/extended_drawers/advancements/recipes/decorations/shadow_drawer.json rename to src/main/generated/data/extended_drawers/advancement/recipes/decorations/shadow_drawer.json diff --git a/src/main/generated/data/extended_drawers/advancements/recipes/decorations/single_drawer.json b/src/main/generated/data/extended_drawers/advancement/recipes/decorations/single_drawer.json similarity index 100% rename from src/main/generated/data/extended_drawers/advancements/recipes/decorations/single_drawer.json rename to src/main/generated/data/extended_drawers/advancement/recipes/decorations/single_drawer.json diff --git a/src/main/generated/data/extended_drawers/advancements/recipes/misc/t1_upgrade.json b/src/main/generated/data/extended_drawers/advancement/recipes/misc/t1_upgrade.json similarity index 100% rename from src/main/generated/data/extended_drawers/advancements/recipes/misc/t1_upgrade.json rename to src/main/generated/data/extended_drawers/advancement/recipes/misc/t1_upgrade.json diff --git a/src/main/generated/data/extended_drawers/advancements/recipes/misc/t2_upgrade.json b/src/main/generated/data/extended_drawers/advancement/recipes/misc/t2_upgrade.json similarity index 100% rename from src/main/generated/data/extended_drawers/advancements/recipes/misc/t2_upgrade.json rename to src/main/generated/data/extended_drawers/advancement/recipes/misc/t2_upgrade.json diff --git a/src/main/generated/data/extended_drawers/advancements/recipes/misc/t3_upgrade.json b/src/main/generated/data/extended_drawers/advancement/recipes/misc/t3_upgrade.json similarity index 100% rename from src/main/generated/data/extended_drawers/advancements/recipes/misc/t3_upgrade.json rename to src/main/generated/data/extended_drawers/advancement/recipes/misc/t3_upgrade.json diff --git a/src/main/generated/data/extended_drawers/advancements/recipes/misc/t4_upgrade.json b/src/main/generated/data/extended_drawers/advancement/recipes/misc/t4_upgrade.json similarity index 100% rename from src/main/generated/data/extended_drawers/advancements/recipes/misc/t4_upgrade.json rename to src/main/generated/data/extended_drawers/advancement/recipes/misc/t4_upgrade.json diff --git a/src/main/generated/data/extended_drawers/advancements/recipes/misc/upgrade_frame.json b/src/main/generated/data/extended_drawers/advancement/recipes/misc/upgrade_frame.json similarity index 100% rename from src/main/generated/data/extended_drawers/advancements/recipes/misc/upgrade_frame.json rename to src/main/generated/data/extended_drawers/advancement/recipes/misc/upgrade_frame.json diff --git a/src/main/generated/data/extended_drawers/advancements/recipes/redstone/limiter.json b/src/main/generated/data/extended_drawers/advancement/recipes/redstone/limiter.json similarity index 100% rename from src/main/generated/data/extended_drawers/advancements/recipes/redstone/limiter.json rename to src/main/generated/data/extended_drawers/advancement/recipes/redstone/limiter.json diff --git a/src/main/generated/data/extended_drawers/advancements/recipes/tools/lock.json b/src/main/generated/data/extended_drawers/advancement/recipes/tools/lock.json similarity index 100% rename from src/main/generated/data/extended_drawers/advancements/recipes/tools/lock.json rename to src/main/generated/data/extended_drawers/advancement/recipes/tools/lock.json diff --git a/src/main/generated/data/extended_drawers/loot_tables/blocks/access_point.json b/src/main/generated/data/extended_drawers/loot_table/blocks/access_point.json similarity index 100% rename from src/main/generated/data/extended_drawers/loot_tables/blocks/access_point.json rename to src/main/generated/data/extended_drawers/loot_table/blocks/access_point.json diff --git a/src/main/generated/data/extended_drawers/loot_tables/blocks/compacting_drawer.json b/src/main/generated/data/extended_drawers/loot_table/blocks/compacting_drawer.json similarity index 100% rename from src/main/generated/data/extended_drawers/loot_tables/blocks/compacting_drawer.json rename to src/main/generated/data/extended_drawers/loot_table/blocks/compacting_drawer.json diff --git a/src/main/generated/data/extended_drawers/loot_tables/blocks/connector.json b/src/main/generated/data/extended_drawers/loot_table/blocks/connector.json similarity index 100% rename from src/main/generated/data/extended_drawers/loot_tables/blocks/connector.json rename to src/main/generated/data/extended_drawers/loot_table/blocks/connector.json diff --git a/src/main/generated/data/extended_drawers/loot_tables/blocks/double_drawer.json b/src/main/generated/data/extended_drawers/loot_table/blocks/double_drawer.json similarity index 100% rename from src/main/generated/data/extended_drawers/loot_tables/blocks/double_drawer.json rename to src/main/generated/data/extended_drawers/loot_table/blocks/double_drawer.json diff --git a/src/main/generated/data/extended_drawers/loot_tables/blocks/quad_drawer.json b/src/main/generated/data/extended_drawers/loot_table/blocks/quad_drawer.json similarity index 100% rename from src/main/generated/data/extended_drawers/loot_tables/blocks/quad_drawer.json rename to src/main/generated/data/extended_drawers/loot_table/blocks/quad_drawer.json diff --git a/src/main/generated/data/extended_drawers/loot_tables/blocks/shadow_drawer.json b/src/main/generated/data/extended_drawers/loot_table/blocks/shadow_drawer.json similarity index 100% rename from src/main/generated/data/extended_drawers/loot_tables/blocks/shadow_drawer.json rename to src/main/generated/data/extended_drawers/loot_table/blocks/shadow_drawer.json diff --git a/src/main/generated/data/extended_drawers/loot_tables/blocks/single_drawer.json b/src/main/generated/data/extended_drawers/loot_table/blocks/single_drawer.json similarity index 100% rename from src/main/generated/data/extended_drawers/loot_tables/blocks/single_drawer.json rename to src/main/generated/data/extended_drawers/loot_table/blocks/single_drawer.json diff --git a/src/main/generated/data/extended_drawers/recipes/access_point.json b/src/main/generated/data/extended_drawers/recipe/access_point.json similarity index 100% rename from src/main/generated/data/extended_drawers/recipes/access_point.json rename to src/main/generated/data/extended_drawers/recipe/access_point.json diff --git a/src/main/generated/data/extended_drawers/recipes/compacting_drawer.json b/src/main/generated/data/extended_drawers/recipe/compacting_drawer.json similarity index 100% rename from src/main/generated/data/extended_drawers/recipes/compacting_drawer.json rename to src/main/generated/data/extended_drawers/recipe/compacting_drawer.json diff --git a/src/main/generated/data/extended_drawers/recipes/connector.json b/src/main/generated/data/extended_drawers/recipe/connector.json similarity index 100% rename from src/main/generated/data/extended_drawers/recipes/connector.json rename to src/main/generated/data/extended_drawers/recipe/connector.json diff --git a/src/main/generated/data/extended_drawers/recipes/copy_limiter.json b/src/main/generated/data/extended_drawers/recipe/copy_limiter.json similarity index 100% rename from src/main/generated/data/extended_drawers/recipes/copy_limiter.json rename to src/main/generated/data/extended_drawers/recipe/copy_limiter.json diff --git a/src/main/generated/data/extended_drawers/recipes/double_drawer.json b/src/main/generated/data/extended_drawers/recipe/double_drawer.json similarity index 100% rename from src/main/generated/data/extended_drawers/recipes/double_drawer.json rename to src/main/generated/data/extended_drawers/recipe/double_drawer.json diff --git a/src/main/generated/data/extended_drawers/recipes/limiter.json b/src/main/generated/data/extended_drawers/recipe/limiter.json similarity index 100% rename from src/main/generated/data/extended_drawers/recipes/limiter.json rename to src/main/generated/data/extended_drawers/recipe/limiter.json diff --git a/src/main/generated/data/extended_drawers/recipes/lock.json b/src/main/generated/data/extended_drawers/recipe/lock.json similarity index 100% rename from src/main/generated/data/extended_drawers/recipes/lock.json rename to src/main/generated/data/extended_drawers/recipe/lock.json diff --git a/src/main/generated/data/extended_drawers/recipes/quad_drawer.json b/src/main/generated/data/extended_drawers/recipe/quad_drawer.json similarity index 100% rename from src/main/generated/data/extended_drawers/recipes/quad_drawer.json rename to src/main/generated/data/extended_drawers/recipe/quad_drawer.json diff --git a/src/main/generated/data/extended_drawers/recipes/shadow_drawer.json b/src/main/generated/data/extended_drawers/recipe/shadow_drawer.json similarity index 100% rename from src/main/generated/data/extended_drawers/recipes/shadow_drawer.json rename to src/main/generated/data/extended_drawers/recipe/shadow_drawer.json diff --git a/src/main/generated/data/extended_drawers/recipes/single_drawer.json b/src/main/generated/data/extended_drawers/recipe/single_drawer.json similarity index 100% rename from src/main/generated/data/extended_drawers/recipes/single_drawer.json rename to src/main/generated/data/extended_drawers/recipe/single_drawer.json diff --git a/src/main/generated/data/extended_drawers/recipes/t1_upgrade.json b/src/main/generated/data/extended_drawers/recipe/t1_upgrade.json similarity index 100% rename from src/main/generated/data/extended_drawers/recipes/t1_upgrade.json rename to src/main/generated/data/extended_drawers/recipe/t1_upgrade.json diff --git a/src/main/generated/data/extended_drawers/recipes/t2_upgrade.json b/src/main/generated/data/extended_drawers/recipe/t2_upgrade.json similarity index 100% rename from src/main/generated/data/extended_drawers/recipes/t2_upgrade.json rename to src/main/generated/data/extended_drawers/recipe/t2_upgrade.json diff --git a/src/main/generated/data/extended_drawers/recipes/t3_upgrade.json b/src/main/generated/data/extended_drawers/recipe/t3_upgrade.json similarity index 100% rename from src/main/generated/data/extended_drawers/recipes/t3_upgrade.json rename to src/main/generated/data/extended_drawers/recipe/t3_upgrade.json diff --git a/src/main/generated/data/extended_drawers/recipes/t4_upgrade.json b/src/main/generated/data/extended_drawers/recipe/t4_upgrade.json similarity index 100% rename from src/main/generated/data/extended_drawers/recipes/t4_upgrade.json rename to src/main/generated/data/extended_drawers/recipe/t4_upgrade.json diff --git a/src/main/generated/data/extended_drawers/recipes/upgrade_frame.json b/src/main/generated/data/extended_drawers/recipe/upgrade_frame.json similarity index 100% rename from src/main/generated/data/extended_drawers/recipes/upgrade_frame.json rename to src/main/generated/data/extended_drawers/recipe/upgrade_frame.json diff --git a/src/main/generated/data/extended_drawers/tags/blocks/drawers.json b/src/main/generated/data/extended_drawers/tags/block/drawers.json similarity index 100% rename from src/main/generated/data/extended_drawers/tags/blocks/drawers.json rename to src/main/generated/data/extended_drawers/tags/block/drawers.json diff --git a/src/main/generated/data/extended_drawers/tags/blocks/network_components.json b/src/main/generated/data/extended_drawers/tags/block/network_components.json similarity index 100% rename from src/main/generated/data/extended_drawers/tags/blocks/network_components.json rename to src/main/generated/data/extended_drawers/tags/block/network_components.json diff --git a/src/main/generated/data/extended_drawers/tags/items/drawers.json b/src/main/generated/data/extended_drawers/tags/item/drawers.json similarity index 100% rename from src/main/generated/data/extended_drawers/tags/items/drawers.json rename to src/main/generated/data/extended_drawers/tags/item/drawers.json diff --git a/src/main/generated/data/extended_drawers/tags/items/toggle/duping.json b/src/main/generated/data/extended_drawers/tags/item/toggle/duping.json similarity index 100% rename from src/main/generated/data/extended_drawers/tags/items/toggle/duping.json rename to src/main/generated/data/extended_drawers/tags/item/toggle/duping.json diff --git a/src/main/generated/data/extended_drawers/tags/items/toggle/hidden.json b/src/main/generated/data/extended_drawers/tags/item/toggle/hidden.json similarity index 100% rename from src/main/generated/data/extended_drawers/tags/items/toggle/hidden.json rename to src/main/generated/data/extended_drawers/tags/item/toggle/hidden.json diff --git a/src/main/generated/data/extended_drawers/tags/items/toggle/lock.json b/src/main/generated/data/extended_drawers/tags/item/toggle/lock.json similarity index 100% rename from src/main/generated/data/extended_drawers/tags/items/toggle/lock.json rename to src/main/generated/data/extended_drawers/tags/item/toggle/lock.json diff --git a/src/main/generated/data/extended_drawers/tags/items/toggle/voiding.json b/src/main/generated/data/extended_drawers/tags/item/toggle/voiding.json similarity index 100% rename from src/main/generated/data/extended_drawers/tags/items/toggle/voiding.json rename to src/main/generated/data/extended_drawers/tags/item/toggle/voiding.json diff --git a/src/main/generated/data/extended_drawers/tags/items/upgrade.json b/src/main/generated/data/extended_drawers/tags/item/upgrade.json similarity index 100% rename from src/main/generated/data/extended_drawers/tags/items/upgrade.json rename to src/main/generated/data/extended_drawers/tags/item/upgrade.json diff --git a/src/main/generated/data/minecraft/tags/blocks/mineable/axe.json b/src/main/generated/data/minecraft/tags/block/mineable/axe.json similarity index 100% rename from src/main/generated/data/minecraft/tags/blocks/mineable/axe.json rename to src/main/generated/data/minecraft/tags/block/mineable/axe.json diff --git a/src/main/generated/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/main/generated/data/minecraft/tags/block/mineable/pickaxe.json similarity index 100% rename from src/main/generated/data/minecraft/tags/blocks/mineable/pickaxe.json rename to src/main/generated/data/minecraft/tags/block/mineable/pickaxe.json diff --git a/src/main/java/io/github/mattidragon/extendeddrawers/ExtendedDrawers.java b/src/main/java/io/github/mattidragon/extendeddrawers/ExtendedDrawers.java index 7a13244..ba91891 100644 --- a/src/main/java/io/github/mattidragon/extendeddrawers/ExtendedDrawers.java +++ b/src/main/java/io/github/mattidragon/extendeddrawers/ExtendedDrawers.java @@ -36,7 +36,7 @@ public class ExtendedDrawers implements ModInitializer { public static ShiftAccess SHIFT_ACCESS = () -> false; public static Identifier id(String path) { - return new Identifier(MOD_ID, path); + return Identifier.of(MOD_ID, path); } @Override diff --git a/src/main/java/io/github/mattidragon/extendeddrawers/block/CompactingDrawerBlock.java b/src/main/java/io/github/mattidragon/extendeddrawers/block/CompactingDrawerBlock.java index 10a0e80..b8bfbf5 100644 --- a/src/main/java/io/github/mattidragon/extendeddrawers/block/CompactingDrawerBlock.java +++ b/src/main/java/io/github/mattidragon/extendeddrawers/block/CompactingDrawerBlock.java @@ -14,9 +14,9 @@ import net.fabricmc.fabric.api.transfer.v1.storage.StorageUtil; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntityType; -import net.minecraft.client.item.TooltipType; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.item.tooltip.TooltipType; import net.minecraft.text.Text; import net.minecraft.util.Formatting; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/io/github/mattidragon/extendeddrawers/block/DrawerBlock.java b/src/main/java/io/github/mattidragon/extendeddrawers/block/DrawerBlock.java index e22a7df..3740261 100644 --- a/src/main/java/io/github/mattidragon/extendeddrawers/block/DrawerBlock.java +++ b/src/main/java/io/github/mattidragon/extendeddrawers/block/DrawerBlock.java @@ -13,9 +13,9 @@ import net.fabricmc.fabric.api.transfer.v1.storage.StorageUtil; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntityType; -import net.minecraft.client.item.TooltipType; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.item.tooltip.TooltipType; import net.minecraft.text.MutableText; import net.minecraft.text.Text; import net.minecraft.util.Formatting; diff --git a/src/main/java/io/github/mattidragon/extendeddrawers/compacting/CompressionOverrideLoader.java b/src/main/java/io/github/mattidragon/extendeddrawers/compacting/CompressionOverrideLoader.java index 0c4c04f..936b3cb 100644 --- a/src/main/java/io/github/mattidragon/extendeddrawers/compacting/CompressionOverrideLoader.java +++ b/src/main/java/io/github/mattidragon/extendeddrawers/compacting/CompressionOverrideLoader.java @@ -76,7 +76,7 @@ private ItemVariant parseItem(String data) { } var stack = new ItemStack(result.item()); - stack.applyComponentsFrom(result.components()); + stack.applyChanges(result.components()); return ItemVariant.of(stack); } catch (CommandSyntaxException e) { throw new JsonParseException("Failed to parse item", e); diff --git a/src/main/java/io/github/mattidragon/extendeddrawers/compacting/CompressionRecipeManager.java b/src/main/java/io/github/mattidragon/extendeddrawers/compacting/CompressionRecipeManager.java index e46d474..e7c1ccd 100644 --- a/src/main/java/io/github/mattidragon/extendeddrawers/compacting/CompressionRecipeManager.java +++ b/src/main/java/io/github/mattidragon/extendeddrawers/compacting/CompressionRecipeManager.java @@ -1,13 +1,11 @@ package io.github.mattidragon.extendeddrawers.compacting; import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.inventory.CraftingInventory; import net.minecraft.item.ItemStack; import net.minecraft.recipe.RecipeEntry; import net.minecraft.recipe.RecipeManager; import net.minecraft.recipe.RecipeType; -import net.minecraft.screen.ScreenHandler; +import net.minecraft.recipe.input.CraftingRecipeInput; import net.minecraft.world.World; import org.jetbrains.annotations.Nullable; @@ -135,22 +133,12 @@ private Stream findRecipes(ItemStack stack, int size, World world) { * @param size The width and height of the inventory. Slot count is size squared. * @return A filled crafting inventory of specified size */ - private CraftingInventory createInventory(ItemStack stack, int size) { - var inventory = new CraftingInventory(new ScreenHandler(null, -1) { - @Override - public ItemStack quickMove(PlayerEntity player, int slot) { - return ItemStack.EMPTY; - } - - @Override - public boolean canUse(PlayerEntity player) { - return false; - } - }, size, size); + private CraftingRecipeInput createInventory(ItemStack stack, int size) { + var list = new ArrayList(size * size); for (int i = 0; i < size * size; i++) { - inventory.setStack(i, stack); + list.add(stack); } - return inventory; + return CraftingRecipeInput.create(size, size, list); } private record RecipePair(ItemVariant compressed, ItemVariant decompressed, int scale) { diff --git a/src/main/java/io/github/mattidragon/extendeddrawers/config/category/ClientCategory.java b/src/main/java/io/github/mattidragon/extendeddrawers/config/category/ClientCategory.java index 5000add..551de7a 100644 --- a/src/main/java/io/github/mattidragon/extendeddrawers/config/category/ClientCategory.java +++ b/src/main/java/io/github/mattidragon/extendeddrawers/config/category/ClientCategory.java @@ -31,7 +31,7 @@ public record IconGroup(Identifier lockedIcon, Identifier voidingIcon, Identifier hiddenIcon, Identifier dupingIcon) implements MutableClientCategory.MutableIconGroup.Source { - private static final IconGroup DEFAULT = new IconGroup(id("item/lock"), new Identifier("minecraft", "item/lava_bucket"), new Identifier("minecraft", "item/black_dye"), id("item/dupe_wand")); + private static final IconGroup DEFAULT = new IconGroup(id("item/lock"), Identifier.ofVanilla("item/lava_bucket"), Identifier.ofVanilla("item/black_dye"), id("item/dupe_wand")); public static final Codec CODEC = RecordCodecBuilder.create(instance -> instance.group( AlwaysSerializedOptionalFieldCodec.create(Identifier.CODEC, "lockedIcon", DEFAULT.lockedIcon).forGetter(IconGroup::lockedIcon), diff --git a/src/main/java/io/github/mattidragon/extendeddrawers/item/LimiterItem.java b/src/main/java/io/github/mattidragon/extendeddrawers/item/LimiterItem.java index 63e7927..b29e5be 100644 --- a/src/main/java/io/github/mattidragon/extendeddrawers/item/LimiterItem.java +++ b/src/main/java/io/github/mattidragon/extendeddrawers/item/LimiterItem.java @@ -2,11 +2,11 @@ import io.github.mattidragon.extendeddrawers.block.base.DrawerInteractionHandler; import io.github.mattidragon.extendeddrawers.registry.ModDataComponents; -import net.minecraft.client.item.TooltipType; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUsageContext; +import net.minecraft.item.tooltip.TooltipType; import net.minecraft.stat.Stats; import net.minecraft.text.Text; import net.minecraft.util.ActionResult; diff --git a/src/main/java/io/github/mattidragon/extendeddrawers/recipe/CopyLimiterRecipe.java b/src/main/java/io/github/mattidragon/extendeddrawers/recipe/CopyLimiterRecipe.java index 3adda72..1e24530 100644 --- a/src/main/java/io/github/mattidragon/extendeddrawers/recipe/CopyLimiterRecipe.java +++ b/src/main/java/io/github/mattidragon/extendeddrawers/recipe/CopyLimiterRecipe.java @@ -4,11 +4,11 @@ import io.github.mattidragon.extendeddrawers.registry.ModDataComponents; import io.github.mattidragon.extendeddrawers.registry.ModItems; import io.github.mattidragon.extendeddrawers.registry.ModRecipes; -import net.minecraft.inventory.RecipeInputInventory; import net.minecraft.item.ItemStack; import net.minecraft.recipe.RecipeSerializer; import net.minecraft.recipe.SpecialCraftingRecipe; import net.minecraft.recipe.book.CraftingRecipeCategory; +import net.minecraft.recipe.input.CraftingRecipeInput; import net.minecraft.registry.RegistryWrapper; import net.minecraft.util.collection.DefaultedList; import net.minecraft.world.World; @@ -19,8 +19,8 @@ public CopyLimiterRecipe(CraftingRecipeCategory category) { } @Override - public boolean matches(RecipeInputInventory inventory, World world) { - var stacks = inventory.getHeldStacks(); + public boolean matches(CraftingRecipeInput input, World world) { + var stacks = input.getStacks(); boolean setLimiterFound = false; boolean unsetLimiterFound = false; @@ -41,8 +41,8 @@ public boolean matches(RecipeInputInventory inventory, World world) { } @Override - public ItemStack craft(RecipeInputInventory inventory, RegistryWrapper.WrapperLookup registryLookup) { - var stacks = inventory.getHeldStacks(); + public ItemStack craft(CraftingRecipeInput input, RegistryWrapper.WrapperLookup registryLookup) { + var stacks = input.getStacks(); Long limit = null; for (var stack : stacks) { @@ -67,11 +67,11 @@ public boolean fits(int width, int height) { } @Override - public DefaultedList getRemainder(RecipeInputInventory inventory) { - var result = DefaultedList.ofSize(inventory.size(), ItemStack.EMPTY); + public DefaultedList getRemainder(CraftingRecipeInput input) { + var result = DefaultedList.ofSize(input.getSize(), ItemStack.EMPTY); for(int i = 0; i < result.size(); ++i) { - var stack = inventory.getStack(i); + var stack = input.getStackInSlot(i); var item = stack.getItem(); if (item.getRecipeRemainder() != null) { result.set(i, stack.getRecipeRemainder()); diff --git a/src/main/java/io/github/mattidragon/extendeddrawers/registry/ModDataComponents.java b/src/main/java/io/github/mattidragon/extendeddrawers/registry/ModDataComponents.java index 440afe4..7e1f70d 100644 --- a/src/main/java/io/github/mattidragon/extendeddrawers/registry/ModDataComponents.java +++ b/src/main/java/io/github/mattidragon/extendeddrawers/registry/ModDataComponents.java @@ -4,22 +4,22 @@ import io.github.mattidragon.extendeddrawers.ExtendedDrawers; import io.github.mattidragon.extendeddrawers.component.DrawerContentsComponent; import io.github.mattidragon.extendeddrawers.component.DrawerSlotComponent; -import net.minecraft.component.DataComponentType; +import net.minecraft.component.ComponentType; import net.minecraft.network.codec.PacketCodecs; import net.minecraft.registry.Registries; import net.minecraft.registry.Registry; public class ModDataComponents { - public static final DataComponentType LIMITER_LIMIT = DataComponentType.builder() + public static final ComponentType LIMITER_LIMIT = ComponentType.builder() .codec(Codec.LONG) .packetCodec(PacketCodecs.VAR_LONG) .build(); - public static final DataComponentType DRAWER_CONTENTS = DataComponentType.builder() + public static final ComponentType DRAWER_CONTENTS = ComponentType.builder() .codec(DrawerContentsComponent.CODEC) .packetCodec(DrawerContentsComponent.PACKET_CODEC) .cache() .build(); - public static final DataComponentType COMPACTING_DRAWER_CONTENTS = DataComponentType.builder() + public static final ComponentType COMPACTING_DRAWER_CONTENTS = ComponentType.builder() .codec(DrawerSlotComponent.CODEC) .packetCodec(DrawerSlotComponent.PACKET_CODEC) .cache() diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index e7af32e..b07c727 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -40,9 +40,9 @@ } ], "depends": { - "fabricloader": ">=0.14.21", - "fabric": ">=0.84.0", - "minecraft": "1.20.6", + "fabricloader": ">=0.15.11", + "fabric": ">=0.100.3", + "minecraft": "1.21", "graphlib": "*" }, "recommends": {