Skip to content

Commit

Permalink
Paletted textures (#93)
Browse files Browse the repository at this point in the history
  • Loading branch information
Hugman76 authored Sep 1, 2024
2 parents bb4d954 + 71d2329 commit 4ebc086
Show file tree
Hide file tree
Showing 51 changed files with 86 additions and 17 deletions.
38 changes: 38 additions & 0 deletions src/main/resources/assets/minecraft/atlases/blocks.json
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"
}
}
]
}
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"
}
}
}
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"
}
}

7 changes: 7 additions & 0 deletions src/main/resources/assets/mubble/models/block/egg_block.json
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"
}
}

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"
}
}

This file was deleted.

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"
}
}
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"
}
}
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"
}
}
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"
}
}
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 src/main/resources/assets/mubble/models/block/note_block.json
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"
}
}
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"
}
}
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"
}
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 modified 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.
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.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
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.
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.
Binary file modified src/main/resources/assets/mubble/textures/item/maker_glove.png

0 comments on commit 4ebc086

Please sign in to comment.