fix: fixes

Zepalesque · Jun 18, 2024 · 05ae0b7 · 05ae0b7
1 parent aa4beb9
commit 05ae0b7
Showing 1 changed file with 19 additions and 18 deletions.
diff --git a/src/main/java/net/zepalesque/redux/blockset/stone/ReduxStoneSets.java b/src/main/java/net/zepalesque/redux/blockset/stone/ReduxStoneSets.java
@@ -18,17 +18,29 @@
 
 public class ReduxStoneSets {
 
+    public static final BaseStoneSet GILDED_HOLYSTONE = register(new BaseStoneSet("gilded_holystone", MapColor.SAND, SoundType.STONE, 0.5F, 0.5F, "natural/",
+            "The enchanted form of Mossy Holystone. This rock covered in golden moss glitters in the sunlight."))
+            .creativeTab(AetherCreativeTabs.AETHER_BUILDING_BLOCKS, () -> AetherBlocks.MOSSY_HOLYSTONE_WALL, true)
+            .creativeTab(AetherCreativeTabs.AETHER_NATURAL_BLOCKS, () -> AetherBlocks.MOSSY_HOLYSTONE, false)
+            .withTag(BlockTags.MINEABLE_WITH_PICKAXE, true);
+
+    public static final BaseStoneSet BLIGHTMOSS_HOLYSTONE = register(new BaseStoneSet("blightmoss_holystone", MapColor.TERRACOTTA_PURPLE, SoundType.STONE, 0.5F, 0.5F, "natural/",
+            "The blighted form of Mosssy Holystone. The viscious moss on this rock wilts in the sunlight and flourishes in the moonlight."))
+            .creativeTab(AetherCreativeTabs.AETHER_BUILDING_BLOCKS, ReduxStoneSets.GILDED_HOLYSTONE::wall, true)
+            .creativeTab(AetherCreativeTabs.AETHER_NATURAL_BLOCKS, ReduxStoneSets.GILDED_HOLYSTONE::block, false)
+            .withTag(BlockTags.MINEABLE_WITH_PICKAXE, true);
+
     public static final BaseStoneSet SENTRITE = register(new BaseStoneSet("sentrite", MapColor.DEEPSLATE, SoundType.NETHER_ORE, 1.0F, 6.0F, "natural/",
             "A dark, metallic rock found throughout the Aether. This crude metal is used in a number of parts of Sentry technology, even their walls of Carved Stone are made of a mixture of this and Holystone.")).craftsInto(AetherBlocks.CARVED_STONE,
-            new CraftingMatrix(4, builder ->
-                    builder
-                            .define('H', AetherBlocks.HOLYSTONE.get())
-                            .pattern("#H")
-                            .pattern("H#")))
+                    new CraftingMatrix(4, builder ->
+                            builder
+                                    .define('H', AetherBlocks.HOLYSTONE.get())
+                                    .pattern("#H")
+                                    .pattern("H#")))
             .craftsIntoSet(() -> ReduxStoneSets.SENTRITE_BRICKS, CraftingMatrices.SQUARE_2X2)
             .stonecutIntoSet(() -> ReduxStoneSets.SENTRITE_BRICKS)
-            .creativeTab(AetherCreativeTabs.AETHER_BUILDING_BLOCKS, () -> ReduxStoneSets.BLIGHTMOSS_HOLYSTONE.wall().get(), true)
-            .creativeTab(AetherCreativeTabs.AETHER_NATURAL_BLOCKS, () -> ReduxStoneSets.BLIGHTMOSS_HOLYSTONE.block().get(), false)
+            .creativeTab(AetherCreativeTabs.AETHER_BUILDING_BLOCKS, ReduxStoneSets.BLIGHTMOSS_HOLYSTONE::wall, true)
+            .creativeTab(AetherCreativeTabs.AETHER_NATURAL_BLOCKS, ReduxStoneSets.BLIGHTMOSS_HOLYSTONE::block, false)
             .withTag(BlockTags.MINEABLE_WITH_PICKAXE, true);
 
     public static final BaseStoneSet SENTRITE_BRICKS = register(new BrickStoneSet("sentrite_brick", MapColor.DEEPSLATE, SoundType.NETHER_BRICKS, 1.0F, 6.0F, "construction/",
@@ -39,17 +51,6 @@ public class ReduxStoneSets {
             .withTag(AetherTags.Blocks.SENTRY_BLOCKS, false)
             .withItemTag(AetherTags.Items.SENTRY_BLOCKS, false);
 
-    public static final BaseStoneSet GILDED_HOLYSTONE = register(new BaseStoneSet("gilded_holystone", MapColor.SAND, SoundType.STONE, 0.5F, 0.5F, "natural/",
-            "The enchanted form of Mossy Holystone. This rock covered in golden moss glitters in the sunlight."))
-            .creativeTab(AetherCreativeTabs.AETHER_BUILDING_BLOCKS, () -> AetherBlocks.MOSSY_HOLYSTONE_WALL, true)
-            .creativeTab(AetherCreativeTabs.AETHER_NATURAL_BLOCKS, () -> AetherBlocks.MOSSY_HOLYSTONE, false)
-            .withTag(BlockTags.MINEABLE_WITH_PICKAXE, true);
-
-    public static final BaseStoneSet BLIGHTMOSS_HOLYSTONE = register(new BaseStoneSet("blightmoss_holystone", MapColor.TERRACOTTA_PURPLE, SoundType.STONE, 0.5F, 0.5F, "natural/",
-            "The blighted form of Mosssy Holystone. The viscious moss on this rock wilts in the sunlight and flourishes in the moonlight."))
-            .creativeTab(AetherCreativeTabs.AETHER_BUILDING_BLOCKS, ReduxStoneSets.GILDED_HOLYSTONE::wall, true)
-            .creativeTab(AetherCreativeTabs.AETHER_NATURAL_BLOCKS, ReduxStoneSets.GILDED_HOLYSTONE::block, false)
-            .withTag(BlockTags.MINEABLE_WITH_PICKAXE, true);
 
 
     public static <T extends AbstractStoneSet> T register(T set) {