Create item model definition

common/src/generated/resources/assets/quarryplus/items/adv_quarry.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "quarryplus:block/adv_quarry"
+  }
+}

common/src/generated/resources/assets/quarryplus/items/chunk_marker.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "quarryplus:item/chunk_marker"
+  }
+}

common/src/generated/resources/assets/quarryplus/items/creative_generator.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "quarryplus:block/creative_generator"
+  }
+}

common/src/generated/resources/assets/quarryplus/items/debug_storage.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "quarryplus:block/debug_storage"
+  }
+}

common/src/generated/resources/assets/quarryplus/items/exp_module.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "quarryplus:item/exp_module"
+  }
+}

common/src/generated/resources/assets/quarryplus/items/filter_module.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "quarryplus:item/filter_module"
+  }
+}

common/src/generated/resources/assets/quarryplus/items/flexible_marker.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "quarryplus:item/flexible_marker"
+  }
+}

common/src/generated/resources/assets/quarryplus/items/frame.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "quarryplus:item/frame"
+  }
+}

common/src/generated/resources/assets/quarryplus/items/marker.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "quarryplus:item/marker"
+  }
+}

common/src/generated/resources/assets/quarryplus/items/mover.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "quarryplus:block/mover"
+  }
+}

common/src/generated/resources/assets/quarryplus/items/placer_plus.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "quarryplus:block/placer_plus"
+  }
+}

common/src/generated/resources/assets/quarryplus/items/pump_module.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "quarryplus:item/pump_module"
+  }
+}

common/src/generated/resources/assets/quarryplus/items/quarry.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "quarryplus:block/quarryplus"
+  }
+}

common/src/generated/resources/assets/quarryplus/items/remote_placer.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "quarryplus:block/remote_placer"
+  }
+}

common/src/generated/resources/assets/quarryplus/items/remove_bedrock_module.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "quarryplus:item/remove_bedrock_module"
+  }
+}

common/src/generated/resources/assets/quarryplus/items/repeat_tick_module.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "quarryplus:item/repeat_tick_module"
+  }
+}

common/src/generated/resources/assets/quarryplus/items/soft_block.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "quarryplus:block/dummy_block"
+  }
+}

common/src/generated/resources/assets/quarryplus/items/status_checker.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "quarryplus:item/status_checker"
+  }
+}

common/src/generated/resources/assets/quarryplus/items/y_setter.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "quarryplus:item/y_setter"
+  }
+}

common/src/generated/resources/assets/quarryplus/models/item/frame.json

@@ -56,6 +56,7 @@
     }
   ],
   "textures": {
+    "particle": "quarryplus:block/frame",
     "texture": "quarryplus:block/frame"
   }
 }

common/src/generated/resources/pack.mcmeta

@@ -1,6 +1,6 @@
 {
   "pack": {
     "description": "QuarryPlus Resource",
-    "pack_format": 42
+    "pack_format": 46
   }
 }

neoforge/src/commonDataGen/scala/com/yogpc/qp/common/data/StateAndModelProvider.java

@@ -6,11 +6,16 @@
 import com.yogpc.qp.machine.QpBlockProperty;
 import com.yogpc.qp.machine.QpItem;
 import com.yogpc.qp.neoforge.PlatformAccessNeoForge;
+import net.minecraft.client.data.models.model.ItemModelUtils;
 import net.minecraft.client.renderer.RenderStateShard;
 import net.minecraft.client.renderer.RenderType;
+import net.minecraft.client.renderer.item.ClientItem;
 import net.minecraft.core.Direction;
 import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.data.CachedOutput;
 import net.minecraft.data.DataGenerator;
+import net.minecraft.data.DataProvider;
+import net.minecraft.data.PackOutput;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemDisplayContext;
 import net.minecraft.world.level.block.Block;
@@ -20,12 +25,18 @@
 import net.neoforged.neoforge.client.model.generators.ModelFile;
 import net.neoforged.neoforge.common.data.ExistingFileHelper;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
