finish adding the disc burner block (no functionality)

xFN10x · xFN10x · commit 866a8960b25e · 2026-01-18T19:42:24.000-04:00
diff --git a/src/client/java/fn10/musicexpansion/MusicExpandedClient.java b/src/client/java/fn10/musicexpansion/MusicExpandedClient.java
@@ -1,10 +1,13 @@
 package fn10.musicexpansion;
 
+import fn10.musicexpansion.reg.MusicExpandedBlocks;
 import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.fabric.api.client.rendering.v1.BlockRenderLayerMap;
+import net.minecraft.client.renderer.chunk.ChunkSectionLayer;
 
 public class MusicExpandedClient implements ClientModInitializer {
 	@Override
 	public void onInitializeClient() {
-		// This entrypoint is suitable for setting up client-specific logic, such as rendering.
+		BlockRenderLayerMap.putBlock(MusicExpandedBlocks.DISC_BURNER_BLOCK, ChunkSectionLayer.TRANSLUCENT);
 	}
 }
diff --git a/src/client/java/fn10/musicexpansion/MusicExpandedDataGenerator.java b/src/client/java/fn10/musicexpansion/MusicExpandedDataGenerator.java
@@ -1,6 +1,8 @@
 package fn10.musicexpansion;
 
-import fn10.musicexpansion.datagen.providers.MusicExapandedTagProvider;
+import fn10.musicexpansion.datagen.providers.MusicExpandedBlockTagProvider;
+import fn10.musicexpansion.datagen.providers.MusicExpandedItemTagProvider;
+import fn10.musicexpansion.datagen.providers.MusicExpandedBlockLootTableProvider;
 import fn10.musicexpansion.datagen.providers.MusicExpandedRecipeProvider;
 import fn10.musicexpansion.providers.MusicExpandedModelProvider;
 import fn10.musicexpansion.providers.MusicExpandedTranslationProviderENG;
@@ -14,8 +16,10 @@ public void onInitializeDataGenerator(FabricDataGenerator fabricDataGenerator) {
 		Pack pack = fabricDataGenerator.createPack();
 
 		pack.addProvider(MusicExpandedRecipeProvider::new);
-		pack.addProvider(MusicExapandedTagProvider::new);
+		pack.addProvider(MusicExpandedItemTagProvider::new);
 		pack.addProvider(MusicExpandedModelProvider::new);
 		pack.addProvider(MusicExpandedTranslationProviderENG::new);
+		pack.addProvider(MusicExpandedBlockLootTableProvider::new);
+		pack.addProvider(MusicExpandedBlockTagProvider::new);
 	}
 }
diff --git a/src/client/java/fn10/musicexpansion/providers/MusicExpandedModelProvider.java b/src/client/java/fn10/musicexpansion/providers/MusicExpandedModelProvider.java
@@ -1,11 +1,14 @@
 package fn10.musicexpansion.providers;
 
+import fn10.musicexpansion.MusicExpanded;
+import fn10.musicexpansion.reg.MusicExpandedBlocks;
 import fn10.musicexpansion.reg.MusicExpandedItems;
 import net.fabricmc.fabric.api.client.datagen.v1.provider.FabricModelProvider;
 import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
 import net.minecraft.client.data.models.BlockModelGenerators;
 import net.minecraft.client.data.models.ItemModelGenerators;
 import net.minecraft.client.data.models.model.ModelTemplates;
