2.1.0 Blocks

src/main/java/com/acethewildfire/acesbs/PATCH_NOTES.md

@@ -4,8 +4,10 @@
 - Prisma Smithing Templates can be given by Armorers as a Hero of the Village Gift.
 - Hammers are now included in the pickaxe item tag. (aka, to other mods they will be considered a type of pickaxe)
 - Fire Oak Trees and associated wood blocks. Obtainable by placing an oak sapling and infernal ashes in an Entropic Entangler
+- Fractal Diamonds can now be obtained by placing a diamond and stable entropy into an entropic entangler. They can be used to craft tools and armor. They have the same effect as Prisma Steel and drop additional ores when mining.
+- Hellfire Diamonds can now be obtained by placing a diamond and infernal ashes into an entropic entangler. They can be used to craft tools and armor.
 ## Fixes
-- Blocks of Ashen Steel now have a recipe. Not sure how I missed that one.
+- Blocks of Ashen Steel now have a recipe and drop when mined. Not sure how I missed that one.
 - Hammers are now enchantable and are compatible with pickaxe enchantments.
 - Lemonwood Sapling renders as an item now, rather than a block
 - Lemonwood Trapdoors face the correct direction
@@ -21,7 +23,3 @@
 - Fractal Diamonds have no use and no translation
 - Hellfire Diamonds have no use and no translation
 - The Combustible Lemon does not render when thrown.
-
-
-- Diamond BLOCKS
-- Gold Items?

src/main/java/com/acethewildfire/acesbs/TODO.txt

@@ -1,8 +1,6 @@
 Resources
 - Chaos Silver (Stable Entropy + Gold)
-- Fractal Diamond (Stable Entropy + Diamond)
 - Everburn Gold (Ashes + Gold)
-- Infernal Diamond (Ashes + Diamond)
 - Endtropium (Stable End-tropy + Netherite)
 - Faerie Shard (Amethyst + Stable Entropy)
 
@@ -33,10 +31,7 @@ X Lemon (Yellow Blindness)
 Tools
 - Prisma Bucket (Stanlys bucket)
 - Chaos Silver (May get a different Ore when mining)
-- Fractal Diamond (May get a different Ore when mining)
-- Ashen Steel (Randomly Smelts Ores)
 - Everburn Gold (Randomly Smelts Ores)
-- Infernal Diamond (Randomly Smelts Ores)
 - Endtropium
 
 Order

src/main/java/com/acethewildfire/acesbs/block/ModBlocks.java

@@ -185,6 +185,42 @@ public class ModBlocks {
 		)
     );
 