+import java.util.concurrent.CompletableFuture;
 
 final class StateAndModelProvider extends BlockStateProvider {
+    private final PackOutput.PathProvider itemInfoPathProvider;
+    private final Map<ResourceLocation, ClientItem> clientItemMap = new HashMap<>();
     StateAndModelProvider(DataGenerator gen, ExistingFileHelper exFileHelper) {
         super(gen.getPackOutput(), QuarryPlus.modID, exFileHelper);
+        this.itemInfoPathProvider = gen.getPackOutput().createPathProvider(PackOutput.Target.RESOURCE_PACK, "items");
     }
 
     private ResourceLocation blockTexture(String name) {
@@ -98,7 +109,8 @@ void frame() {
             .face(Direction.EAST).uvs(0, 4, 4, 12).texture("#texture").end()
             .end();
 
-        getMultipartBuilder(PlatformAccess.getAccess().registerObjects().frameBlock().get()).part()
+        var block = PlatformAccess.getAccess().registerObjects().frameBlock().get();
+        getMultipartBuilder(block).part()
             .modelFile(center).addModel().end().part()
             .modelFile(side).uvLock(true).addModel().condition(BlockStateProperties.NORTH, true).end().part()
             .modelFile(side).uvLock(true).rotationY(90).addModel().condition(BlockStateProperties.EAST, true).end().part()
@@ -113,9 +125,11 @@ void frame() {
             .transform(ItemDisplayContext.FIXED).translation(0, 0, 0).scale(0.8f).rotation(0, 90, 0).end()
             .end()
             .texture("texture", blockTexture("frame"))
+            .texture("particle", blockTexture("frame"))
             .element().from(4, 0, 4).to(12, 12, 12)
             .allFaces((direction, faceBuilder) -> faceBuilder.uvs(4.0f, 4.0f, 12.0f, direction.getAxis() == Direction.Axis.Y ? 12.0f : 16.0f).texture("#texture"))
         ;
+        addClientItem(block.name, modLoc("item/frame"));
     }
 
     void dummyBlocks() {
@@ -125,20 +139,23 @@ void dummyBlocks() {
 
         simpleBlock(PlatformAccessNeoForge.RegisterObjectsNeoForge.BLOCK_SOFT.get(), dummyBlockModel);
         simpleBlockItem(PlatformAccessNeoForge.RegisterObjectsNeoForge.BLOCK_SOFT.get(), dummyBlockModel);
+        addClientItem(PlatformAccessNeoForge.RegisterObjectsNeoForge.BLOCK_SOFT.get().location, modLoc("block/dummy_block"));
         // simpleBlock(Holder.BLOCK_DUMMY_REPLACER, dummyReplacerModel);
     }
 
-    void simpleBlockAndItemCubeAll(Block block) {
+    void simpleBlockAndItemCubeAll(QpBlock block) {
         var model = cubeAll(block);
         simpleBlock(block, model);
         simpleBlockItem(block, model);
+        addClientItem(block.name, block.name.withPrefix("block/"));
     }
 
     void simpleBlockAndItemCubeBottomTop(QpBlock block, ResourceLocation side, ResourceLocation top, ResourceLocation bottom) {
         var basePath = block.name.getPath();
         var model = models().cubeBottomTop("block/" + basePath, side, bottom, top);
         simpleBlock(block, model);
         simpleBlockItem(block, model);
+        addClientItem(block.name, modLoc("block/" + basePath));
     }
 
     void workBlockAndItem(QpBlock block) {
@@ -157,6 +174,7 @@ void workBlockAndItem(QpBlock block) {
         builder.setModels(builder.partialState().with(QpBlockProperty.WORKING, true), new ConfiguredModel(workingModel));
         builder.setModels(builder.partialState().with(QpBlockProperty.WORKING, false), new ConfiguredModel(normalModel));
         simpleBlockItem(block, normalModel);
+        addClientItem(block.name, modLoc("block/" + basePath));
     }
 
     void workDirectionalBlockAndItem(QpBlock block) {
@@ -187,10 +205,12 @@ void workDirectionalBlockAndItem(QpBlock block, String modelName) {
                 .build();
         });
         simpleBlockItem(block, normalModel);
+        addClientItem(block.name, modLoc("block/" + modelName));
     }
 
     void simpleItem(QpItem item) {
         itemModels().basicItem(item.name);
+        addClientItem(item.name, item.name.withPrefix("item/"));
     }
 
     void simpleItem(QpItem item, String texture) {
@@ -201,6 +221,7 @@ void simpleItem(QpItem item, ResourceLocation texture) {
         itemModels().getBuilder("item/" + item.name.getPath())
             .parent(new ModelFile.UncheckedModelFile("item/generated"))
             .texture("layer0", texture);
+        addClientItem(item.name, item.name.withPrefix("item/"));
     }
 
     void placer() {
@@ -220,6 +241,7 @@ void placer() {
                 .build();
         }, BlockStateProperties.TRIGGERED);
         simpleBlockItem(block, model);
+        addClientItem(block.name, modLoc("block/" + basePath));
     }
 
     void mining_well() {
@@ -322,6 +344,7 @@ void markers() {
         itemModels().getBuilder(markerBlock.name.getPath())
             .parent(new ModelFile.UncheckedModelFile("item/generated"))
             .texture("layer0", ResourceLocation.fromNamespaceAndPath(QuarryPlus.modID, "item/" + markerBlock.name.getPath() + "_item"));
+        addClientItem(markerBlock.name, markerBlock.name.withPrefix("item/"));
         for (QpBlock marker : List.<QpBlock>of(PlatformAccess.getAccess().registerObjects().flexibleMarkerBlock().get(), PlatformAccess.getAccess().registerObjects().chunkMarkerBlock().get())) {
             var baseName = marker.name.getPath();
             var m = models().withExistingParent("block/" + baseName, ResourceLocation.fromNamespaceAndPath(QuarryPlus.modID, "block/marker_post"))
@@ -331,6 +354,7 @@ void markers() {
             itemModels().getBuilder(baseName)
                 .parent(new ModelFile.UncheckedModelFile("item/generated"))
                 .texture("layer0", ResourceLocation.fromNamespaceAndPath(QuarryPlus.modID, "item/" + baseName + "_item"));
+            addClientItem(marker.name, marker.name.withPrefix("item/"));
         }
     }
 
@@ -402,6 +426,7 @@ void waterloggedMarkers() {
                 .texture("particle", blockTexture(baseName.replace("waterlogged_", "")));
             simpleBlock(marker, m);
             simpleBlockItem(marker, m);
+            addClientItem(marker.name, marker.name.withPrefix("item/"));
         }
     }
 
@@ -414,4 +439,20 @@ private static String renderTypeName(RenderStateShard type) {
             throw new RuntimeException(e);
         }
     }
+
+    public void addClientItem(ResourceLocation key, ResourceLocation base) {
+        var unbaked = ItemModelUtils.plainModel(base);
+        clientItemMap.put(
+            key,
+            new ClientItem(unbaked, ClientItem.Properties.DEFAULT)
+        );
+    }
+
+    @Override
+    public CompletableFuture<?> run(CachedOutput cache) {
+        var parent = super.run(cache);
+        return parent.thenCompose(v ->
+            DataProvider.saveAll(cache, ClientItem.CODEC, itemInfoPathProvider, clientItemMap)
+        );
+    }
 }