Add new color variants for exclamation blocks + crystal, marimba and …

…egg blocks

src/main/java/fr/hugman/mubble/block/MubbleBlockEntityTypes.java

@@ -11,8 +11,30 @@
 import net.minecraft.util.Util;
 
 public class MubbleBlockEntityTypes {
-    // SUPER MARIO
-    public static final BlockEntityType<BumpableBlockEntity> BUMPABLE_BLOCK = of("bumpable_block", BlockEntityType.Builder.create(BumpableBlockEntity::new, MubbleBlocks.QUESTION_BLOCK, MubbleBlocks.BRICK_BLOCK, MubbleBlocks.GOLD_BLOCK, MubbleBlocks.NOTE_BLOCK, MubbleBlocks.EXCLAMATION_BLOCK));
+    public static final BlockEntityType<BumpableBlockEntity> BUMPABLE_BLOCK = of("bumpable_block", BlockEntityType.Builder.create(BumpableBlockEntity::new,
+            MubbleBlocks.QUESTION_BLOCK,
+            MubbleBlocks.BRICK_BLOCK,
+            MubbleBlocks.CRYSTAL_BLOCK,
+            MubbleBlocks.GOLD_BLOCK,
+            MubbleBlocks.BLUE_EXCLAMATION_BLOCK,
+            MubbleBlocks.GREEN_EXCLAMATION_BLOCK,
+            MubbleBlocks.YELLOW_EXCLAMATION_BLOCK,
+            MubbleBlocks.RED_EXCLAMATION_BLOCK,
+            MubbleBlocks.NOTE_BLOCK,
+            MubbleBlocks.BLUE_MARIMBA_BLOCK,
+            MubbleBlocks.GREEN_MARIMBA_BLOCK,
+            MubbleBlocks.YELLOW_MARIMBA_BLOCK,
+            MubbleBlocks.RED_MARIMBA_BLOCK,
+            MubbleBlocks.BLUE_EGG_BLOCK,
+            MubbleBlocks.CYAN_EGG_BLOCK,
+            MubbleBlocks.GREEN_EGG_BLOCK,
+            MubbleBlocks.YELLOW_EGG_BLOCK,
+            MubbleBlocks.ORANGE_EGG_BLOCK,
+            MubbleBlocks.RED_EGG_BLOCK,
+            MubbleBlocks.PINK_EGG_BLOCK,
+            MubbleBlocks.BLACK_EGG_BLOCK,
+            MubbleBlocks.WHITE_EGG_BLOCK
+    ));
 
     private static <T extends BlockEntity> BlockEntityType<T> of(String path, BlockEntityType.Builder<T> blockEntityType) {
         Type<?> type = Util.getChoiceType(TypeReferences.BLOCK_ENTITY, path);

src/main/java/fr/hugman/mubble/block/MubbleBlockKeys.java

@@ -2,7 +2,6 @@
 
 import fr.hugman.mubble.Mubble;
 import net.minecraft.block.Block;
-import net.minecraft.item.Item;
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.registry.RegistryKeys;
 
@@ -11,15 +10,34 @@ public class MubbleBlockKeys {
     public static final RegistryKey<Block> EMPTY_BLOCK = of("empty_block");
     public static final RegistryKey<Block> QUESTION_BLOCK = of("question_block");
     public static final RegistryKey<Block> BRICK_BLOCK = of("brick_block");
+    public static final RegistryKey<Block> CRYSTAL_BLOCK = of("crystal_block");
     public static final RegistryKey<Block> GOLD_BLOCK = of("gold_block");
+    public static final RegistryKey<Block> BLUE_EXCLAMATION_BLOCK = of("blue_exclamation_block");
+    public static final RegistryKey<Block> GREEN_EXCLAMATION_BLOCK = of("green_exclamation_block");
+    public static final RegistryKey<Block> YELLOW_EXCLAMATION_BLOCK = of("yellow_exclamation_block");
+    public static final RegistryKey<Block> RED_EXCLAMATION_BLOCK = of("red_exclamation_block");
     public static final RegistryKey<Block> NOTE_BLOCK = of("note_block");
-    public static final RegistryKey<Block> EXCLAMATION_BLOCK = of("exclamation_block");
+    public static final RegistryKey<Block> BLUE_MARIMBA_BLOCK = of("blue_marimba_block");
+    public static final RegistryKey<Block> GREEN_MARIMBA_BLOCK = of("green_marimba_block");
+    public static final RegistryKey<Block> YELLOW_MARIMBA_BLOCK = of("yellow_marimba_block");
+    public static final RegistryKey<Block> RED_MARIMBA_BLOCK = of("red_marimba_block");
     public static final RegistryKey<Block> SNAKE_BLOCK = of("snake_block");
     public static final RegistryKey<Block> FAST_SNAKE_BLOCK = of("fast_snake_block");
     public static final RegistryKey<Block> SLOW_SNAKE_BLOCK = of("slow_snake_block");
     public static final RegistryKey<Block> RED_BEEP_BLOCK = of("red_beep_block");
     public static final RegistryKey<Block> BLUE_BEEP_BLOCK = of("blue_beep_block");
 
+    // YOSHI'S ISLAND
+    public static final RegistryKey<Block> BLUE_EGG_BLOCK = of("blue_egg_block");
+    public static final RegistryKey<Block> CYAN_EGG_BLOCK = of("cyan_egg_block");
+    public static final RegistryKey<Block> GREEN_EGG_BLOCK = of("green_egg_block");
+    public static final RegistryKey<Block> YELLOW_EGG_BLOCK = of("yellow_egg_block");
+    public static final RegistryKey<Block> ORANGE_EGG_BLOCK = of("orange_egg_block");
+    public static final RegistryKey<Block> RED_EGG_BLOCK = of("red_egg_block");
+    public static final RegistryKey<Block> PINK_EGG_BLOCK = of("pink_egg_block");
+    public static final RegistryKey<Block> BLACK_EGG_BLOCK = of("black_egg_block");
+    public static final RegistryKey<Block> WHITE_EGG_BLOCK = of("white_egg_block");
+
     private static RegistryKey<Block> of(String path) {
         return RegistryKey.of(RegistryKeys.BLOCK, Mubble.id(path));
     }

src/main/java/fr/hugman/mubble/block/MubbleBlocks.java

@@ -12,33 +12,69 @@
 import net.minecraft.registry.Registries;
 import net.minecraft.registry.Registry;
 import net.minecraft.registry.RegistryKey;
+import net.minecraft.sound.BlockSoundGroup;
 
 public class MubbleBlocks {
     // SUPER MARIO
-    public static final EmptyBlock EMPTY_BLOCK = ofWithItem(MubbleBlockKeys.EMPTY_BLOCK, new EmptyBlock(AbstractBlock.Settings.copy(Blocks.IRON_BLOCK).mapColor(MapColor.BROWN)));
-    public static final DecoratedBumpableBlock QUESTION_BLOCK = ofWithItem(MubbleBlockKeys.QUESTION_BLOCK, new DecoratedBumpableBlock(EMPTY_BLOCK.getDefaultState(), AbstractBlock.Settings.copy(Blocks.IRON_BLOCK).mapColor(MapColor.YELLOW)), new Item.Settings().component(DataComponentTypes.CONTAINER, ContainerComponent.DEFAULT));
-    public static final DecoratedBumpableBlock BRICK_BLOCK = ofWithItem(MubbleBlockKeys.BRICK_BLOCK, new DecoratedBumpableBlock(Blocks.AIR.getDefaultState(), AbstractBlock.Settings.copy(Blocks.BRICKS).mapColor(MapColor.BROWN)),new Item.Settings().component(DataComponentTypes.CONTAINER, ContainerComponent.DEFAULT));
-    public static final DecoratedBumpableBlock GOLD_BLOCK = ofWithItem(MubbleBlockKeys.GOLD_BLOCK, new DecoratedBumpableBlock(Blocks.AIR.getDefaultState(), AbstractBlock.Settings.copy(Blocks.BRICKS).mapColor(MapColor.GOLD)), new Item.Settings().component(DataComponentTypes.CONTAINER, ContainerComponent.DEFAULT));
-    public static final NoteBlock NOTE_BLOCK = ofWithItem(MubbleBlockKeys.NOTE_BLOCK, new NoteBlock(MubbleSounds.NOTE_BLOCK_JUMP_LOW, MubbleSounds.NOTE_BLOCK_JUMP_HIGH, AbstractBlock.Settings.copy(Blocks.QUARTZ_BLOCK).mapColor(MapColor.WHITE)), new Item.Settings().component(DataComponentTypes.CONTAINER, ContainerComponent.DEFAULT));
-    public static final DecoratedBumpableBlock EXCLAMATION_BLOCK = ofWithItem(MubbleBlockKeys.EXCLAMATION_BLOCK, new DecoratedBumpableBlock(null, AbstractBlock.Settings.copy(Blocks.IRON_BLOCK).mapColor(MapColor.BLUE)), new Item.Settings().component(DataComponentTypes.CONTAINER, ContainerComponent.DEFAULT));
-    public static final SnakeBlock SNAKE_BLOCK = ofWithItem(MubbleBlockKeys.SNAKE_BLOCK, new SnakeBlock(AbstractBlock.Settings.copy(Blocks.IRON_BLOCK).mapColor(MapColor.LIME)));
-    public static final SnakeBlock FAST_SNAKE_BLOCK = ofWithItem(MubbleBlockKeys.FAST_SNAKE_BLOCK, new SnakeBlock(AbstractBlock.Settings.copy(Blocks.IRON_BLOCK).mapColor(MapColor.LAPIS_BLUE)));
-    public static final SnakeBlock SLOW_SNAKE_BLOCK = ofWithItem(MubbleBlockKeys.SLOW_SNAKE_BLOCK, new SnakeBlock(AbstractBlock.Settings.copy(Blocks.IRON_BLOCK).mapColor(MapColor.RED)));
-    public static final BeepBlock RED_BEEP_BLOCK = ofWithItem(MubbleBlockKeys.RED_BEEP_BLOCK, new BeepBlock(BeepBlock.settings(MapColor.RED), false));
-    public static final BeepBlock BLUE_BEEP_BLOCK = ofWithItem(MubbleBlockKeys.BLUE_BEEP_BLOCK, new BeepBlock(BeepBlock.settings(MapColor.BLUE), true));
+    public static final EmptyBlock EMPTY_BLOCK = of(MubbleBlockKeys.EMPTY_BLOCK, new EmptyBlock(AbstractBlock.Settings.copy(Blocks.IRON_BLOCK).mapColor(MapColor.BROWN)));
+    public static final DecoratedBumpableBlock QUESTION_BLOCK = of(MubbleBlockKeys.QUESTION_BLOCK, new DecoratedBumpableBlock(EMPTY_BLOCK.getDefaultState(), AbstractBlock.Settings.copy(Blocks.IRON_BLOCK).mapColor(MapColor.YELLOW)), new Item.Settings().component(DataComponentTypes.CONTAINER, ContainerComponent.DEFAULT));
+    public static final DecoratedBumpableBlock BRICK_BLOCK = of(MubbleBlockKeys.BRICK_BLOCK, new DecoratedBumpableBlock(Blocks.AIR.getDefaultState(), AbstractBlock.Settings.copy(Blocks.BRICKS).mapColor(MapColor.BROWN)),new Item.Settings().component(DataComponentTypes.CONTAINER, ContainerComponent.DEFAULT));
+    public static final DecoratedBumpableBlock CRYSTAL_BLOCK = of(MubbleBlockKeys.CRYSTAL_BLOCK, new DecoratedBumpableBlock(Blocks.AIR.getDefaultState(), AbstractBlock.Settings.copy(Blocks.BRICKS).sounds(BlockSoundGroup.AMETHYST_BLOCK).mapColor(MapColor.PURPLE)),new Item.Settings().component(DataComponentTypes.CONTAINER, ContainerComponent.DEFAULT));
+    public static final DecoratedBumpableBlock GOLD_BLOCK = of(MubbleBlockKeys.GOLD_BLOCK, new DecoratedBumpableBlock(Blocks.AIR.getDefaultState(), AbstractBlock.Settings.copy(Blocks.BRICKS).mapColor(MapColor.GOLD)), new Item.Settings().component(DataComponentTypes.CONTAINER, ContainerComponent.DEFAULT));
+    public static final DecoratedBumpableBlock BLUE_EXCLAMATION_BLOCK = exclamationBlock(MubbleBlockKeys.BLUE_EXCLAMATION_BLOCK, MapColor.BLUE);
+    public static final DecoratedBumpableBlock GREEN_EXCLAMATION_BLOCK = exclamationBlock(MubbleBlockKeys.GREEN_EXCLAMATION_BLOCK, MapColor.GREEN);
+    public static final DecoratedBumpableBlock YELLOW_EXCLAMATION_BLOCK = exclamationBlock(MubbleBlockKeys.YELLOW_EXCLAMATION_BLOCK, MapColor.YELLOW);
+    public static final DecoratedBumpableBlock RED_EXCLAMATION_BLOCK = exclamationBlock(MubbleBlockKeys.RED_EXCLAMATION_BLOCK, MapColor.RED);
+    public static final NoteBlock NOTE_BLOCK = noteBlock(MubbleBlockKeys.NOTE_BLOCK, MapColor.WHITE);
+    public static final NoteBlock BLUE_MARIMBA_BLOCK = marimbaBlock(MubbleBlockKeys.BLUE_MARIMBA_BLOCK, MapColor.BLUE);
+    public static final NoteBlock GREEN_MARIMBA_BLOCK = marimbaBlock(MubbleBlockKeys.GREEN_MARIMBA_BLOCK, MapColor.GREEN);
+    public static final NoteBlock YELLOW_MARIMBA_BLOCK = marimbaBlock(MubbleBlockKeys.YELLOW_MARIMBA_BLOCK, MapColor.YELLOW);
+    public static final NoteBlock RED_MARIMBA_BLOCK = marimbaBlock(MubbleBlockKeys.RED_MARIMBA_BLOCK, MapColor.RED);
+    public static final SnakeBlock SNAKE_BLOCK = of(MubbleBlockKeys.SNAKE_BLOCK, new SnakeBlock(AbstractBlock.Settings.copy(Blocks.IRON_BLOCK).mapColor(MapColor.LIME)));
+    public static final SnakeBlock FAST_SNAKE_BLOCK = of(MubbleBlockKeys.FAST_SNAKE_BLOCK, new SnakeBlock(AbstractBlock.Settings.copy(Blocks.IRON_BLOCK).mapColor(MapColor.LAPIS_BLUE)));
+    public static final SnakeBlock SLOW_SNAKE_BLOCK = of(MubbleBlockKeys.SLOW_SNAKE_BLOCK, new SnakeBlock(AbstractBlock.Settings.copy(Blocks.IRON_BLOCK).mapColor(MapColor.RED)));
+    public static final BeepBlock RED_BEEP_BLOCK = of(MubbleBlockKeys.RED_BEEP_BLOCK, new BeepBlock(BeepBlock.settings(MapColor.RED), false));
+    public static final BeepBlock BLUE_BEEP_BLOCK = of(MubbleBlockKeys.BLUE_BEEP_BLOCK, new BeepBlock(BeepBlock.settings(MapColor.BLUE), true));
 
-    private static <O extends Block> O of(RegistryKey<Block> key, O block) {
+    // YOSHI'S ISLAND
+    public static final DecoratedBumpableBlock BLUE_EGG_BLOCK = eggBlock(MubbleBlockKeys.BLUE_EGG_BLOCK, MapColor.BLUE);
+    public static final DecoratedBumpableBlock CYAN_EGG_BLOCK = eggBlock(MubbleBlockKeys.CYAN_EGG_BLOCK, MapColor.CYAN);
+    public static final DecoratedBumpableBlock GREEN_EGG_BLOCK = eggBlock(MubbleBlockKeys.GREEN_EGG_BLOCK, MapColor.GREEN);
+    public static final DecoratedBumpableBlock YELLOW_EGG_BLOCK = eggBlock(MubbleBlockKeys.YELLOW_EGG_BLOCK, MapColor.YELLOW);
+    public static final DecoratedBumpableBlock ORANGE_EGG_BLOCK = eggBlock(MubbleBlockKeys.ORANGE_EGG_BLOCK, MapColor.ORANGE);
+    public static final DecoratedBumpableBlock RED_EGG_BLOCK = eggBlock(MubbleBlockKeys.RED_EGG_BLOCK, MapColor.RED);
+    public static final DecoratedBumpableBlock PINK_EGG_BLOCK = eggBlock(MubbleBlockKeys.PINK_EGG_BLOCK, MapColor.PINK);
+    public static final DecoratedBumpableBlock BLACK_EGG_BLOCK = eggBlock(MubbleBlockKeys.BLACK_EGG_BLOCK, MapColor.BLACK);
+    public static final DecoratedBumpableBlock WHITE_EGG_BLOCK = eggBlock(MubbleBlockKeys.WHITE_EGG_BLOCK, MapColor.WHITE);
+
+    private static <O extends Block> O noItem(RegistryKey<Block> key, O block) {
         return Registry.register(Registries.BLOCK, key, block);
     }
 
-    private static <O extends Block> O ofWithItem(RegistryKey<Block> key, O block, Item.Settings settings) {
-        of(key, block);
+    private static <O extends Block> O of(RegistryKey<Block> key, O block, Item.Settings settings) {
+        noItem(key, block);
         Registry.register(Registries.ITEM, key.getValue(), new BlockItem(block, settings));
         return block;
     }
 
-    private static <O extends Block> O ofWithItem(RegistryKey<Block> key, O block) {
-        return ofWithItem(key, block, new Item.Settings());
+    private static <O extends Block> O of(RegistryKey<Block> key, O block) {
+        return of(key, block, new Item.Settings());
+    }
+
+    private static DecoratedBumpableBlock exclamationBlock(RegistryKey<Block> key, MapColor mapColor) {
+        return of(key, new DecoratedBumpableBlock(null, AbstractBlock.Settings.copy(Blocks.IRON_BLOCK).mapColor(mapColor)), new Item.Settings().component(DataComponentTypes.CONTAINER, ContainerComponent.DEFAULT));
     }
 
+    private static NoteBlock noteBlock(RegistryKey<Block> key, MapColor mapColor) {
+        return of(key, new NoteBlock(MubbleSounds.NOTE_BLOCK_JUMP_LOW, MubbleSounds.NOTE_BLOCK_JUMP_HIGH, AbstractBlock.Settings.copy(Blocks.QUARTZ_BLOCK).mapColor(mapColor)), new Item.Settings().component(DataComponentTypes.CONTAINER, ContainerComponent.DEFAULT));
+    }
+
+    private static NoteBlock marimbaBlock(RegistryKey<Block> key, MapColor mapColor) {
+        //TODO: temporary behavior. Change this to the actual Mario Wonder behaviour
+        return noteBlock(key, mapColor);
+    }
+
+    private static DecoratedBumpableBlock eggBlock(RegistryKey<Block> key, MapColor mapColor) {
+        return of(key, new DecoratedBumpableBlock(null, AbstractBlock.Settings.copy(Blocks.IRON_BLOCK).mapColor(mapColor)), new Item.Settings().component(DataComponentTypes.CONTAINER, ContainerComponent.DEFAULT));
+    }
 }

src/main/java/fr/hugman/mubble/item/MubbleItemGroupKeys.java

@@ -1,13 +1,13 @@
 package fr.hugman.mubble.item;
 
 import fr.hugman.mubble.Mubble;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemGroup;
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.registry.RegistryKeys;
 
 public class MubbleItemGroupKeys {
     public static final RegistryKey<ItemGroup> SUPER_MARIO = of("super_mario");
+    public static final RegistryKey<ItemGroup> YOSHI_ISLAND = of("yoshi_island");
 
     private static RegistryKey<ItemGroup> of(String path) {
         return RegistryKey.of(RegistryKeys.ITEM_GROUP, Mubble.id(path));

src/main/java/fr/hugman/mubble/item/MubbleItemGroups.java

@@ -15,6 +15,10 @@ public class MubbleItemGroups {
             .displayName(Text.translatable("item_group.mubble.super_mario"))
             .icon(() -> new ItemStack(MubbleBlocks.QUESTION_BLOCK))
             .build());
+    public static final ItemGroup YOSHI_ISLAND = of(MubbleItemGroupKeys.YOSHI_ISLAND, FabricItemGroup.builder()
+            .displayName(Text.translatable("item_group.mubble.yoshi_island"))
+            .icon(() -> new ItemStack(MubbleBlocks.GREEN_EGG_BLOCK))
+            .build());
 
     private static ItemGroup of(RegistryKey<ItemGroup> key, ItemGroup itemGroup) {
         return Registry.register(Registries.ITEM_GROUP, key, itemGroup);
@@ -26,9 +30,17 @@ public static void appendItemGroups() {
             itemGroup.add(MubbleBlocks.QUESTION_BLOCK);
             itemGroup.add(MubbleBlocks.EMPTY_BLOCK);
             itemGroup.add(MubbleBlocks.BRICK_BLOCK);
+            itemGroup.add(MubbleBlocks.CRYSTAL_BLOCK);
             itemGroup.add(MubbleBlocks.GOLD_BLOCK);
+            itemGroup.add(MubbleBlocks.BLUE_EXCLAMATION_BLOCK);
+            itemGroup.add(MubbleBlocks.GREEN_EXCLAMATION_BLOCK);
+            itemGroup.add(MubbleBlocks.YELLOW_EXCLAMATION_BLOCK);
+            itemGroup.add(MubbleBlocks.RED_EXCLAMATION_BLOCK);
             itemGroup.add(MubbleBlocks.NOTE_BLOCK);
-            itemGroup.add(MubbleBlocks.EXCLAMATION_BLOCK);
+            itemGroup.add(MubbleBlocks.BLUE_MARIMBA_BLOCK);
+            itemGroup.add(MubbleBlocks.GREEN_MARIMBA_BLOCK);
+            itemGroup.add(MubbleBlocks.YELLOW_MARIMBA_BLOCK);
+            itemGroup.add(MubbleBlocks.RED_MARIMBA_BLOCK);
             itemGroup.add(MubbleBlocks.SNAKE_BLOCK);
             itemGroup.add(MubbleBlocks.FAST_SNAKE_BLOCK);
             itemGroup.add(MubbleBlocks.SLOW_SNAKE_BLOCK);
@@ -37,5 +49,17 @@ public static void appendItemGroups() {
             itemGroup.add(MubbleItems.CAPE_FEATHER);
             itemGroup.add(MubbleItems.SUPER_CAPE_FEATHER);
         });
+
+        ItemGroupEvents.modifyEntriesEvent(MubbleItemGroupKeys.YOSHI_ISLAND).register(itemGroup -> {
+            itemGroup.add(MubbleBlocks.BLUE_EGG_BLOCK);
+            itemGroup.add(MubbleBlocks.CYAN_EGG_BLOCK);
+            itemGroup.add(MubbleBlocks.GREEN_EGG_BLOCK);
+            itemGroup.add(MubbleBlocks.YELLOW_EGG_BLOCK);
+            itemGroup.add(MubbleBlocks.ORANGE_EGG_BLOCK);
+            itemGroup.add(MubbleBlocks.RED_EGG_BLOCK);
+            itemGroup.add(MubbleBlocks.PINK_EGG_BLOCK);
+            itemGroup.add(MubbleBlocks.BLACK_EGG_BLOCK);
+            itemGroup.add(MubbleBlocks.WHITE_EGG_BLOCK);
+        });
     }
 }

src/main/resources/assets/mubble/blockstates/black_egg_block.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "mubble:block/egg_block/black"
+    }
+  }
+}

src/main/resources/assets/mubble/blockstates/blue_egg_block.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "mubble:block/egg_block/blue"
+    }
+  }
+}

src/main/resources/assets/mubble/blockstates/blue_marimba_block.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "mubble:block/marimba_block/blue"
+    }
+  }
+}