+    public static final Block ASHEN_STEEL_BLOCK = registerBlock(
+            "ashen_steel_block",
+            properties -> new Block(
+                    properties
+                            .mapColor(MapColor.IRON_GRAY)
+                            .instrument(NoteBlockInstrument.IRON_XYLOPHONE)
+                            .requiresTool()
+                            .strength(5.0F, 6.0F)
+                            .sounds(BlockSoundGroup.METAL)
+            )
+    );
+
+    public static final Block FRACTAL_DIAMOND_BLOCK = registerBlock(
+            "fractal_diamond_block",
+            properties -> new Block(
+                    properties
+                            .mapColor(MapColor.WHITE_GRAY)
+                            .instrument(NoteBlockInstrument.CHIME)
+                            .requiresTool()
+                            .strength(5.0F, 6.0F)
+                            .sounds(BlockSoundGroup.NETHERITE)
+            )
+    );
+
+    public static final Block HELLFIRE_DIAMOND_BLOCK = registerBlock(
+            "hellfire_diamond_block",
+            properties -> new Block(
+                    properties
+                            .mapColor(MapColor.DULL_RED)
+                            .instrument(NoteBlockInstrument.CHIME)
+                            .requiresTool()
+                            .strength(5.0F, 6.0F)
+                            .sounds(BlockSoundGroup.NETHERITE)
+            )
+    );
+
     public static final Block INFERNAL_ASHES_BLOCK = registerBlock(
             "infernal_ashes_block",
             properties -> new FallingBlock(
@@ -241,17 +277,6 @@ public class ModBlocks {
                     .sounds(BlockSoundGroup.CROP)
                     .pistonBehavior(PistonBehavior.DESTROY)
     ));
-    public static final Block ASHEN_STEEL_BLOCK = registerBlock(
-            "ashen_steel_block",
-            properties -> new Block(
-                    properties
-                            .mapColor(MapColor.IRON_GRAY)
-                            .instrument(NoteBlockInstrument.IRON_XYLOPHONE)
-                            .requiresTool()
-                            .strength(5.0F, 6.0F)
-                            .sounds(BlockSoundGroup.METAL)
-            )
-    );
 
     public static Block registerBlock(String name, Function<AbstractBlock.Settings, Block> function) {
         Block toRegister = function.apply(AbstractBlock.Settings.create().registryKey(RegistryKey.of(RegistryKeys.BLOCK, Identifier.of(AcesBS.MOD_ID, name))));

src/main/java/com/acethewildfire/acesbs/datagen/ModBlockTagProvider.java

@@ -26,6 +26,8 @@ public class ModBlockTagProvider extends FabricTagProvider.BlockTagProvider {
                 .add(ModBlocks.STABLE_ENDTROPY_BLOCK)
                 .add(ModBlocks.PRISMA_STEEL_BLOCK)
                 .add(ModBlocks.ASHEN_STEEL_BLOCK)
+                .add(ModBlocks.FRACTAL_DIAMOND_BLOCK)
+                .add(ModBlocks.HELLFIRE_DIAMOND_BLOCK)
                 .add(ModBlocks.ENTROPY_ORE)
                 .add(ModBlocks.DEEPSLATE_ENTROPY_ORE)
                 .add(ModBlocks.INFERNAL_ASHES_ORE)
@@ -49,7 +51,9 @@ public class ModBlockTagProvider extends FabricTagProvider.BlockTagProvider {
                 .add(ModBlocks.RAW_ENDTROPY_BLOCK)
                 .add(ModBlocks.STABLE_ENDTROPY_BLOCK)
                 .add(ModBlocks.PRISMA_STEEL_BLOCK)
-                .add(ModBlocks.ASHEN_STEEL_BLOCK);
+                .add(ModBlocks.ASHEN_STEEL_BLOCK)
+                .add(ModBlocks.FRACTAL_DIAMOND_BLOCK)
+                .add(ModBlocks.HELLFIRE_DIAMOND_BLOCK);
 
 
         valueLookupBuilder(BlockTags.AXE_MINEABLE)

src/main/java/com/acethewildfire/acesbs/datagen/ModItemTagProvider.java

@@ -222,6 +222,8 @@ public class ModItemTagProvider extends FabricTagProvider.ItemTagProvider {
         valueLookupBuilder(ConventionalItemTags.STORAGE_BLOCKS)
                 .add(ModBlocks.PRISMA_STEEL_BLOCK.asItem())
                 .add(ModBlocks.ASHEN_STEEL_BLOCK.asItem())
+                .add(ModBlocks.FRACTAL_DIAMOND_BLOCK.asItem())
+                .add(ModBlocks.HELLFIRE_DIAMOND_BLOCK.asItem())
                 .add(ModBlocks.RAW_ENTROPY_BLOCK.asItem())
                 .add(ModBlocks.INFERNAL_ASHES_BLOCK.asItem())
                 .add(ModBlocks.RAW_ENDTROPY_BLOCK.asItem());

src/main/java/com/acethewildfire/acesbs/datagen/ModLootTableProvider.java

@@ -59,6 +59,9 @@ public class ModLootTableProvider extends FabricBlockLootTableProvider {
         addDrop(ModBlocks.RAW_ENDTROPY_BLOCK);
         addDrop(ModBlocks.STABLE_ENDTROPY_BLOCK);
         addDrop(ModBlocks.PRISMA_STEEL_BLOCK);
+        addDrop(ModBlocks.ASHEN_STEEL_BLOCK);
+        addDrop(ModBlocks.FRACTAL_DIAMOND_BLOCK);
+        addDrop(ModBlocks.HELLFIRE_DIAMOND_BLOCK);
         addDrop(ModBlocks.ENTROPIC_STABILIZER);
         addDrop(ModBlocks.ENTROPIC_EVISCERATOR);
         addDrop(ModBlocks.ENTROPIC_ENTANGLER);

src/main/java/com/acethewildfire/acesbs/datagen/ModModelProvider.java

@@ -38,6 +38,8 @@ public class ModModelProvider extends FabricModelProvider {
         blockStateModelGenerator.registerSimpleCubeAll(ModBlocks.RAW_ENDTROPY_BLOCK);
         blockStateModelGenerator.registerSimpleCubeAll(ModBlocks.PRISMA_STEEL_BLOCK);
         blockStateModelGenerator.registerSimpleCubeAll(ModBlocks.ASHEN_STEEL_BLOCK);
+        blockStateModelGenerator.registerSimpleCubeAll(ModBlocks.FRACTAL_DIAMOND_BLOCK);
+        blockStateModelGenerator.registerSimpleCubeAll(ModBlocks.HELLFIRE_DIAMOND_BLOCK);
         blockStateModelGenerator.registerSimpleCubeAll(ModBlocks.INFERNAL_ASHES_BLOCK);
 
 //        blockStateModelGenerator.registerSimpleCubeAll(ModBlocks.CRYSTAL_ENTROPY);

src/main/java/com/acethewildfire/acesbs/datagen/ModRecipeProvider.java

@@ -46,11 +46,11 @@ public class ModRecipeProvider extends FabricRecipeProvider {
                 offerReversibleCompactingRecipes(RecipeCategory.BUILDING_BLOCKS, ModItems.STABLE_ENTROPY, RecipeCategory.DECORATIONS, ModBlocks.STABLE_ENTROPY_BLOCK);
                 offerReversibleCompactingRecipes(RecipeCategory.BUILDING_BLOCKS, ModItems.RAW_ENDTROPY, RecipeCategory.DECORATIONS, ModBlocks.RAW_ENDTROPY_BLOCK);
                 offerReversibleCompactingRecipes(RecipeCategory.BUILDING_BLOCKS, ModItems.STABLE_ENDTROPY, RecipeCategory.DECORATIONS, ModBlocks.STABLE_ENDTROPY_BLOCK);
-                // ENDTROPY BLOCKS
+
-                //        offerReversibleCompactingRecipes(recipeExporter, RecipeCategory.BUILDING_BLOCKS, ModItems.RAW_ENTROPY, RecipeCategory.DECORATIONS, ModBlocks.ENDTROPY_BLOCK);
-                //        offerReversibleCompactingRecipes(recipeExporter, RecipeCategory.BUILDING_BLOCKS, ModItems.STABLE_ENTROPY, RecipeCategory.DECORATIONS, ModBlocks.STABLE_ENDTROPY_BLOCK);
                 offerReversibleCompactingRecipes(RecipeCategory.BUILDING_BLOCKS, PrismaSteelItems.PRISMA_STEEL, RecipeCategory.DECORATIONS, ModBlocks.PRISMA_STEEL_BLOCK);
                 offerReversibleCompactingRecipes(RecipeCategory.BUILDING_BLOCKS, AshenSteelItems.ASHEN_STEEL, RecipeCategory.DECORATIONS, ModBlocks.ASHEN_STEEL_BLOCK);
+                offerReversibleCompactingRecipes(RecipeCategory.BUILDING_BLOCKS, FractalDiamondItems.FRACTAL_DIAMOND, RecipeCategory.DECORATIONS, ModBlocks.FRACTAL_DIAMOND_BLOCK);
+                offerReversibleCompactingRecipes(RecipeCategory.BUILDING_BLOCKS, HellfireDiamondItems.HELLFIRE_DIAMOND, RecipeCategory.DECORATIONS, ModBlocks.HELLFIRE_DIAMOND_BLOCK);
                 offerReversibleCompactingRecipes(RecipeCategory.BUILDING_BLOCKS, ModItems.INFERNAL_ASHES, RecipeCategory.DECORATIONS, ModBlocks.INFERNAL_ASHES_BLOCK);
 
 

src/main/java/com/acethewildfire/acesbs/item/ModItemGroups.java

@@ -69,6 +69,8 @@ public class ModItemGroups {
 
                         entries.add(ModBlocks.PRISMA_STEEL_BLOCK);
                         entries.add(ModBlocks.ASHEN_STEEL_BLOCK);
+                        entries.add(ModBlocks.FRACTAL_DIAMOND_BLOCK);
+                        entries.add(ModBlocks.HELLFIRE_DIAMOND_BLOCK);
                         entries.add(ModBlocks.ENTROPIC_STABILIZER);
                         entries.add(ModBlocks.ENTROPIC_EVISCERATOR);
                         entries.add(ModBlocks.ENTROPIC_ENTANGLER);