diff --git a/build.gradle b/build.gradle index 7ba8d61..062d75c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.7-SNAPSHOT' + id 'fabric-loom' version '1.9-SNAPSHOT' id 'maven-publish' } @@ -11,7 +11,7 @@ group project.maven_group base.archivesName = project.archives_base_name repositories { - maven { url "https://kneelawk.com/maven/" } + maven { url "https://maven.kneelawk.com/releases/" } maven { url "https://maven.alexiil.uk/" } maven { url "https://oss.sonatype.org/content/repositories/snapshots" } maven { url "https://maven.blamejared.com" } @@ -45,6 +45,12 @@ dependencies { runtimeOnly files("src/main/generated") } +fabricApi.configureDataGeneration { + client = true + createSourceSet = true + addToResources = false +} + loom { // Apply datagen at runtime mods.register("extended_drawers") { @@ -53,16 +59,8 @@ loom { modFiles.from file("src/main/generated") } - runs.register("datagen") { - inherit runs.server - name "Data Generation" - vmArg "-Dfabric-api.datagen" - vmArg "-Dfabric-api.datagen.output-dir=${file("src/main/generated")}" - vmArg "-Dfabric-api.datagen.strict-validation" - + runs.datagen { ideConfigGenerated = true - - runDir "build/datagen/" } } diff --git a/changelog/4.0.0+1.21.2.md b/changelog/4.0.1+1.21.4.md similarity index 79% rename from changelog/4.0.0+1.21.2.md rename to changelog/4.0.1+1.21.4.md index 9e5f4f2..3cb2573 100644 --- a/changelog/4.0.0+1.21.2.md +++ b/changelog/4.0.1+1.21.4.md @@ -1,2 +1,2 @@ -* Updated to 1.21.2 +* Updated to 1.21.4 * Marked as beta due to using hacks to make graphlib work on newer versions \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index dd079e6..51e4d83 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,16 +1,16 @@ org.gradle.jvmargs=-Xmx1G -minecraft_version=1.21.2 -yarn_mappings=1.21.2+build.1 -loader_version=0.16.7 +minecraft_version=1.21.4 +yarn_mappings=1.21.4+build.1 +loader_version=0.16.9 mod_version=4.0.0 maven_group=io.github.mattidragon archives_base_name=ExtendedDrawers -fabric_version=0.106.1+1.21.2 +fabric_version=0.111.0+1.21.4 graphlib_version=2.0.0+1.21 patchouli_version=1.20.1-81-FABRIC -yacl_version=3.6.1+1.21.2 -modmenu_version=12.0.0-beta.1 -configtoolkit_version=1.1.1 +yacl_version=3.6.2+1.21.4 +modmenu_version=13.0.0-beta.1 +configtoolkit_version=1.1.2 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e644113..a4b76b9 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a441313..e2847c8 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.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index b740cf1..f5feea6 100644 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -84,7 +86,8 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/gradlew.bat b/gradlew.bat index 25da30d..9d21a21 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## 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 44438ea..45b9c9d 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 @@ -20,8 +20,8 @@ import net.minecraft.client.render.LightmapTextureManager; import net.minecraft.client.render.OverlayTexture; import net.minecraft.client.render.RenderLayer; +import net.minecraft.client.texture.SpriteAtlasTexture; import net.minecraft.item.Items; -import net.minecraft.screen.PlayerScreenHandler; import net.minecraft.text.Text; import net.minecraft.util.Formatting; import net.minecraft.util.Identifier; @@ -311,7 +311,8 @@ public void init(Option smallItemScale, Option largeItemScale, Opt public int render(DrawContext context, int x, int y, int renderWidth, float tickDelta) { if (!initialized) return 0; - var atlas = MinecraftClient.getInstance().getSpriteAtlas(PlayerScreenHandler.BLOCK_ATLAS_TEXTURE); + @SuppressWarnings("deprecation") + var atlas = MinecraftClient.getInstance().getSpriteAtlas(SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE); var size = renderWidth / 3; var config = ExtendedDrawers.CONFIG.get(); var client = config.client(); @@ -387,7 +388,8 @@ public void close() { private record IconRenderer(Identifier id) implements ImageRenderer { @Override public int render(DrawContext graphics, int x, int y, int renderWidth, float tickDelta) { - var blockAtlas = MinecraftClient.getInstance().getSpriteAtlas(PlayerScreenHandler.BLOCK_ATLAS_TEXTURE); + @SuppressWarnings("deprecation") + var blockAtlas = MinecraftClient.getInstance().getSpriteAtlas(SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE); var sprite = blockAtlas.apply(id); graphics.drawSpriteStretched(RenderLayer::getGuiTextured, sprite, x + renderWidth / 3, y, renderWidth / 3, renderWidth / 3); 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 d6dc24b..44fffc2 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 @@ -8,16 +8,17 @@ import net.minecraft.block.enums.BlockFace; import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; +import net.minecraft.client.item.ItemModelManager; import net.minecraft.client.render.DiffuseLighting; import net.minecraft.client.render.OverlayTexture; import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.VertexConsumerProvider; import net.minecraft.client.render.block.entity.BlockEntityRenderer; -import net.minecraft.client.render.item.ItemRenderer; +import net.minecraft.client.render.item.ItemRenderState; import net.minecraft.client.texture.Sprite; +import net.minecraft.client.texture.SpriteAtlasTexture; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.item.ModelTransformationMode; -import net.minecraft.screen.PlayerScreenHandler; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.util.math.RotationAxis; @@ -34,11 +35,12 @@ public abstract class AbstractDrawerBlockEntityRenderer i private static final Quaternionf ITEM_LIGHT_ROTATION_3D = RotationAxis.POSITIVE_X.rotationDegrees(-15).mul(RotationAxis.POSITIVE_Y.rotationDegrees(15)); private static final Quaternionf ITEM_LIGHT_ROTATION_FLAT = RotationAxis.POSITIVE_X.rotationDegrees(-45); - private final ItemRenderer itemRenderer; + private final ItemModelManager itemModelManager; private final TextRenderer textRenderer; + private final ItemRenderState itemRenderState = new ItemRenderState(); - public AbstractDrawerBlockEntityRenderer(ItemRenderer itemRenderer, TextRenderer textRenderer) { - this.itemRenderer = itemRenderer; + public AbstractDrawerBlockEntityRenderer(ItemModelManager itemModelManager, TextRenderer textRenderer) { + this.itemModelManager = itemModelManager; this.textRenderer = textRenderer; } @@ -47,7 +49,7 @@ public AbstractDrawerBlockEntityRenderer(ItemRenderer itemRenderer, TextRenderer */ public static AbstractDrawerBlockEntityRenderer createRendererTool() { var client = MinecraftClient.getInstance(); - return new AbstractDrawerBlockEntityRenderer<>(client.getItemRenderer(), client.textRenderer) { + return new AbstractDrawerBlockEntityRenderer<>(client.getItemModelManager(), client.textRenderer) { @Override public void render(BlockEntity entity, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay) { } @@ -78,7 +80,9 @@ protected void renderHiddenOverlay(boolean small, int light, int overlay, Matrix matrices.multiply(RotationAxis.POSITIVE_X.rotationDegrees(90)); matrices.translate(-0.5, 0, -0.5); - var sprite = MinecraftClient.getInstance().getSpriteAtlas(PlayerScreenHandler.BLOCK_ATLAS_TEXTURE).apply(ExtendedDrawers.id("block/drawer_hidden_overlay")); + @SuppressWarnings("deprecation") + var sprite = MinecraftClient.getInstance().getSpriteAtlas(SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE) + .apply(ExtendedDrawers.id("block/drawer_hidden_overlay")); var consumer = vertexConsumers.getBuffer(RenderLayer.getCutout()); @@ -148,14 +152,14 @@ public void renderItem(ItemVariant item, boolean small, int light, MatrixStack m matrices.peek().getPositionMatrix().mul(new Matrix4f().scale(1, 1, 0.01f)); var stack = item.toStack(); - var model = itemRenderer.getModel(stack, world, null, seed); + itemModelManager.update(itemRenderState, stack, ModelTransformationMode.GUI, false, world, null, seed); // Copy existing light configuration var lights = new Vector3f[2]; System.arraycopy(RenderSystemAccess.getShaderLightDirections(), 0, lights, 0, 2); // Set up gui lighting - if (model.isSideLit()) { + if (itemRenderState.isSideLit()) { matrices.peek().getNormalMatrix().rotate(ITEM_LIGHT_ROTATION_3D); DiffuseLighting.enableGuiDepthLighting(); } else { @@ -163,7 +167,7 @@ public void renderItem(ItemVariant item, boolean small, int light, MatrixStack m DiffuseLighting.disableGuiDepthLighting(); } - itemRenderer.renderItem(stack, ModelTransformationMode.GUI, false, matrices, vertexConsumers, light, OverlayTexture.DEFAULT_UV, model); + itemRenderState.render(matrices, vertexConsumers, light, OverlayTexture.DEFAULT_UV); // Restore light configuration System.arraycopy(lights, 0, RenderSystemAccess.getShaderLightDirections(), 0, 2); diff --git a/src/client/java/io/github/mattidragon/extendeddrawers/client/renderer/CompactingDrawerBlockEntityRenderer.java b/src/client/java/io/github/mattidragon/extendeddrawers/client/renderer/CompactingDrawerBlockEntityRenderer.java index a9e4bba..b95aade 100644 --- a/src/client/java/io/github/mattidragon/extendeddrawers/client/renderer/CompactingDrawerBlockEntityRenderer.java +++ b/src/client/java/io/github/mattidragon/extendeddrawers/client/renderer/CompactingDrawerBlockEntityRenderer.java @@ -11,8 +11,8 @@ import net.minecraft.client.render.WorldRenderer; import net.minecraft.client.render.block.entity.BlockEntityRendererFactory; import net.minecraft.client.texture.Sprite; +import net.minecraft.client.texture.SpriteAtlasTexture; import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.screen.PlayerScreenHandler; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec2f; import net.minecraft.util.math.Vec3d; @@ -25,7 +25,7 @@ public class CompactingDrawerBlockEntityRenderer extends AbstractDrawerBlockEntityRenderer { public CompactingDrawerBlockEntityRenderer(BlockEntityRendererFactory.Context context) { - super(context.getItemRenderer(), context.getTextRenderer()); + super(context.getItemModelManager(), context.getTextRenderer()); } @Override @@ -79,7 +79,8 @@ public void render(CompactingDrawerBlockEntity drawer, float tickDelta, MatrixSt private void renderIcons(CompactingDrawerBlockEntity drawer, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay) { var icons = new ArrayList(); var config = ExtendedDrawers.CONFIG.get().client().icons(); - var blockAtlas = MinecraftClient.getInstance().getSpriteAtlas(PlayerScreenHandler.BLOCK_ATLAS_TEXTURE); + @SuppressWarnings("deprecation") + var blockAtlas = MinecraftClient.getInstance().getSpriteAtlas(SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE); if (drawer.storage.isLocked()) icons.add(blockAtlas.apply(config.lockedIcon())); if (drawer.storage.isVoiding()) icons.add(blockAtlas.apply(config.voidingIcon())); diff --git a/src/client/java/io/github/mattidragon/extendeddrawers/client/renderer/DrawerBlockEntityRenderer.java b/src/client/java/io/github/mattidragon/extendeddrawers/client/renderer/DrawerBlockEntityRenderer.java index 98bf55a..dd29e32 100644 --- a/src/client/java/io/github/mattidragon/extendeddrawers/client/renderer/DrawerBlockEntityRenderer.java +++ b/src/client/java/io/github/mattidragon/extendeddrawers/client/renderer/DrawerBlockEntityRenderer.java @@ -10,8 +10,8 @@ import net.minecraft.client.render.WorldRenderer; import net.minecraft.client.render.block.entity.BlockEntityRendererFactory; import net.minecraft.client.texture.Sprite; +import net.minecraft.client.texture.SpriteAtlasTexture; import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.screen.PlayerScreenHandler; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -20,7 +20,7 @@ public class DrawerBlockEntityRenderer extends AbstractDrawerBlockEntityRenderer { public DrawerBlockEntityRenderer(BlockEntityRendererFactory.Context context) { - super(context.getItemRenderer(), context.getTextRenderer()); + super(context.getItemModelManager(), context.getTextRenderer()); } @Override @@ -72,7 +72,8 @@ public void render(DrawerBlockEntity drawer, float tickDelta, MatrixStack matric private void renderSlot(DrawerSlot storage, boolean small, int light, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int seed, int overlay, BlockPos pos, World world) { var icons = new ArrayList(); var config = ExtendedDrawers.CONFIG.get().client().icons(); - var blockAtlas = MinecraftClient.getInstance().getSpriteAtlas(PlayerScreenHandler.BLOCK_ATLAS_TEXTURE); + @SuppressWarnings("deprecation") + var blockAtlas = MinecraftClient.getInstance().getSpriteAtlas(SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE); if (storage.isLocked()) icons.add(blockAtlas.apply(config.lockedIcon())); if (storage.isVoiding()) icons.add(blockAtlas.apply(config.voidingIcon())); diff --git a/src/client/java/io/github/mattidragon/extendeddrawers/client/renderer/ShadowDrawerBlockEntityRenderer.java b/src/client/java/io/github/mattidragon/extendeddrawers/client/renderer/ShadowDrawerBlockEntityRenderer.java index 8c14cb0..ac4b0b6 100644 --- a/src/client/java/io/github/mattidragon/extendeddrawers/client/renderer/ShadowDrawerBlockEntityRenderer.java +++ b/src/client/java/io/github/mattidragon/extendeddrawers/client/renderer/ShadowDrawerBlockEntityRenderer.java @@ -8,8 +8,8 @@ import net.minecraft.client.render.WorldRenderer; import net.minecraft.client.render.block.entity.BlockEntityRendererFactory; import net.minecraft.client.texture.Sprite; +import net.minecraft.client.texture.SpriteAtlasTexture; import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.screen.PlayerScreenHandler; import org.jetbrains.annotations.Nullable; import java.util.List; @@ -17,7 +17,7 @@ public class ShadowDrawerBlockEntityRenderer extends AbstractDrawerBlockEntityRenderer { public ShadowDrawerBlockEntityRenderer(BlockEntityRendererFactory.Context context) { - super(context.getItemRenderer(), context.getTextRenderer()); + super(context.getItemModelManager(), context.getTextRenderer()); } @Override @@ -39,8 +39,9 @@ public void render(ShadowDrawerBlockEntity drawer, float tickDelta, MatrixStack light = WorldRenderer.getLightmapCoordinates(Objects.requireNonNull(drawer.getWorld()), drawer.getPos().offset(dir)); + @SuppressWarnings("deprecation") List icons = drawer.isHidden() ? List.of(MinecraftClient.getInstance() - .getSpriteAtlas(PlayerScreenHandler.BLOCK_ATLAS_TEXTURE) + .getSpriteAtlas(SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE) .apply(ExtendedDrawers.CONFIG.get().client().icons().hiddenIcon())) : List.of(); @Nullable String amount = String.valueOf(drawer.countCache); diff --git a/src/main/java/io/github/mattidragon/extendeddrawers/datagen/DrawersBlockLootTableProvider.java b/src/datagen/java/io/github/mattidragon/extendeddrawers/datagen/DrawersBlockLootTableProvider.java similarity index 100% rename from src/main/java/io/github/mattidragon/extendeddrawers/datagen/DrawersBlockLootTableProvider.java rename to src/datagen/java/io/github/mattidragon/extendeddrawers/datagen/DrawersBlockLootTableProvider.java diff --git a/src/main/java/io/github/mattidragon/extendeddrawers/datagen/DrawersBlockTagProvider.java b/src/datagen/java/io/github/mattidragon/extendeddrawers/datagen/DrawersBlockTagProvider.java similarity index 100% rename from src/main/java/io/github/mattidragon/extendeddrawers/datagen/DrawersBlockTagProvider.java rename to src/datagen/java/io/github/mattidragon/extendeddrawers/datagen/DrawersBlockTagProvider.java diff --git a/src/main/java/io/github/mattidragon/extendeddrawers/datagen/DrawersItemTagProvider.java b/src/datagen/java/io/github/mattidragon/extendeddrawers/datagen/DrawersItemTagProvider.java similarity index 100% rename from src/main/java/io/github/mattidragon/extendeddrawers/datagen/DrawersItemTagProvider.java rename to src/datagen/java/io/github/mattidragon/extendeddrawers/datagen/DrawersItemTagProvider.java diff --git a/src/main/java/io/github/mattidragon/extendeddrawers/datagen/DrawersModelProvider.java b/src/datagen/java/io/github/mattidragon/extendeddrawers/datagen/DrawersModelProvider.java similarity index 96% rename from src/main/java/io/github/mattidragon/extendeddrawers/datagen/DrawersModelProvider.java rename to src/datagen/java/io/github/mattidragon/extendeddrawers/datagen/DrawersModelProvider.java index def99df..ee34a6a 100644 --- a/src/main/java/io/github/mattidragon/extendeddrawers/datagen/DrawersModelProvider.java +++ b/src/datagen/java/io/github/mattidragon/extendeddrawers/datagen/DrawersModelProvider.java @@ -2,11 +2,11 @@ import io.github.mattidragon.extendeddrawers.registry.ModBlocks; import io.github.mattidragon.extendeddrawers.registry.ModItems; +import net.fabricmc.fabric.api.client.datagen.v1.provider.FabricModelProvider; import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; -import net.fabricmc.fabric.api.datagen.v1.provider.FabricModelProvider; import net.minecraft.block.Block; import net.minecraft.block.enums.BlockFace; -import net.minecraft.data.client.*; +import net.minecraft.client.data.*; import net.minecraft.state.property.Properties; import net.minecraft.util.Identifier; import net.minecraft.util.math.Direction; @@ -19,11 +19,11 @@ class DrawersModelProvider extends FabricModelProvider { public DrawersModelProvider(FabricDataOutput output) { super(output); } - + @Override public void generateBlockStateModels(BlockStateModelGenerator generator) { generator.registerSimpleCubeAll(ModBlocks.ACCESS_POINT); - generator.registerSingleton(ModBlocks.CONNECTOR, TextureMap.all(id("block/drawer_base")), Models.CUBE_ALL); + generator.registerSingleton(ModBlocks.CONNECTOR, block -> TexturedModel.getCubeAll(id("block/drawer_base"))); registerDrawerModel(ModBlocks.SINGLE_DRAWER, generator); registerDrawerModel(ModBlocks.DOUBLE_DRAWER, generator); diff --git a/src/main/java/io/github/mattidragon/extendeddrawers/datagen/DrawersRecipeGenerator.java b/src/datagen/java/io/github/mattidragon/extendeddrawers/datagen/DrawersRecipeGenerator.java similarity index 97% rename from src/main/java/io/github/mattidragon/extendeddrawers/datagen/DrawersRecipeGenerator.java rename to src/datagen/java/io/github/mattidragon/extendeddrawers/datagen/DrawersRecipeGenerator.java index 8b4f635..0d648da 100644 --- a/src/main/java/io/github/mattidragon/extendeddrawers/datagen/DrawersRecipeGenerator.java +++ b/src/datagen/java/io/github/mattidragon/extendeddrawers/datagen/DrawersRecipeGenerator.java @@ -5,9 +5,9 @@ import io.github.mattidragon.extendeddrawers.registry.ModItems; import io.github.mattidragon.extendeddrawers.registry.ModTags; import net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags; -import net.minecraft.data.server.recipe.ComplexRecipeJsonBuilder; -import net.minecraft.data.server.recipe.RecipeExporter; -import net.minecraft.data.server.recipe.RecipeGenerator; +import net.minecraft.data.recipe.ComplexRecipeJsonBuilder; +import net.minecraft.data.recipe.RecipeExporter; +import net.minecraft.data.recipe.RecipeGenerator; import net.minecraft.item.Item; import net.minecraft.item.Items; import net.minecraft.recipe.Ingredient; diff --git a/src/main/java/io/github/mattidragon/extendeddrawers/datagen/DrawersRecipeProvider.java b/src/datagen/java/io/github/mattidragon/extendeddrawers/datagen/DrawersRecipeProvider.java similarity index 87% rename from src/main/java/io/github/mattidragon/extendeddrawers/datagen/DrawersRecipeProvider.java rename to src/datagen/java/io/github/mattidragon/extendeddrawers/datagen/DrawersRecipeProvider.java index 8aa9229..2cc722c 100644 --- a/src/main/java/io/github/mattidragon/extendeddrawers/datagen/DrawersRecipeProvider.java +++ b/src/datagen/java/io/github/mattidragon/extendeddrawers/datagen/DrawersRecipeProvider.java @@ -2,8 +2,8 @@ import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider; -import net.minecraft.data.server.recipe.RecipeExporter; -import net.minecraft.data.server.recipe.RecipeGenerator; +import net.minecraft.data.recipe.RecipeExporter; +import net.minecraft.data.recipe.RecipeGenerator; import net.minecraft.registry.RegistryWrapper; import java.util.concurrent.CompletableFuture; diff --git a/src/main/java/io/github/mattidragon/extendeddrawers/datagen/ExtendedDrawersDatagen.java b/src/datagen/java/io/github/mattidragon/extendeddrawers/datagen/ExtendedDrawersDatagen.java similarity index 84% rename from src/main/java/io/github/mattidragon/extendeddrawers/datagen/ExtendedDrawersDatagen.java rename to src/datagen/java/io/github/mattidragon/extendeddrawers/datagen/ExtendedDrawersDatagen.java index aad8e7d..d79dcf3 100644 --- a/src/main/java/io/github/mattidragon/extendeddrawers/datagen/ExtendedDrawersDatagen.java +++ b/src/datagen/java/io/github/mattidragon/extendeddrawers/datagen/ExtendedDrawersDatagen.java @@ -2,6 +2,7 @@ import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint; import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator; +import org.jetbrains.annotations.Nullable; public class ExtendedDrawersDatagen implements DataGeneratorEntrypoint { @Override @@ -15,4 +16,9 @@ public void onInitializeDataGenerator(FabricDataGenerator dataGenerator) { pack.addProvider((output, future) -> new DrawersItemTagProvider(output, future, blockTagProvider)); pack.addProvider(ReadmeDataProvider::new); } + + @Override + public @Nullable String getEffectiveModId() { + return "extended_drawers"; + } } diff --git a/src/main/java/io/github/mattidragon/extendeddrawers/datagen/ReadmeDataProvider.java b/src/datagen/java/io/github/mattidragon/extendeddrawers/datagen/ReadmeDataProvider.java similarity index 100% rename from src/main/java/io/github/mattidragon/extendeddrawers/datagen/ReadmeDataProvider.java rename to src/datagen/java/io/github/mattidragon/extendeddrawers/datagen/ReadmeDataProvider.java diff --git a/src/datagen/resources/fabric.mod.json b/src/datagen/resources/fabric.mod.json new file mode 100644 index 0000000..ce833ed --- /dev/null +++ b/src/datagen/resources/fabric.mod.json @@ -0,0 +1,10 @@ +{ + "id": "extended_drawers_datagen", + "version": "1", + "schemaVersion": 1, + "entrypoints": { + "fabric-datagen": [ + "io.github.mattidragon.extendeddrawers.datagen.ExtendedDrawersDatagen" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/assets/extended_drawers/items/access_point.json b/src/main/generated/assets/extended_drawers/items/access_point.json new file mode 100644 index 0000000..5504bbe --- /dev/null +++ b/src/main/generated/assets/extended_drawers/items/access_point.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "extended_drawers:block/access_point" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/extended_drawers/items/compacting_drawer.json b/src/main/generated/assets/extended_drawers/items/compacting_drawer.json new file mode 100644 index 0000000..d08c52d --- /dev/null +++ b/src/main/generated/assets/extended_drawers/items/compacting_drawer.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "extended_drawers:block/compacting_drawer" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/extended_drawers/items/connector.json b/src/main/generated/assets/extended_drawers/items/connector.json new file mode 100644 index 0000000..9fd14d0 --- /dev/null +++ b/src/main/generated/assets/extended_drawers/items/connector.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "extended_drawers:block/connector" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/extended_drawers/items/creative_upgrade.json b/src/main/generated/assets/extended_drawers/items/creative_upgrade.json new file mode 100644 index 0000000..d15790c --- /dev/null +++ b/src/main/generated/assets/extended_drawers/items/creative_upgrade.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "extended_drawers:item/creative_upgrade" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/extended_drawers/items/double_drawer.json b/src/main/generated/assets/extended_drawers/items/double_drawer.json new file mode 100644 index 0000000..26c5105 --- /dev/null +++ b/src/main/generated/assets/extended_drawers/items/double_drawer.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "extended_drawers:block/double_drawer" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/extended_drawers/items/dupe_wand.json b/src/main/generated/assets/extended_drawers/items/dupe_wand.json new file mode 100644 index 0000000..522f7f1 --- /dev/null +++ b/src/main/generated/assets/extended_drawers/items/dupe_wand.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "extended_drawers:item/dupe_wand" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/extended_drawers/items/limiter.json b/src/main/generated/assets/extended_drawers/items/limiter.json new file mode 100644 index 0000000..ad2b390 --- /dev/null +++ b/src/main/generated/assets/extended_drawers/items/limiter.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "extended_drawers:item/limiter" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/extended_drawers/items/lock.json b/src/main/generated/assets/extended_drawers/items/lock.json new file mode 100644 index 0000000..d708b10 --- /dev/null +++ b/src/main/generated/assets/extended_drawers/items/lock.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "extended_drawers:item/lock" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/extended_drawers/items/quad_drawer.json b/src/main/generated/assets/extended_drawers/items/quad_drawer.json new file mode 100644 index 0000000..e834a7f --- /dev/null +++ b/src/main/generated/assets/extended_drawers/items/quad_drawer.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "extended_drawers:block/quad_drawer" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/extended_drawers/items/shadow_drawer.json b/src/main/generated/assets/extended_drawers/items/shadow_drawer.json new file mode 100644 index 0000000..4297860 --- /dev/null +++ b/src/main/generated/assets/extended_drawers/items/shadow_drawer.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "extended_drawers:block/shadow_drawer" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/extended_drawers/items/single_drawer.json b/src/main/generated/assets/extended_drawers/items/single_drawer.json new file mode 100644 index 0000000..da7f59b --- /dev/null +++ b/src/main/generated/assets/extended_drawers/items/single_drawer.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "extended_drawers:block/single_drawer" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/extended_drawers/items/t1_upgrade.json b/src/main/generated/assets/extended_drawers/items/t1_upgrade.json new file mode 100644 index 0000000..e83bb56 --- /dev/null +++ b/src/main/generated/assets/extended_drawers/items/t1_upgrade.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "extended_drawers:item/t1_upgrade" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/extended_drawers/items/t2_upgrade.json b/src/main/generated/assets/extended_drawers/items/t2_upgrade.json new file mode 100644 index 0000000..be142d4 --- /dev/null +++ b/src/main/generated/assets/extended_drawers/items/t2_upgrade.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "extended_drawers:item/t2_upgrade" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/extended_drawers/items/t3_upgrade.json b/src/main/generated/assets/extended_drawers/items/t3_upgrade.json new file mode 100644 index 0000000..8628060 --- /dev/null +++ b/src/main/generated/assets/extended_drawers/items/t3_upgrade.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "extended_drawers:item/t3_upgrade" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/extended_drawers/items/t4_upgrade.json b/src/main/generated/assets/extended_drawers/items/t4_upgrade.json new file mode 100644 index 0000000..b9dff6e --- /dev/null +++ b/src/main/generated/assets/extended_drawers/items/t4_upgrade.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "extended_drawers:item/t4_upgrade" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/extended_drawers/items/upgrade_frame.json b/src/main/generated/assets/extended_drawers/items/upgrade_frame.json new file mode 100644 index 0000000..4fbfc29 --- /dev/null +++ b/src/main/generated/assets/extended_drawers/items/upgrade_frame.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "extended_drawers:item/upgrade_frame" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/extended_drawers/models/item/access_point.json b/src/main/generated/assets/extended_drawers/models/item/access_point.json deleted file mode 100644 index 0098bc8..0000000 --- a/src/main/generated/assets/extended_drawers/models/item/access_point.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "extended_drawers:block/access_point" -} \ No newline at end of file diff --git a/src/main/generated/assets/extended_drawers/models/item/compacting_drawer.json b/src/main/generated/assets/extended_drawers/models/item/compacting_drawer.json deleted file mode 100644 index d0cbd8a..0000000 --- a/src/main/generated/assets/extended_drawers/models/item/compacting_drawer.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "extended_drawers:block/compacting_drawer" -} \ No newline at end of file diff --git a/src/main/generated/assets/extended_drawers/models/item/connector.json b/src/main/generated/assets/extended_drawers/models/item/connector.json deleted file mode 100644 index 1f0c25e..0000000 --- a/src/main/generated/assets/extended_drawers/models/item/connector.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "extended_drawers:block/connector" -} \ No newline at end of file diff --git a/src/main/generated/assets/extended_drawers/models/item/double_drawer.json b/src/main/generated/assets/extended_drawers/models/item/double_drawer.json deleted file mode 100644 index a7e1254..0000000 --- a/src/main/generated/assets/extended_drawers/models/item/double_drawer.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "extended_drawers:block/double_drawer" -} \ No newline at end of file diff --git a/src/main/generated/assets/extended_drawers/models/item/quad_drawer.json b/src/main/generated/assets/extended_drawers/models/item/quad_drawer.json deleted file mode 100644 index f003ee3..0000000 --- a/src/main/generated/assets/extended_drawers/models/item/quad_drawer.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "extended_drawers:block/quad_drawer" -} \ No newline at end of file diff --git a/src/main/generated/assets/extended_drawers/models/item/shadow_drawer.json b/src/main/generated/assets/extended_drawers/models/item/shadow_drawer.json deleted file mode 100644 index 0870494..0000000 --- a/src/main/generated/assets/extended_drawers/models/item/shadow_drawer.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "extended_drawers:block/shadow_drawer" -} \ No newline at end of file diff --git a/src/main/generated/assets/extended_drawers/models/item/single_drawer.json b/src/main/generated/assets/extended_drawers/models/item/single_drawer.json deleted file mode 100644 index 3b425e4..0000000 --- a/src/main/generated/assets/extended_drawers/models/item/single_drawer.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "extended_drawers:block/single_drawer" -} \ No newline at end of file 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 47eec1d..2727bd3 100644 --- a/src/main/java/io/github/mattidragon/extendeddrawers/compacting/CompressionOverrideLoader.java +++ b/src/main/java/io/github/mattidragon/extendeddrawers/compacting/CompressionOverrideLoader.java @@ -1,6 +1,7 @@ package io.github.mattidragon.extendeddrawers.compacting; import net.minecraft.resource.JsonDataLoader; +import net.minecraft.resource.ResourceFinder; import net.minecraft.resource.ResourceManager; import net.minecraft.util.Identifier; import net.minecraft.util.profiler.Profiler; @@ -12,7 +13,7 @@ public class CompressionOverrideLoader extends JsonDataLoader private final ServerCompressionRecipeManager compressionRecipeManager; public CompressionOverrideLoader(ServerCompressionRecipeManager compressionRecipeManager) { - super(CompressionLadder.CODEC, "extended_drawers/compression_overrides"); + super(CompressionLadder.CODEC, ResourceFinder.json("extended_drawers/compression_overrides")); this.compressionRecipeManager = compressionRecipeManager; } diff --git a/src/main/java/io/github/mattidragon/extendeddrawers/networking/CompressionRecipeSyncPayload.java b/src/main/java/io/github/mattidragon/extendeddrawers/networking/CompressionRecipeSyncPayload.java index ef92140..93d807b 100644 --- a/src/main/java/io/github/mattidragon/extendeddrawers/networking/CompressionRecipeSyncPayload.java +++ b/src/main/java/io/github/mattidragon/extendeddrawers/networking/CompressionRecipeSyncPayload.java @@ -17,7 +17,7 @@ public record CompressionRecipeSyncPayload(List recipes, bool public static final Id ID = new Id<>(ExtendedDrawers.id("compression_recipe_sync")); private static final PacketCodec CODEC = PacketCodec.tuple( CompressionLadder.PACKET_CODEC.collect(PacketCodecs.toList()), CompressionRecipeSyncPayload::recipes, - PacketCodecs.BOOL, CompressionRecipeSyncPayload::clearRecipes, + PacketCodecs.BOOLEAN, CompressionRecipeSyncPayload::clearRecipes, CompressionRecipeSyncPayload::new ); diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index ef7a1aa..ba787c1 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -25,9 +25,6 @@ "main": [ "io.github.mattidragon.extendeddrawers.ExtendedDrawers" ], - "fabric-datagen": [ - "io.github.mattidragon.extendeddrawers.datagen.ExtendedDrawersDatagen" - ], "modmenu": [ "io.github.mattidragon.extendeddrawers.client.config.ModMenuIntegration" ] @@ -42,7 +39,7 @@ "depends": { "fabricloader": ">=0.15.11", "fabric": ">=0.102.0", - "minecraft": ">=1.21.2 <1.21.4-", + "minecraft": "1.21.4", "graphlib": "*" }, "recommends": {