Skip to content

Commit

Permalink
✏️ Format & Reduce the size of textures
Browse files Browse the repository at this point in the history
  • Loading branch information
@ZiYueCommentary
ZiYueCommentary committed Dec 17, 2023
1 parent dad6403 commit 489f489
Show file tree
Hide file tree
Showing 12 changed files with 27 additions and 23 deletions.
24 changes: 10 additions & 14 deletions common/src/main/java/ziyue/tjmetro/TianjinMetro.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,13 @@ public static void init(
registerBlockItem.accept("metal_detection_door", BlockList.METAL_DETECTION_DOOR, BUILDING);
registerBlockItem.accept("roadblock", BlockList.ROADBLOCK, BUILDING);
registerBlockItem.accept("roadblock_sign", BlockList.ROADBLOCK_SIGN, BUILDING);
registerEnchantedBlockItem.accept("custom_color_concrete", BlockList.CUSTOM_COLOR_CONCRETE, BUILDING);
registerEnchantedBlockItem.accept("custom_color_concrete_stairs", BlockList.CUSTOM_COLOR_CONCRETE_STAIRS, BUILDING);
registerEnchantedBlockItem.accept("custom_color_concrete_slab", BlockList.CUSTOM_COLOR_CONCRETE_SLAB, BUILDING);
/* SIGNS */
registerBlockItem.accept("station_name_sign_2", BlockList.STATION_NAME_SIGN_2, SIGNS);
registerBlockItem.accept("station_name_wall_legacy", BlockList.STATION_NAME_WALL_LEGACY, SIGNS);
registerEnchantedBlockItem.accept("station_name_sign_1", BlockList.STATION_NAME_SIGN_1, SIGNS);
/* DECORATION */
registerBlockItem.accept("logo", BlockList.LOGO, DECORATION);
registerBlockItem.accept("apg_corner", BlockList.APG_CORNER, DECORATION);
Expand All @@ -64,7 +68,13 @@ public static void init(
registerBlockItem.accept("time_display", BlockList.TIME_DISPLAY, DECORATION);
registerBlockItem.accept("emergency_exit_sign", BlockList.EMERGENCY_EXIT_SIGN, DECORATION);
registerBlockItem.accept("service_corridor_sign", BlockList.SERVICE_CORRIDOR_SIGN, DECORATION);
// registerEnchantedBlockItem.accept("decoration_light", BlockList.DECORATION_LIGHT, DECORATION);
/* CEILINGS */
registerBlockItem.accept("ceiling_not_lit", BlockList.CEILING_NOT_LIT, CEILINGS);
registerEnchantedBlockItem.accept("ceiling", BlockList.STATION_COLOR_CEILING, CEILINGS);
registerEnchantedBlockItem.accept("ceiling_light", BlockList.STATION_COLOR_CEILING_LIGHT, CEILINGS);
registerEnchantedBlockItem.accept("ceiling_no_light", BlockList.STATION_COLOR_CEILING_NO_LIGHT, CEILINGS);
registerEnchantedBlockItem.accept("station_color_ceiling_not_lit", BlockList.STATION_COLOR_CEILING_NOT_LIT, CEILINGS);
/* RAILWAYS */
registerBlockItem.accept("railway_sign_wall_4", BlockList.RAILWAY_SIGN_WALL_4, RAILWAYS);
registerBlockItem.accept("railway_sign_wall_6", BlockList.RAILWAY_SIGN_WALL_6, RAILWAYS);
Expand Down Expand Up @@ -93,20 +103,6 @@ public static void init(
registerBlockItem.accept("railway_sign_tianjin_7_even", BlockList.RAILWAY_SIGN_TIANJIN_7_EVEN, RAILWAYS);
registerBlockItem.accept("railway_sign_tianjin_pole", BlockList.RAILWAY_SIGN_TIANJIN_POLE, RAILWAYS);

/* BUILDING */
registerEnchantedBlockItem.accept("custom_color_concrete", BlockList.CUSTOM_COLOR_CONCRETE, BUILDING);
registerEnchantedBlockItem.accept("custom_color_concrete_stairs", BlockList.CUSTOM_COLOR_CONCRETE_STAIRS, BUILDING);
registerEnchantedBlockItem.accept("custom_color_concrete_slab", BlockList.CUSTOM_COLOR_CONCRETE_SLAB, BUILDING);
/* SIGNS */
registerEnchantedBlockItem.accept("station_name_sign_1", BlockList.STATION_NAME_SIGN_1, SIGNS);
/* DECORATION */
// registerEnchantedBlockItem.accept("decoration_light", BlockList.DECORATION_LIGHT, DECORATION);
/* CEILINGS */
registerEnchantedBlockItem.accept("ceiling", BlockList.STATION_COLOR_CEILING, CEILINGS);
registerEnchantedBlockItem.accept("ceiling_light", BlockList.STATION_COLOR_CEILING_LIGHT, CEILINGS);
registerEnchantedBlockItem.accept("ceiling_no_light", BlockList.STATION_COLOR_CEILING_NO_LIGHT, CEILINGS);
registerEnchantedBlockItem.accept("station_color_ceiling_not_lit", BlockList.STATION_COLOR_CEILING_NOT_LIT, CEILINGS);

registerBlock.accept("railway_sign_wall_middle", BlockList.RAILWAY_SIGN_WALL_MIDDLE);
registerBlock.accept("railway_sign_wall_big_middle", BlockList.RAILWAY_SIGN_WALL_BIG_MIDDLE);
registerBlock.accept("railway_sign_tianjin_middle", BlockList.RAILWAY_SIGN_TIANJIN_MIDDLE);
Expand Down
2 changes: 1 addition & 1 deletion common/src/main/java/ziyue/tjmetro/TianjinMetroClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ public static void init() {
RegistryClient.registerBlockRenderType(RenderType.cutout(), BlockList.LOGO.get());
RegistryClient.registerBlockRenderType(RenderType.cutout(), BlockList.STATION_NAME_SIGN_1.get());
RegistryClient.registerBlockRenderType(RenderType.cutout(), BlockList.STATION_NAME_SIGN_2.get());
RegistryClient.registerBlockRenderType(RenderType.translucent(), BlockList.ROLLING.get());
RegistryClient.registerBlockRenderType(RenderType.cutout(), BlockList.PLATFORM_TJ_1.get());
RegistryClient.registerBlockRenderType(RenderType.cutout(), BlockList.PLATFORM_TJ_1_INDENTED.get());
RegistryClient.registerBlockRenderType(RenderType.cutout(), BlockList.PLATFORM_TJ_2.get());
Expand All @@ -29,6 +28,7 @@ public static void init() {
RegistryClient.registerBlockRenderType(RenderType.cutout(), BlockList.HIGH_SPEED_REPEATER.get());
RegistryClient.registerBlockRenderType(RenderType.cutout(), BlockList.EMERGENCY_EXIT_SIGN.get());
RegistryClient.registerBlockRenderType(RenderType.cutout(), BlockList.SERVICE_CORRIDOR_SIGN.get());
RegistryClient.registerBlockRenderType(RenderType.translucent(), BlockList.ROLLING.get());

RegistryClient.registerBlockColors(BlockList.STATION_COLOR_CEILING.get());
RegistryClient.registerBlockColors(BlockList.STATION_COLOR_CEILING_LIGHT.get());
Expand Down
4 changes: 2 additions & 2 deletions common/src/main/resources/assets/tjmetro/models/block/emergency_exit_sign_both.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"0": "mtr:block/metal",
"1": "tjmetro:sign/emergency_exit",
"2": "tjmetro:sign/arrow_green",
"3": "tjmetro:block/logo",
"4": "block/air",
"3": "tjmetro:block/air",
"4": "tjmetro:block/air",
"particle": "mtr:block/metal"
},
"elements": [
Expand Down
2 changes: 1 addition & 1 deletion common/src/main/resources/assets/tjmetro/models/block/emergency_exit_sign_left.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"0": "mtr:block/metal",
"1": "tjmetro:sign/emergency_exit",
"2": "tjmetro:sign/arrow_green",
"3": "tjmetro:block/logo",
"3": "tjmetro:block/air",
"particle": "mtr:block/metal"
},
"elements": [
Expand Down
4 changes: 2 additions & 2 deletions common/src/main/resources/assets/tjmetro/models/block/emergency_exit_sign_right.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"0": "mtr:block/metal",
"1": "tjmetro:sign/emergency_exit",
"2": "tjmetro:sign/arrow_green",
"3": "tjmetro:block/logo",
"4": "block/air",
"3": "tjmetro:block/air",
"4": "tjmetro:block/air",
"particle": "mtr:block/metal"
},
"elements": [
Expand Down
12 changes: 10 additions & 2 deletions common/src/main/resources/assets/tjmetro/models/block/logo.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,16 @@
},
"elements": [
{
"from": [0, 0, 0.001],
"to": [16, 16, 0.001],
"from": [
0,
0,
0.01
],
"to": [
16,
16,
0.01
],
"faces": {
"north": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "north"},
"east": {"uv": [16, 0, 16, 16], "texture": "#0", "cullface": "east"},
Expand Down
2 changes: 1 addition & 1 deletion common/src/main/resources/assets/tjmetro/models/block/time_display.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"textures": {
"0": "tjmetro:block/black",
"1": "block/gray_concrete",
"2": "block/air",
"2": "tjmetro:block/air",
"particle": "tjmetro:block/black"
},
"elements": [
Expand Down
Binary file modified common/src/main/resources/assets/tjmetro/textures/block/logo.png
View file
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 common/src/main/resources/assets/tjmetro/textures/sign/arrow_green.png
View file
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 common/src/main/resources/assets/tjmetro/textures/sign/emergency_exit.png
View file
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 common/src/main/resources/assets/tjmetro/textures/sign/tianjin_metro_logo.png
View file
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 common/src/main/resources/assets/tjmetro/textures/sign/tianjin_metro_logo_old.png
View file
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 489f489

Please sign in to comment.