-
-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
51 changed files
with
86 additions
and
17 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
{ | ||
"sources": [ | ||
{ | ||
"type": "minecraft:paletted_permutations", | ||
"textures": [ | ||
"mubble:block/brick_block", | ||
"mubble:block/bolted_block/normal", | ||
"mubble:block/bolted_block/question", | ||
"mubble:block/smooth_block/note", | ||
"mubble:block/smooth_block/marimba", | ||
"mubble:block/dotted_block/normal1", | ||
"mubble:block/dotted_block/exclamation1", | ||
"mubble:block/dotted_block/exclamation2", | ||
"mubble:block/smooth_block/straight", | ||
"mubble:block/smooth_block/wavy", | ||
"mubble:block/egg_block" | ||
], | ||
"palette_key": "mubble:color_palettes/mario_blocks", | ||
"permutations": { | ||
"blue": "mubble:color_palettes/mario_blocks/blue", | ||
"green": "mubble:color_palettes/mario_blocks/green", | ||
"yellow": "mubble:color_palettes/mario_blocks/yellow", | ||
"orange": "mubble:color_palettes/mario_blocks/orange", | ||
"red": "mubble:color_palettes/mario_blocks/red", | ||
"purple": "mubble:color_palettes/mario_blocks/purple", | ||
"magenta": "mubble:color_palettes/mario_blocks/magenta", | ||
"brown": "mubble:color_palettes/mario_blocks/brown", | ||
"white": "mubble:color_palettes/mario_blocks/white", | ||
"black": "mubble:color_palettes/mario_blocks/black", | ||
"iron": "mubble:color_palettes/mario_blocks/iron", | ||
"gold": "mubble:color_palettes/mario_blocks/gold", | ||
"diamond": "mubble:color_palettes/mario_blocks/diamond", | ||
"emerald": "mubble:color_palettes/mario_blocks/emerald", | ||
"amethyst": "mubble:color_palettes/mario_blocks/amethyst" | ||
} | ||
} | ||
] | ||
} |
2 changes: 1 addition & 1 deletion
2
src/main/resources/assets/mubble/blockstates/exclamation_block.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
{ | ||
"variants": { | ||
"": { | ||
"model": "mubble:block/exclamation_block" | ||
"model": "mubble:block/exclamation_block/blue" | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
{ | ||
"parent": "minecraft:block/cube_all", | ||
"textures": { | ||
"all": "mubble:block/brick_block" | ||
"all": "mubble:block/brick_block_brown" | ||
} | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
{ | ||
"parent": "minecraft:block/cube_all", | ||
"textures": { | ||
"all": "mubble:block/egg_block_green" | ||
} | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
{ | ||
"parent": "minecraft:block/cube_all", | ||
"textures": { | ||
"all": "mubble:block/empty_block" | ||
"all": "mubble:block/bolted_block/normal_brown" | ||
} | ||
} | ||
|
8 changes: 0 additions & 8 deletions
8
src/main/resources/assets/mubble/models/block/exclamation_block.json
This file was deleted.
Oops, something went wrong.
8 changes: 8 additions & 0 deletions
8
src/main/resources/assets/mubble/models/block/exclamation_block/blue.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
{ | ||
"parent": "mubble:block/cube_column_alternating", | ||
"textures": { | ||
"end": "mubble:block/dotted_block/normal1_blue", | ||
"side1": "mubble:block/dotted_block/exclamation1_blue", | ||
"side2": "mubble:block/dotted_block/exclamation2_blue" | ||
} | ||
} |
8 changes: 8 additions & 0 deletions
8
src/main/resources/assets/mubble/models/block/exclamation_block/green.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
{ | ||
"parent": "mubble:block/cube_column_alternating", | ||
"textures": { | ||
"end": "mubble:block/dotted_block/normal1_green", | ||
"side1": "mubble:block/dotted_block/exclamation1_green", | ||
"side2": "mubble:block/dotted_block/exclamation2_green" | ||
} | ||
} |
8 changes: 8 additions & 0 deletions
8
src/main/resources/assets/mubble/models/block/exclamation_block/red.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
{ | ||
"parent": "mubble:block/cube_column_alternating", | ||
"textures": { | ||
"end": "mubble:block/dotted_block/normal1_red", | ||
"side1": "mubble:block/dotted_block/exclamation1_red", | ||
"side2": "mubble:block/dotted_block/exclamation2_red" | ||
} | ||
} |
8 changes: 8 additions & 0 deletions
8
src/main/resources/assets/mubble/models/block/exclamation_block/yellow.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
{ | ||
"parent": "mubble:block/cube_column_alternating", | ||
"textures": { | ||
"end": "mubble:block/dotted_block/normal1_yellow", | ||
"side1": "mubble:block/dotted_block/exclamation1_yellow", | ||
"side2": "mubble:block/dotted_block/exclamation2_yellow" | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
{ | ||
"parent": "minecraft:block/cube_all", | ||
"textures": { | ||
"all": "mubble:block/gold_block" | ||
"all": "mubble:block/brick_block_gold" | ||
} | ||
} | ||
|
4 changes: 2 additions & 2 deletions
4
src/main/resources/assets/mubble/models/block/note_block.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
{ | ||
"parent": "minecraft:block/cube_column", | ||
"textures": { | ||
"side": "mubble:block/note_block/side", | ||
"end": "mubble:block/note_block/end" | ||
"side": "mubble:block/smooth_block/note_white", | ||
"end": "mubble:block/smooth_block/straight_white" | ||
} | ||
} |
4 changes: 2 additions & 2 deletions
4
src/main/resources/assets/mubble/models/block/question_block.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
{ | ||
"parent": "minecraft:block/cube_column", | ||
"textures": { | ||
"side": "mubble:block/question_block/side", | ||
"end": "mubble:block/question_block/end" | ||
"side": "mubble:block/bolted_block/question_yellow", | ||
"end": "mubble:block/bolted_block/normal_yellow" | ||
} | ||
} |
2 changes: 1 addition & 1 deletion
2
src/main/resources/assets/mubble/models/item/exclamation_block.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
{ | ||
"parent": "mubble:block/exclamation_block" | ||
"parent": "mubble:block/exclamation_block/blue" | ||
} |
Binary file added
BIN
+229 Bytes
src/main/resources/assets/mubble/textures/block/bolted_block/normal.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+269 Bytes
src/main/resources/assets/mubble/textures/block/bolted_block/question.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+0 Bytes
(100%)
src/main/resources/assets/mubble/textures/block/brick_block.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+239 Bytes
src/main/resources/assets/mubble/textures/block/dotted_block/exclamation1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+239 Bytes
src/main/resources/assets/mubble/textures/block/dotted_block/exclamation2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+292 Bytes
src/main/resources/assets/mubble/textures/block/dotted_block/normal1.png
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.
Binary file not shown.
Binary file removed
BIN
-221 Bytes
src/main/resources/assets/mubble/textures/block/exclamation_block/end.png
Binary file not shown.
Binary file removed
BIN
-223 Bytes
src/main/resources/assets/mubble/textures/block/exclamation_block/side1.png
Binary file not shown.
Binary file removed
BIN
-224 Bytes
src/main/resources/assets/mubble/textures/block/exclamation_block/side2.png
Binary file not shown.
Binary file not shown.
Binary file removed
BIN
-184 Bytes
src/main/resources/assets/mubble/textures/block/note_block/end.png
Binary file not shown.
Binary file removed
BIN
-231 Bytes
src/main/resources/assets/mubble/textures/block/note_block/side.png
Binary file not shown.
Binary file removed
BIN
-227 Bytes
src/main/resources/assets/mubble/textures/block/question_block/end.png
Binary file not shown.
Binary file removed
BIN
-262 Bytes
src/main/resources/assets/mubble/textures/block/question_block/side.png
Binary file not shown.
Binary file added
BIN
+242 Bytes
src/main/resources/assets/mubble/textures/block/smooth_block/marimba.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+231 Bytes
src/main/resources/assets/mubble/textures/block/smooth_block/note.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+180 Bytes
src/main/resources/assets/mubble/textures/block/smooth_block/straight.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+205 Bytes
src/main/resources/assets/mubble/textures/block/smooth_block/wavy.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+162 Bytes
src/main/resources/assets/mubble/textures/color_palettes/mario_blocks.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+162 Bytes
src/main/resources/assets/mubble/textures/color_palettes/mario_blocks/amethyst.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+162 Bytes
src/main/resources/assets/mubble/textures/color_palettes/mario_blocks/black.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+162 Bytes
src/main/resources/assets/mubble/textures/color_palettes/mario_blocks/blue.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+162 Bytes
src/main/resources/assets/mubble/textures/color_palettes/mario_blocks/brown.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+162 Bytes
src/main/resources/assets/mubble/textures/color_palettes/mario_blocks/diamond.png
Oops, something went wrong.
Binary file added
BIN
+162 Bytes
src/main/resources/assets/mubble/textures/color_palettes/mario_blocks/emerald.png
Oops, something went wrong.
Binary file added
BIN
+162 Bytes
src/main/resources/assets/mubble/textures/color_palettes/mario_blocks/gold.png
Oops, something went wrong.
Binary file added
BIN
+162 Bytes
src/main/resources/assets/mubble/textures/color_palettes/mario_blocks/green.png
Oops, something went wrong.
Binary file added
BIN
+162 Bytes
src/main/resources/assets/mubble/textures/color_palettes/mario_blocks/iron.png
Oops, something went wrong.
Binary file added
BIN
+162 Bytes
src/main/resources/assets/mubble/textures/color_palettes/mario_blocks/magenta.png
Oops, something went wrong.
Binary file added
BIN
+123 Bytes
src/main/resources/assets/mubble/textures/color_palettes/mario_blocks/orange.png
Oops, something went wrong.
Binary file added
BIN
+162 Bytes
src/main/resources/assets/mubble/textures/color_palettes/mario_blocks/purple.png
Oops, something went wrong.
Binary file added
BIN
+162 Bytes
src/main/resources/assets/mubble/textures/color_palettes/mario_blocks/red.png
Oops, something went wrong.
Binary file added
BIN
+162 Bytes
src/main/resources/assets/mubble/textures/color_palettes/mario_blocks/white.png
Oops, something went wrong.
Binary file added
BIN
+162 Bytes
src/main/resources/assets/mubble/textures/color_palettes/mario_blocks/yellow.png
Oops, something went wrong.
Binary file modified
BIN
+6 Bytes
(100%)
src/main/resources/assets/mubble/textures/item/maker_glove.png
Oops, something went wrong.