+import net.minecraft.resources.Identifier;
 
 public class MusicExpandedModelProvider extends FabricModelProvider {
 
@@ -15,6 +18,11 @@ public MusicExpandedModelProvider(FabricDataOutput output) {
 
     @Override
     public void generateBlockStateModels(BlockModelGenerators blockStateModelGenerator) {
+        blockStateModelGenerator.blockStateOutput.accept(
+                BlockModelGenerators.createSimpleBlock(MusicExpandedBlocks.DISC_BURNER_BLOCK, BlockModelGenerators
+                        .plainVariant(Identifier.fromNamespaceAndPath(MusicExpanded.MOD_ID, "block/disc_burner"))));
+        blockStateModelGenerator.registerSimpleItemModel(MusicExpandedBlocks.DISC_BURNER_BLOCK,
+                Identifier.fromNamespaceAndPath(MusicExpanded.MOD_ID, "block/disc_burner"));
     }
 
     @Override
diff --git a/src/main/generated/.cache/2fbf86ff4149eee6b9e08a0f457798e7a5fdf460 b/src/main/generated/.cache/2fbf86ff4149eee6b9e08a0f457798e7a5fdf460
@@ -1,5 +1,7 @@
 // 1.21.11	-999999999-01-01T00:00:00	Compact Discs/Model Definitions
+699f99c58773c26d6800b4fa48b9fa3283131bbe assets/compactdiscs/blockstates/disc_burner.json
 8992f88c013726b4bf1b9ff417bf12e3b61cd436 assets/compactdiscs/items/compact_disc.json
+d576ad8cd6569e6aac06a71159d22196e667d55f assets/compactdiscs/items/disc_burner.json
 23ab07262c413c1fa3d89e78ba9cd3fd4125b9cd assets/compactdiscs/items/glass_dust.json
 c080827811eb5c3cd83e6bcc0ca103d8c39098d7 assets/compactdiscs/models/item/compact_disc.json
 351449e1c59492e9fe29006c2bb68639d60d40ed assets/compactdiscs/models/item/glass_dust.json
diff --git a/src/main/generated/.cache/48ddb41dcde42d305135efb05d5e91992bef7ad6 b/src/main/generated/.cache/48ddb41dcde42d305135efb05d5e91992bef7ad6
@@ -1,2 +1,2 @@
 // 1.21.11	-999999999-01-01T00:00:00	Compact Discs/Language (en_us)
-873255571a76abb134c7a00a800062c1d6c770c0 assets/compactdiscs/lang/en_us.json
+0d24cf362717dcc2bf2c3c12ea19191d7efcb8a7 assets/compactdiscs/lang/en_us.json
diff --git a/src/main/generated/.cache/69f1ecd5e994b05409820f3744f46cc06d4c29dc b/src/main/generated/.cache/69f1ecd5e994b05409820f3744f46cc06d4c29dc
@@ -0,0 +1,2 @@
+// 1.21.11	-999999999-01-01T00:00:00	Compact Discs/Tags for minecraft:block
+227c66d396223a9a2271b8dec525b6d85a74e3d2 data/minecraft/tags/block/mineable/pickaxe.json
diff --git a/src/main/generated/.cache/ba43e2af1ff7b7b7a4634e0ddb23aff696efb607 b/src/main/generated/.cache/ba43e2af1ff7b7b7a4634e0ddb23aff696efb607
@@ -0,0 +1,2 @@
+// 1.21.11	-999999999-01-01T00:00:00	Compact Discs/Block Loot Tables
+6a5f74448764e0c87474821aaa3be7eed8dcb859 data/compactdiscs/loot_table/blocks/disc_burner.json
diff --git a/src/main/generated/assets/compactdiscs/blockstates/disc_burner.json b/src/main/generated/assets/compactdiscs/blockstates/disc_burner.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "compactdiscs:block/disc_burner"
+    }
+  }
+}
diff --git a/src/main/generated/assets/compactdiscs/items/disc_burner.json b/src/main/generated/assets/compactdiscs/items/disc_burner.json
@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "compactdiscs:block/disc_burner"
+  }
+}
diff --git a/src/main/generated/assets/compactdiscs/lang/en_us.json b/src/main/generated/assets/compactdiscs/lang/en_us.json
@@ -1,4 +1,5 @@
 {
   "item.compactdiscs.compact_disc": "Compact-Disc",
-  "item.compactdiscs.glass_dust": "Glass Dust"
+  "item.compactdiscs.glass_dust": "Glass Dust",
+  "itemGroup.compactdiscs": "Compact Discs"
 }
diff --git a/src/main/generated/data/compactdiscs/loot_table/blocks/disc_burner.json b/src/main/generated/data/compactdiscs/loot_table/blocks/disc_burner.json
@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "compactdiscs:disc_burner"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}
diff --git a/src/main/generated/data/minecraft/tags/block/mineable/pickaxe.json b/src/main/generated/data/minecraft/tags/block/mineable/pickaxe.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "compactdiscs:disc_burner"
+  ]
+}
diff --git a/src/main/java/fn10/musicexpansion/MusicExpanded.java b/src/main/java/fn10/musicexpansion/MusicExpanded.java
@@ -14,6 +14,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import fn10.musicexpansion.reg.MusicExpandedBlockEntitys;
+import fn10.musicexpansion.reg.MusicExpandedBlocks;
 import fn10.musicexpansion.reg.MusicExpandedItems;
 
 public class MusicExpanded implements ModInitializer {
@@ -42,5 +44,7 @@ public void onInitialize() {
 		});
 
 		MusicExpandedItems.init();
