Skip to content

Commit

Permalink
feat: final bits of content
Browse files Browse the repository at this point in the history
  • Loading branch information
marcus8448 committed Sep 27, 2023
1 parent 3d85464 commit cbe5c42
Show file tree
Hide file tree
Showing 15 changed files with 271 additions and 144 deletions.
16 changes: 15 additions & 1 deletion assets/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,21 @@ $navbar-breakpoint: 480px;
$footer-padding: 2rem 1.5rem 4rem;
//$info: darken(hsl(207, 61%, 53%), 10%);

@import 'bulma';
@import 'bulma/sass/base/_all';
@import "bulma/sass/utilities/_all";

@import 'bulma/sass/elements/box';
@import 'bulma/sass/elements/container';
@import 'bulma/sass/elements/content';
@import 'bulma/sass/elements/icon';
@import 'bulma/sass/elements/image';
@import 'bulma/sass/elements/title';
@import 'bulma/sass/components/media';
@import 'bulma/sass/components/navbar';
@import 'bulma/sass/grid/columns';
@import 'bulma/sass/helpers/_all';
@import 'bulma/sass/layout/footer';
@import 'bulma/sass/layout/hero';

@media (max-width: $tablet) {
.only-mobile {
Expand Down
4 changes: 1 addition & 3 deletions content/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,4 @@ I've been programming for many years now,
mainly in Java where I have written multiple JavaFX applications and modifications for Minecraft.

I have also written command line applications and a web service backend using Rust,
and have worked with embedded C and C++.


and have worked with embedded C++.
4 changes: 3 additions & 1 deletion content/projects/chat.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "Chat"
date: 2023-06-12T00:00:00-00:00
Icon: /image/chat.png
icon: /image/chat.png
Description: |
An encrypted, ephemeral instant messaging app.
repository: https://github.com/marcus8448/Chat
Expand All @@ -11,6 +11,8 @@ languages:
- gradle
---

# About

This was a fun project that I made in approximately 2 weeks to gain more experience using JavaFX.
This time I avoided FXML and defined the GUI in pure Java.
It uses a multi-project Gradle build to enable code sharing between the client and server applications,
Expand Down
25 changes: 22 additions & 3 deletions content/projects/galacticraft.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "Galacticraft"
date: 2019-03-18T11:12:29-07:00
Icon: /image/galacticraft.png
icon: /image/galacticraft.png
Description: |
A Minecraft mod centered around space exploration using the [FabricMC](https://fabricmc.net/) modding framework.
HeroImage: /image/hero/galacticraft.png
Expand All @@ -13,9 +13,28 @@ curseforge: galacticraft-legacy
languages:
- java
- gradle
draft: true
---

# About

I started to contribute to Galacticraft (4) through issue/bug reports in 2017 and pull requests in 2018.
In 2019 I was invited to work on Galacticraft 5 (called Galacticraft: Rewoven at the time) and have worked on it since then.

As a member of the international team creating Galacticraft 5, I have:

* Implemented a graph based wire network (power distribution) system
* Created an extensible framework for making machines (see [MachineLib](/projects/MachineLib))
* Ported numerous pieces of content
* Noise and world generation code
* Blocks, items, tools
* Entities
* Made rockets, planets and galaxies extensible and data driven
* Kept the project up to date with upstream api changes

# Features

*
* Explore the solar system in your own spaceship!
* Support for custom rocket parts and planets via datapacks
* Manage machines that use electricity
* Manage oxygen systems to sustain life in space
* Custom ores, tools, structures, items and blocks to aid your journey to the stars
4 changes: 3 additions & 1 deletion content/projects/gamemodeoverhaul.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "GamemodeOverhaul"
date: 2019-02-16T00:00:00-00:00
Icon: /image/gamemodeoverhaul.png
icon: /image/gamemodeoverhaul.png
Description: |
A mod for Minecraft that restores command options removed in the 1.13 update.
Also adds some shorthand commands for convenience.
Expand All @@ -14,6 +14,8 @@ languages:
- gradle
---

# About

This was my first real mod for Minecraft, made in February 2019.
Created in about two weeks, the original goal of this mod was just restore the removed integer `/gamemode` arguments,
but its scope steadily expanded to other commands and aliases.
Expand Down
4 changes: 3 additions & 1 deletion content/projects/machinelib.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "MachineLib"
date: 2022-03-05T09:46:52-08:00
Icon: /image/machinelib.png
icon: /image/machinelib.png
Description: |
A library for Minecraft mods that simplifies the implementation of complex blocks that process resources.
repository: https://github.com/TeamGalacticraft/MachineLib
Expand All @@ -13,6 +13,8 @@ languages:

This library/mod aims to reduce the amount of boilerplate code required to implement blocks with inventories and menus.

# About

Before MachineLib existed, Galacticraft used [UniversalComponents](https://github.com/CottonMC/UniversalComponents)
to handle inventories, then [LibBlockAttributes](https://github.com/AlexIIL/LibBlockAttributes).
When we were stuck waiting for these libraries to update,
Expand Down
14 changes: 6 additions & 8 deletions content/projects/robotics/v5_cli.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "v5_cli"
date: 2022-12-12T22:17:00-08:00
Icon: /image/v5_cli.png
icon: /image/v5_cli.png
heroType: is-light
Description: |
A re-implementation of [pros-cli](https://github.com/purduesigbots/pros-cli) in Rust, adding true wireless (bluetooth) upload support.
Expand All @@ -10,11 +10,12 @@ languages:
- rust
---

# About

After getting frustrated with [pros-cli](https://github.com/purduesigbots/pros-cli)
freezing my terminal every time an error occurred, I decided to create my own implementation.
I chose two (re)write it in Rust mainly to gain experience with the language,
but also because I knew it had good tooling,
and I was already familiar with one of its CLI frameworks, [clap](https://clap.rs/).
freezing my terminal (to submit a bug report) every time an error occurred, I decided to create my own implementation.
I chose to (re)write it in Rust mainly to gain experience with the language,
but also because I was already familiar with one of its CLI frameworks, [clap](https://clap.rs/).

Once I had made an app with about the same features as the original,
I left the project alone for a while...
Expand All @@ -36,6 +37,3 @@ and account for packet loss and/or corruption in-transit.
* Installed programs, metadata
* Update robot name, team number
* Connect to running program's standard input/output for debugging

# Links
[GitHub](https://github.com/marcus8448/v5_cli)
28 changes: 25 additions & 3 deletions content/projects/robotics/vex-v5.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,38 @@
---
title: "VEX V5"
date: 2021-11-16T18:07:43-07:00
Icon: /image/vex-v5.png
icon: /image/vex-v5.png
Description: |
I have participated in the [Vex Robotics Competition](https://www.vexrobotics.com/v5/competition/)
since the 2021-2022 season (VRC Tipping Point).
repository: https://github.com/marcus8448/VexV5
heroType: is-light
heroType: is-warning
languages:
- c
- cplusplus
- cmake
draft: true
---

# About

In 2021 I started competing in the VEX robotics competition.
This was my first real application using C++ (ignoring Arduino).
On the tooling side, I learned about makefiles and managing dependencies in the C/C++ ecosystem.

To improve IDE integration and remove platform-specific build code,
I rewrote the program's makefile as a CMake project in my second year of robotics.
Compared to Makefiles, I found CMake to be quite fun to use.
It handled cross-compilation surprisingly well and made building with different compilers significantly easier.

Currently, I am focused on adopting modern C++ practices in my code and improving my debugging and testing tools.

# Features

* Use of LVGL to draw information on the screen
* Runtime PID tuning
* Real-time graphing of sensor information
* Select autonomous run via the screen
* Uses a CMake project instead of Makefiles (compared to a typical [PROS](https://pros.cs.purdue.edu/) project)
* Improved IDE support (can generate a Visual Studio project)
* Run `clang-tidy` or `clang-format` over the project's sources
* Develop on windows without a full cygwin environment
4 changes: 3 additions & 1 deletion content/projects/website.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "Website"
date: 2020-05-24T16:25:24-07:00
Icon: /favicon/favicon-192x192.png
icon: /favicon/favicon-192x192.png
Description: |
My portfolio/website. Built with Hugo and Bulma and hosted on GitHub Pages.
repository: https://github.com/marcus8448/marcus8448.github.io
Expand All @@ -15,6 +15,8 @@ languages:
- hugo
---

# About

My original website (2020) was generated using a single handwritten template with Jekyll.
It had a basic navbar and not much else.

Expand Down
4 changes: 2 additions & 2 deletions hugo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ title = 'marcus8448'
target = 'assets'

[[module.mounts]]
source = 'node_modules/bulma'
source = 'node_modules'
target = 'assets'
excludeFiles = '**.{md,json,css}'
excludeFiles = '**.{md,json,css}'
Loading

0 comments on commit cbe5c42

Please sign in to comment.