Skip to content

Commit

Permalink
Fix up all pages and modify font sizes
Browse files Browse the repository at this point in the history
  • Loading branch information
Kale-Ko committed May 7, 2024
1 parent c242723 commit 6b57461
Show file tree
Hide file tree
Showing 18 changed files with 94 additions and 80 deletions.
2 changes: 1 addition & 1 deletion pages/en/a-helpful-feature.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
If you are trying to quickly create and test emotes it can be a pain to have to restart Minecraft every time you want to test it.\
So instead if you place the emote file at `.minecraft/emote.json` and restart your game a special feature will be enabled in the mod.

If you press the O key (Or whatever, its a configurable keybind) it will load the emote.json file and then attempt to play the emote so you don't have to restart each time.\
If you press the O key (Or whatever, its a configurable keybind) it will load the emote.json file and then attempt to play the emote so you don't have to restart the gane each time.\
This will also provide additional feedback in the game log if something goes wrong.
8 changes: 4 additions & 4 deletions pages/en/about.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@

Emotecraft is a mod for Minecraft Java that allows you to play emotes like on Minecraft Bedrock.

<img src="/assets/images/about/waving-emote.webp" alt="Emotecraft being used" width="400" height="400">
<img src="/assets/images/about/waving-emote.webp" alt="Emotecraft in use" width="400" height="400">

It supports Forge and Fabric and is usually pretty quick to update to new versions of the game.\
It supports both Fabric and Forge and is usually pretty quick to update to new versions of the game.\
Downloads can be found [here](%downloads).

<span style="color: yellow;">**Important Note:**</span> The mod or plugin must also be installed on the server to be able to see other peoples emotes.
<span style="color: yellow;">**Important Note:**</span> The mod or plugin must also be installed on the server to be able to see other people's emotes.

Different mod loaders (Forge/Fabric) are also fully compatible with each other and the plugins, however different versions may not be (eg. 2.1.4 might not work with 2.1.1).
Different mod loaders (Fabric/Forge) are also fully compatible with one another and the plugins, however different versions may not be (eg. 2.1.4 might not work with 2.0.1).
10 changes: 5 additions & 5 deletions pages/en/creating-emotes-blender.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,21 @@

## Creating Emotes With Blender