+		MusicExpandedBlockEntitys.init();
+		MusicExpandedBlocks.init();
 	}
 }
diff --git a/src/main/java/fn10/musicexpansion/blocks/entity/DiscBurnerBlock.java b/src/main/java/fn10/musicexpansion/blocks/entity/DiscBurnerBlock.java
@@ -11,8 +11,8 @@
 
 public class DiscBurnerBlock extends BaseEntityBlock {
 
-    protected DiscBurnerBlock(Properties properties) {
-        super(properties);
+    public DiscBurnerBlock(Properties properties) {
+        super(properties.noOcclusion());
     }
 
     @Override
diff --git a/src/main/java/fn10/musicexpansion/blocks/entity/DiscBurnerBlockEntity.java b/src/main/java/fn10/musicexpansion/blocks/entity/DiscBurnerBlockEntity.java
@@ -1,14 +1,13 @@
 package fn10.musicexpansion.blocks.entity;
 
+import fn10.musicexpansion.reg.MusicExpandedBlockEntitys;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
 
 public class DiscBurnerBlockEntity extends BlockEntity {
 
     public DiscBurnerBlockEntity(BlockPos blockPos, BlockState blockState) {
-        super(blockEntityType, blockPos, blockState);
-        //TODO Auto-generated constructor stub
+        super(MusicExpandedBlockEntitys.DISC_BURNER_BENTITY, blockPos, blockState);
     }
 }
diff --git a/src/main/java/fn10/musicexpansion/datagen/providers/MusicExpandedBlockLootTableProvider.java b/src/main/java/fn10/musicexpansion/datagen/providers/MusicExpandedBlockLootTableProvider.java
@@ -0,0 +1,22 @@
+package fn10.musicexpansion.datagen.providers;
+
+import java.util.concurrent.CompletableFuture;
+
+import fn10.musicexpansion.reg.MusicExpandedBlocks;
+import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
+import net.fabricmc.fabric.api.datagen.v1.provider.FabricBlockLootTableProvider;
+import net.minecraft.core.HolderLookup.Provider;
+
+public class MusicExpandedBlockLootTableProvider extends FabricBlockLootTableProvider {
+
+    public MusicExpandedBlockLootTableProvider(FabricDataOutput dataOutput,
+            CompletableFuture<Provider> registryLookup) {
+        super(dataOutput, registryLookup);
+    }
+
+    @Override
+    public void generate() {
+        dropSelf(MusicExpandedBlocks.DISC_BURNER_BLOCK);
+    }
+
+}
diff --git a/src/main/java/fn10/musicexpansion/datagen/providers/MusicExpandedBlockTagProvider.java b/src/main/java/fn10/musicexpansion/datagen/providers/MusicExpandedBlockTagProvider.java
@@ -0,0 +1,24 @@
+package fn10.musicexpansion.datagen.providers;
+
+import java.util.concurrent.CompletableFuture;
+
+import fn10.musicexpansion.reg.MusicExpandedBlocks;
+import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
+import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider;
+import net.minecraft.core.HolderLookup.Provider;
+import net.minecraft.tags.BlockTags;
+
+public class MusicExpandedBlockTagProvider extends FabricTagProvider.BlockTagProvider {
+
+
+    public MusicExpandedBlockTagProvider(FabricDataOutput output, CompletableFuture<Provider> registriesFuture) {
+        super(output, registriesFuture);
+    }
+
+    @Override
+    protected void addTags(Provider wrapperLookup) {
+        valueLookupBuilder(BlockTags.MINEABLE_WITH_PICKAXE)
+            .add(MusicExpandedBlocks.DISC_BURNER_BLOCK);
+    }
+
+}
diff --git a/src/main/java/fn10/musicexpansion/datagen/providers/MusicExpandedItemTagProvider.java b/src/main/java/fn10/musicexpansion/datagen/providers/MusicExpandedItemTagProvider.java
@@ -11,9 +11,9 @@
 import net.minecraft.tags.TagKey;
 import net.minecraft.world.item.Item;
 
-public class MusicExapandedTagProvider extends FabricTagProvider.ItemTagProvider {
+public class MusicExpandedItemTagProvider extends FabricTagProvider.ItemTagProvider {
 
-    public MusicExapandedTagProvider(FabricDataOutput output, CompletableFuture<Provider> registriesFuture) {
+    public MusicExpandedItemTagProvider(FabricDataOutput output, CompletableFuture<Provider> registriesFuture) {
         super(output, registriesFuture);
     }
 
diff --git a/src/main/java/fn10/musicexpansion/datagen/providers/MusicExpandedRecipeProvider.java b/src/main/java/fn10/musicexpansion/datagen/providers/MusicExpandedRecipeProvider.java
@@ -31,8 +31,8 @@ public void buildRecipes() {
                 shaped(RecipeCategory.MISC, MusicExpandedItems.GLASS_DUST)
                         .pattern("AA")
                         .pattern("AA")
-                        .define(Character.valueOf('A'), MusicExapandedTagProvider.GLASS)
-                        .unlockedBy(getHasName(Items.GLASS), has(MusicExapandedTagProvider.GLASS))
+                        .define(Character.valueOf('A'), MusicExpandedItemTagProvider.GLASS)
+                        .unlockedBy(getHasName(Items.GLASS), has(MusicExpandedItemTagProvider.GLASS))
                         .save(exporter);
             }
 
diff --git a/src/main/java/fn10/musicexpansion/reg/MusicExpandedBlockEntitys.java b/src/main/java/fn10/musicexpansion/reg/MusicExpandedBlockEntitys.java
@@ -1,5 +1,29 @@
 package fn10.musicexpansion.reg;
 
+import fn10.musicexpansion.MusicExpanded;
+import fn10.musicexpansion.blocks.entity.DiscBurnerBlockEntity;
+import net.fabricmc.fabric.api.object.builder.v1.block.entity.FabricBlockEntityTypeBuilder;
+import net.minecraft.core.Registry;
+import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.resources.Identifier;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraft.world.level.block.entity.BlockEntityType;
+
 public class MusicExpandedBlockEntitys {
+    public static final BlockEntityType<DiscBurnerBlockEntity> DISC_BURNER_BENTITY = register("counter",
+            DiscBurnerBlockEntity::new, MusicExpandedBlocks.DISC_BURNER_BLOCK);
+
+    private static <T extends BlockEntity> BlockEntityType<T> register(
+            String name,
+            FabricBlockEntityTypeBuilder.Factory<? extends T> entityFactory,
+            Block... blocks) {
+        Identifier id = Identifier.fromNamespaceAndPath(MusicExpanded.MOD_ID, name);
+        return Registry.register(BuiltInRegistries.BLOCK_ENTITY_TYPE, id,
+                FabricBlockEntityTypeBuilder.<T>create(entityFactory, blocks).build());
+    }
+
+    public static void init() {
 
+    }
 }
diff --git a/src/main/java/fn10/musicexpansion/reg/MusicExpandedBlocks.java b/src/main/java/fn10/musicexpansion/reg/MusicExpandedBlocks.java
@@ -0,0 +1,54 @@
+package fn10.musicexpansion.reg;
+
+import com.google.common.base.Function;
+
+import fn10.musicexpansion.MusicExpanded;
+import fn10.musicexpansion.blocks.entity.DiscBurnerBlock;
+import net.minecraft.core.Registry;
+import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.core.registries.Registries;
+import net.minecraft.resources.Identifier;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.world.item.BlockItem;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.state.BlockBehaviour;
+
+public class MusicExpandedBlocks {
+    private static Block register(String name, Function<BlockBehaviour.Properties, Block> blockFactory,
+            BlockBehaviour.Properties settings, boolean shouldRegisterItem) {
+        // Create a registry key for the block
+        ResourceKey<Block> blockKey = keyOfBlock(name);
+        // Create the block instance
+        Block block = blockFactory.apply(settings.setId(blockKey));
+
+        // Sometimes, you may not want to register an item for the block.
+        // Eg: if it's a technical block like `minecraft:moving_piston` or
+        // `minecraft:end_gateway`
+        if (shouldRegisterItem) {
+            // Items need to be registered with a different type of registry key, but the ID
+            // can be the same.
+            ResourceKey<Item> itemKey = keyOfItem(name);
+
+            BlockItem blockItem = new BlockItem(block,
+                    new Item.Properties().setId(itemKey).useBlockDescriptionPrefix());
+            Registry.register(BuiltInRegistries.ITEM, itemKey, blockItem);
+        }
+
+        return Registry.register(BuiltInRegistries.BLOCK, blockKey, block);
+    }
+
+    private static ResourceKey<Block> keyOfBlock(String name) {
+        return ResourceKey.create(Registries.BLOCK, Identifier.fromNamespaceAndPath(MusicExpanded.MOD_ID, name));
+    }
+
+    private static ResourceKey<Item> keyOfItem(String name) {
+        return ResourceKey.create(Registries.ITEM, Identifier.fromNamespaceAndPath(MusicExpanded.MOD_ID, name));
+    }
+
+    public static final Block DISC_BURNER_BLOCK = register("disc_burner", DiscBurnerBlock::new, BlockBehaviour.Properties.of(), true);
+
+    public static void init() {
+
+    }
+}
diff --git a/src/main/resources/assets/compactdiscs/models/block/disc_burner.json b/src/main/resources/assets/compactdiscs/models/block/disc_burner.json
@@ -1,9 +1,9 @@
 {
 	"format_version": "1.21.6",
-	"credit": "Made with Blockbench",
+	"credit": "Made with Blockbench; Made by xFN10x",
 	"texture_size": [64, 64],
 	"textures": {
-		"particle": "compactdiscs:block/disc_burner",
+		"particle": "minecraft:block/smooth_stone",
 		"main": "compactdiscs:block/disc_burner"
 	},
 	"elements": [

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,13 @@`
`1`	`1`	`package fn10.musicexpansion;`
`2`	`2`
	`3`	`+import fn10.musicexpansion.reg.MusicExpandedBlocks;`
`3`	`4`	`import net.fabricmc.api.ClientModInitializer;`
	`5`	`+import net.fabricmc.fabric.api.client.rendering.v1.BlockRenderLayerMap;`
	`6`	`+import net.minecraft.client.renderer.chunk.ChunkSectionLayer;`
`4`	`7`
`5`	`8`	`public class MusicExpandedClient implements ClientModInitializer {`
`6`	`9`	`@Override`
`7`	`10`	`public void onInitializeClient() {`
`8`		`- // This entrypoint is suitable for setting up client-specific logic, such as rendering.`
	`11`	`+ BlockRenderLayerMap.putBlock(MusicExpandedBlocks.DISC_BURNER_BLOCK, ChunkSectionLayer.TRANSLUCENT);`
`9`	`12`	`}`
`10`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`// 1.21.11 -999999999-01-01T00:00:00 Compact Discs/Language (en_us)`
`2`		`-873255571a76abb134c7a00a800062c1d6c770c0 assets/compactdiscs/lang/en_us.json`
	`2`	`+0d24cf362717dcc2bf2c3c12ea19191d7efcb8a7 assets/compactdiscs/lang/en_us.json`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+// 1.21.11 -999999999-01-01T00:00:00 Compact Discs/Tags for minecraft:block`
	`2`	`+227c66d396223a9a2271b8dec525b6d85a74e3d2 data/minecraft/tags/block/mineable/pickaxe.json`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+// 1.21.11 -999999999-01-01T00:00:00 Compact Discs/Block Loot Tables`
	`2`	`+6a5f74448764e0c87474821aaa3be7eed8dcb859 data/compactdiscs/loot_table/blocks/disc_burner.json`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,7 @@ @@
 +{
 +  "variants": {
 +    "": {
 +      "model": "compactdiscs:block/disc_burner"
 +    }
 +  }
 +}
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"item.compactdiscs.compact_disc": "Compact-Disc",`
`3`		`- "item.compactdiscs.glass_dust": "Glass Dust"`
	`3`	`+ "item.compactdiscs.glass_dust": "Glass Dust",`
	`4`	`+ "itemGroup.compactdiscs": "Compact Discs"`
`4`	`5`	`}`