Skip to content

Commit

Permalink
Add Blue Exclamation Block and Change the Beep Block textures
Browse files Browse the repository at this point in the history
  • Loading branch information
valbrimi committed Dec 28, 2022
1 parent 45c5d9b commit 889b700
Show file tree
Hide file tree
Showing 12 changed files with 21 additions and 1 deletion.
1 change: 0 additions & 1 deletion src/main/java/fr/hugman/mubble/block/BeepBlock.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import net.minecraft.state.StateManager;
import net.minecraft.state.property.BooleanProperty;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Direction;
import net.minecraft.util.math.random.Random;
import net.minecraft.util.shape.VoxelShape;
import net.minecraft.util.shape.VoxelShapes;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ public class SuperMarioContent {
public static final SnakeBlock SNAKE_BLOCK = new SnakeBlock(DawnBlockSettings.copy(Blocks.IRON_BLOCK).mapColor(MapColor.LIME).item());
public static final BeepBlock RED_BEEP_BLOCK = new BeepBlock(MapColor.RED, false);
public static final BeepBlock BLUE_BEEP_BLOCK = new BeepBlock(MapColor.BLUE, true);
public static final QuestionBlock EXCLAMATION_BLOCK = new QuestionBlock(DawnBlockSettings.copy(Blocks.IRON_BLOCK).mapColor(MapColor.BLUE).item());

public static final BumpedBlock BUMPED_BLOCK = new BumpedBlock(DawnBlockSettings.copy(Blocks.BRICKS).mapColor(MapColor.BROWN).strength(-1, 3600000).dropsNothing().nonOpaque());
public static final BlockEntityType<BumpedBlockEntity> BUMPED_BLOCK_ENTITY_TYPE = FabricBlockEntityTypeBuilder
Expand All @@ -60,6 +61,7 @@ public static void init() {
Registrar.add(Mubble.id("snake_block"), SNAKE_BLOCK);
Registrar.add(Mubble.id("red_beep_block"), RED_BEEP_BLOCK);
Registrar.add(Mubble.id("blue_beep_block"), BLUE_BEEP_BLOCK);
Registrar.add(Mubble.id("exclamation_block"), EXCLAMATION_BLOCK);

Registrar.add(Mubble.id("bumped_block"), BUMPED_BLOCK);
Registry.register(Registries.BLOCK_ENTITY_TYPE, Mubble.id("bumped_block"), BUMPED_BLOCK_ENTITY_TYPE);
Expand Down Expand Up @@ -87,6 +89,7 @@ public static void init() {
entries.add(SuperMarioContent.BLUE_BEEP_BLOCK);
entries.add(SuperMarioContent.CAPE_FEATHER);
entries.add(SuperMarioContent.SUPER_CAPE_FEATHER);
entries.add(SuperMarioContent.EXCLAMATION_BLOCK);
})
.build();
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "mubble:block/exclamation_block"
}
}
}
1 change: 1 addition & 0 deletions src/main/resources/assets/mubble/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"item_group.mubble.super_mario": "Super Mario",

"block.mubble.question_block": "? Block",
"block.mubble.exclamation_block": "! Block",
"block.mubble.empty_block": "Empty Block",
"block.mubble.brick_block": "Brick Block",
"block.mubble.gold_block": "Gold Block",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"parent": "minecraft:block/cube_column",
"textures": {
"side": "mubble:block/exclamation_block/side1",
"end": "mubble:block/exclamation_block/end"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "mubble:block/exclamation_block"
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 889b700

Please sign in to comment.