src/main/resources/assets/mubble/blockstates/crystal_block.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "mubble:block/crystal_block"
+    }
+  }
+}

src/main/resources/assets/mubble/blockstates/cyan_egg_block.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "mubble:block/egg_block/cyan"
+    }
+  }
+}

src/main/resources/assets/mubble/blockstates/green_egg_block.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "mubble:block/egg_block/green"
+    }
+  }
+}

src/main/resources/assets/mubble/blockstates/green_exclamation_block.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "mubble:block/exclamation_block/green"
+    }
+  }
+}

src/main/resources/assets/mubble/blockstates/green_marimba_block.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "mubble:block/marimba_block/green"
+    }
+  }
+}

src/main/resources/assets/mubble/blockstates/orange_egg_block.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "mubble:block/egg_block/orange"
+    }
+  }
+}

src/main/resources/assets/mubble/blockstates/pink_egg_block.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "mubble:block/egg_block/pink"
+    }
+  }
+}

src/main/resources/assets/mubble/blockstates/red_egg_block.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "mubble:block/egg_block/red"
+    }
+  }
+}

src/main/resources/assets/mubble/blockstates/red_exclamation_block.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "mubble:block/exclamation_block/red"
+    }
+  }
+}

src/main/resources/assets/mubble/blockstates/red_marimba_block.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "mubble:block/marimba_block/red"
+    }
+  }
+}

src/main/resources/assets/mubble/blockstates/white_egg_block.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "mubble:block/egg_block/white"
+    }
+  }
+}

src/main/resources/assets/mubble/blockstates/yellow_egg_block.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "mubble:block/egg_block/yellow"
+    }
+  }
+}

src/main/resources/assets/mubble/blockstates/yellow_exclamation_block.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "mubble:block/exclamation_block/yellow"
+    }
+  }
+}

src/main/resources/assets/mubble/blockstates/yellow_marimba_block.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "mubble:block/marimba_block/yellow"
+    }
+  }
+}