**This requires basic knowledge of how to move and rotate objects as well as use keyframes in blender.** For help with this see [this](https://docs.blender.org/manual/en/latest/scene_layout/object/editing/transform/introduction.html) and [this](https://docs.blender.org/manual/en/latest/animation/keyframes/introduction.html).
**This requires basic knowledge of how to move and rotate objects as well as use keyframes in blender.** For help see [this](https://docs.blender.org/manual/en/latest/scene_layout/object/editing/transform/introduction.html) and [this](https://docs.blender.org/manual/en/latest/animation/keyframes/introduction.html).

To start you are going to need [Blender](https://www.blender.org/download/).
If you need help installing it see [this](https://docs.blender.org/manual/en/latest/getting_started/installing/index.html).

Then you are going to need the Blender model, either with or without bend support. You can get it [here](%downloads#tool-downloads).

Once you have Blender installed open the model. You should be greeted with a readme, make sure to read it.\
Once you have Blender installed, open the model. You should be greeted with a readme, make sure to read it.\
To get started switch to the animation tab. You can move and rotate any of the joints how you want and add keyframes.

When you are done or would like to test your emote switch to the export tab. Here you will see a script with a few variables you can edit. You can change the emoteName, emoteDescription, and author to whatever you want. If you want the emote to loop you can set loop to true and set the return tick to the tick you would like it to loop on/return to.\
When you are done or would like to test your emote switch to the export tab. Here you will see a script with a few variables you can edit. You can change the `emoteName`, `emoteDescription`, and `author` to whatever you want. If you want the emote to loop you can set `loop` to true and set `returnTick` to the tick you would like it to return to.\
When you are done click the play/run button. This will generate an emote.json in the same place as the blend file.

Next see [Installing Custom Emotes](%install-emotes) to install the emote you created.\
If you are testing your emote a lot it is recommended you use [The Helpful Feature](%a-helpful-feature) but if you want you can still install it every time.
If you are testing your emote a-lot it is recommended you use [The Helpful Feature](%a-helpful-feature) but if you want you can still install it every time.

If you want you can add an icon for your emote, just put the image in the emotes folder as `{nameOfEmoteFile}.png`
You can also add music to your emotes. See [here](%creating-music)
You can also add music to your emotes, see [here](%creating-music)
6 changes: 3 additions & 3 deletions pages/en/creating-emotes-blockbench.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Creating Emotes With Blockbench

**This requires basic knowledge of how to move and rotate objects as well as use keyframes in blockbench.** For help with this see [this](https://www.youtube.com/playlist?list=PLjl_U0ndTXFc--5aIGQhcKQd8pOa99iK-).
**This requires basic knowledge of how to move and rotate objects as well as use keyframes in blockbench.** For help see [this](https://www.youtube.com/playlist?list=PLjl_U0ndTXFc--5aIGQhcKQd8pOa99iK-).

To start you are going to need [Blockbench](https://www.blockbench.net/downloads).

Expand All @@ -20,7 +20,7 @@ You can now move and rotate any of the joints how you want and add keyframes.
When you are done, click the save button (Or `Ctrl + S`) and save it as emote.json (Or anything else as long as it ends in .json)

Next see [Installing Custom Emotes](%install-emotes) to install the emote you created.\
If you are testing your emote a lot it is recommended you use [The Helpful Feature](%a-helpful-feature) but if you want you can still install it every time.
If you are testing your emote a-lot it is recommended you use [The Helpful Feature](%a-helpful-feature) but if you want you can still install it every time.

If you want you can add an icon for your emote, just put the image in the emotes folder as `{nameOfEmoteFile}.png`
You can also add music to your emotes. See [here](%creating-music)
You can also add music to your emotes, see [here](%creating-music)
2 changes: 0 additions & 2 deletions pages/en/creating-music.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ To start you will need [Open Note Block Studio](https://opennbs.org/). Click dow

Once that is done run the program, you should be greeted with a blank song. Here you can create the song (If you need help see [this](https://www.youtube.com/watch?v=NFXzons84U8))

You can now create your song.

<span style="color: yellow;">**Important Note:**</span> You may only use the default Minecraft sounds\
<span style="color: yellow;">**Important Note:**</span> The file may not be any bigger than 32kb or it will crash on servers

Expand Down
4 changes: 1 addition & 3 deletions pages/en/download-emotes.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@

## Downloading Custom Emotes

Currently you can download emotes from from the [Emotes Open Collection](https://emotes.kosmx.dev/), [#emote-list](https://discord.com/invite/CNnyrqvD2H) in the [Discord server](https://discord.com/invite/38e348fxVS), or from the old [Emote archive](https://github.com/KosmX/Emotecraft-emotes).
Currently you can download emotes from from the [Emotes Open Collection](https://emotes.kosmx.dev/), or from the old [Emote archive](https://github.com/KosmX/Emotecraft-emotes).

In the Emotes Open Collection find the emote your want using the search feature and then click the download button.

In the Discord server find the emote you want from [#emote-list](https://discord.com/invite/CNnyrqvD2H) and then click the title of the embed (For older emotes click the download button in the bottom right).

In the emote archive find the emote you want (eg. <https://github.com/KosmX/Emotecraft-emotes/blob/master/emotes/Twerk.json>). Then right click the "Raw" button and hit Save as.

Next see [Installing Custom Emotes](%install-emotes) to install them from there.
14 changes: 7 additions & 7 deletions pages/en/downloads.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@

### Mod Downloads

For Forge and Fabric downloads it is recommended to use [Modrinth](https://modrinth.com/mod/emotecraft/versions),\
but you can also use Curseforge ([Forge](https://www.curseforge.com/minecraft/mc-mods/emotecraft-forge/files), [Fabric](https://www.curseforge.com/minecraft/mc-mods/emotecraft/files)).
For the Fabric and Forge mod you can find it on [Modrinth](https://modrinth.com/mod/emotecraft/versions),\
or CurseForge ([Forge](https://www.curseforge.com/minecraft/mc-mods/emotecraft-forge/files), [Fabric](https://www.curseforge.com/minecraft/mc-mods/emotecraft/files)).

For the Bukkit/Spigot plugin you can get it from [Modrinth](https://modrinth.com/plugin/emotecraft-bukkit/versions) or [Bukkit](https://dev.bukkit.org/projects/emotecraft-bukkit/files).\
If you would like to use commands on Bukkit/Spigot you will also need [this](https://dev.bukkit.org/projects/emotecraft-command-extension/files).
For the Spigot/Bukkit plugin you can find it on [Modrinth](https://modrinth.com/plugin/emotecraft-bukkit/versions) or [CurseForge](https://www.curseforge.com/minecraft/bukkit-plugins/emotecraft-bukkit/files).\
If you would like to use commands on Spigot/Bukkit you will also need [this](https://www.curseforge.com/minecraft/bukkit-plugins/emotecraft-command-extension/files) plugin.

The most up to date versions for all loaders + Bungee and Velocity can be found on [Github](https://github.com/KosmX/emotes/releases).
The most up to date versions for all loaders + Bungee and Velocity can be found on [GitHub](https://github.com/KosmX/emotes/releases).

Next see [Installing on Forge/Fabric](%install-client) to install the mod on your client, or [Installing on Bukkit/Spigot/Bungee](%install-server) for a server.
Next see [Installing on Fabric/Forge](%install-client), or [Installing on Spigot/Bukkit](%install-server).

### Tool Downloads

<a class="download" href="https://raw.githubusercontent.com/KosmX/emotes/dev/blender/emote_creator_bend.blend" download="emotecraft-model-bends.blend">Blender model with bends</a> (Recommended)\
<a class="download" href="https://raw.githubusercontent.com/KosmX/emotes/dev/blender/emote_creator_bend.blend" download="emotecraft-model-bends.blend">Blender model w/ bends</a> (Recommended)\
<a class="download" href="https://raw.githubusercontent.com/KosmX/emotes/dev/blender/emote_creator.blend" download="emotecraft-model.blend">Blender model</a>

<a class="download" href="https://raw.githubusercontent.com/KosmX/emotes/dev/blender/model.bbmodel" download="emotecraft-model.bbmodel">Blockbench model</a>
15 changes: 8 additions & 7 deletions pages/en/faq.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ See [Playing Emotes](%playing-emotes).

### How can I play an emote while moving?

In the mod options, set Stop emote at this speed threshold to the max.
In the mod config, set "Stop emote at this speed threshold" to the max.\
See also [Mod Config](%mod-config)

### Where can I find more custom emotes?

Expand Down Expand Up @@ -43,18 +44,18 @@ If you want to try it and you need help, contact `KosmX#7620` on Discord.

Make sure Load emotes on logical server (In the hidden config) is off.\
Make sure the emotes are valid jsons (If you open them up in notepad the first line should be a {).\
If it is a BlockBench emote make sure you are using version 2.1 or newer.
If it is a Blockbench emote make sure you are using version 2.1 or newer.

### What is if I got this error

#### Update Forge to the latest version
#### Install/Update [Fabric API](https://modrinth.com/mod/fabric-api/versions)

<img src="/assets/images/faq/forge-error.webp" alt="Mod File emotecraft-for-MC1.16.5-2.0.1-forge.jar needs language provider javafml:36.1 or above to load" width="400" height="40">
<img src="/assets/images/faq/fabric-error.webp" alt="Could not find required mod: emotecraft requires {fabric @ [0.16.2]}" width="400" height="35">

#### Install/Update [Fabric API](https://www.curseforge.com/minecraft/mc-mods/fabric-api/files)
#### Update Forge to the latest version

<img src="/assets/images/faq/fabric-error.webp" alt="Could not find required mod: emotecraft requires {fabric @ [0.16.2]}" width="400" height="35">
<img src="/assets/images/faq/forge-error.webp" alt="Mod File emotecraft-for-MC1.16.5-2.0.1-forge.jar needs language provider javafml:36.1 or above to load" width="400" height="40">

### Where can I get more help?

You can get more help in the [Discord server](https://discord.com/invite/PSW2t4Ujm6).
You can get more help in the [Discord server](https://discord.com/invite/38e348fxVS).
8 changes: 4 additions & 4 deletions pages/en/home.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

## Home

Welcome to the home of the official Emotecraft wiki!
Welcome to the home of the official Emotecraft Wiki!

Check out the sidebar to see how to install and use the mod.
Check out the sidebar for a guide on how to install and use the mod.

Before you do anything it is recommended you read the [FAQ](%faq). If you are still confused, you can get help in the [Discord server](https://discord.com/invite/38e348fxVS).
Before you do anything it is recommended to read the [FAQ](%faq). If you still have questions, you can get help in the [Discord server](https://discord.com/invite/38e348fxVS).

If you are looking for the Emotes Open Collection go [here](https://emotes.kosmx.dev/).
If you are looking for the Emotes Open Collection it is [here](https://emotes.kosmx.dev/).
10 changes: 5 additions & 5 deletions pages/en/install-client.md
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
# Emotecraft Wiki

## Installing on Forge/Fabric
## Installing on Fabric/Forge

To install the mod you first need to download the jar.\
You can find it [here](%downloads). **(Make sure you download the correct version)**

If you are installing it on fabric you will also need Fabric Api ([Modrinth](https://modrinth.com/mod/fabric-api/versions), [Curseforge](https://www.curseforge.com/minecraft/mc-mods/fabric-api/files)),\
and it is recommended you use Mod Menu ([Modrinth](https://modrinth.com/mod/modmenu/versions), [Curseforge](https://www.curseforge.com/minecraft/mc-mods/modmenu/files)).
If you are installing it on Fabric you will also need Fabric API ([Modrinth](https://modrinth.com/mod/fabric-api/versions), [CurseForge](https://www.curseforge.com/minecraft/mc-mods/fabric-api/files)),\
and it is recommended you use Mod Menu ([Modrinth](https://modrinth.com/mod/modmenu/versions), [CurseForge](https://www.curseforge.com/minecraft/mc-mods/modmenu/files)).

If you are installing it on Forge you will need to download playerAnimator ([Modrinth](https://modrinth.com/mod/playeranimator/versions), [Curseforge](https://www.curseforge.com/minecraft/mc-mods/playeranimator/files)) and bendy-lib ([Modrinth](https://modrinth.com/mod/bendy-lib/versions), [Curseforge](https://www.curseforge.com/minecraft/mc-mods/bendy-lib/files)) as they are not embedded in the mod.
If you are installing it on Forge you will need to download playerAnimator ([Modrinth](https://modrinth.com/mod/playeranimator/versions), [CurseForge](https://www.curseforge.com/minecraft/mc-mods/playeranimator/files)) and bendy-lib ([Modrinth](https://modrinth.com/mod/bendy-lib/versions), [CurseForge](https://www.curseforge.com/minecraft/mc-mods/bendy-lib/files)) as they are not embedded in the mod.

Once you have the mod(s) you just need to put them in your mods folder located at

Windows: `C:/Users/{your user}/AppData/Roaming/.minecraft/mods`\
Mac: `/Users/{your user}/Library/Application Support/minecraft/mods`\
Linux: `/home/{your user}/.minecraft/mods`

Then you just need to start/restart your Minecraft client.
Then start/restart your Minecraft client.
4 changes: 2 additions & 2 deletions pages/en/install-emotes.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

## Installing Custom Emotes

To install an emote you simple need to drag the .json or .emotecraft file into the emotes folder which is located at
To install an emote you simple need to drag the `.emotecraft` or `.json` file from your downloads folder into the emotes folder which is located at

Windows: `C:/Users/{your user}/AppData/Roaming/.minecraft/emotes`\
Mac: `/Users/{your user}/Library/Application Support/minecraft/emotes`\
Linux: `/home/{your user}/.minecraft/emotes`

Then restart your game and the emotes will show up.
Restart your game and the emotes will show up.
6 changes: 3 additions & 3 deletions pages/en/install-server.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# Emotecraft Wiki

## Installing on Bukkit/Spigot/Bungee
## Installing on Spigot/Bukkit

To install the plugin you first need to download the jar.\
You can find it [here](%downloads). **(Make sure you download the correct version)**

If you are installing it on Bukkit/Spigot and would like to be able to use commands you will also need [Emotecraft command extensions](https://dev.bukkit.org/projects/emotecraft-command-extension/files) which requires [ProtocolLib](https://dev.bukkit.org/projects/protocollib/files) and [CommandAPI](https://www.spigotmc.org/resources/api-commandapi-1-13-1-19-2.62353/).
If you would like to be able to use commands you will also need [Emotecraft command extensions](https://www.curseforge.com/minecraft/bukkit-plugins/emotecraft-command-extension/files) which requires [ProtocolLib](https://www.spigotmc.org/resources/1997/) and [CommandAPI](https://www.spigotmc.org/resources/62353/).

Once you have the plugin(s) you just need to put them in your plugins folder located at `{serverPath}/plugins`.

Then you just need to start/restart your Minecraft server.
Then start/restart your Minecraft server.
Loading

0 comments on commit 6b57461

Please sign in to comment.