saturnclientmc/common
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: saturnclientmc/common:7e98bbcd6ca79cfc97f6334ede5c49a8f7799895
Branches Tags
saturnclientmc/common:master
...
compare: saturnclientmc/common:b0d75af8c4a587c7edf871cfa47a1fdf81e4ecfc
Branches Tags
saturnclientmc/common:master
6 Commits
7e98bbcd6c ... b0d75af8c4
Author SHA1 Message Date
selimaj-dev b0d75af8c4 Merge pull request 'Fix the None cloak and reorder the sidebar and title dock' (#12) from release-fixes into master 
Reviewed-on: #12
 2026-09-29 16:34:48 +00:00
selimaj-devandclaude c973e053aa Open Saturn's settings from the title dock and put Saturn first 
The Saturn logo in the title screen's dock now opens Saturn's settings instead of the shift menu,
and it comes first: Saturn, mods, cosmetics, then Minecraft's options last. The shift menu is still
on its key in game.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
 2026-09-29 18:34:24 +02:00
selimaj-devandclaude bbf6b88ed3 Put settings second and the HUD editor last in the sidebar 
The order is now mods, settings, cosmetics, HUD editor.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
 2026-09-29 18:34:24 +02:00
selimaj-devandclaude ba71a5b838 Draw no cloak for "None" instead of the missing texture 
"None" is the empty cloak id, but getCurrentCloakTexture still built textures/cloaks/.png from it, so
the renderer drew Minecraft's missing texture. It now returns null for an empty id and for any id
this version has no texture for, and the renderer already skips a null texture.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
 2026-09-29 18:34:24 +02:00
selimaj-dev 6d5df3057e Merge pull request 'Add seven community emotes and re-export the twerk for emotes 0.1.1' (#11) from new-emotes into master 
Reviewed-on: #11
 2026-09-29 16:02:00 +00:00
selimaj-devandclaude 2fceb58024 Add seven community emotes and re-export the twerk for emotes 0.1.1 
Get the Griddy, Take the L, Dab, Wave, Salute, Shrug and 67, converted from Emotecraft's binary
files with the emotes repo's tools/emotecraft/convert.py. Their authors stay in each file. Their
Emotecraft bends play as the library's curved ones.

Emotes 0.1.1 stopped flipping the torso's bend, so the twerk is re-exported with its torso bends'
signs turned round. It looks the same as before. This needs Saturn on emotes 0.1.1, which the
saturnclient change pointing here does.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
 2026-09-29 17:57:00 +02:00
12 changed files with 3144 additions and 21 deletions
Expand all files Collapse all files
src/main/java/org/saturnclient/cosmetics/Cloaks.java
+7
View File
@@ -38,7 +38,14 @@ public class Cloaks {
availableCloaks.add(0, "");
}
/**
* The cloak's texture, or null for no cloak ("", the "None" choice) and for a cloak this version
* has no texture for, which would otherwise draw as the missing texture.
*/
public static IdentifierRef getCurrentCloakTexture(String cloakName) {
if (cloakName == null || !Arrays.asList(ALL_CLOAKS).contains(cloakName)) {
return null;
}
if (Arrays.asList(ANIMATED_CLOAKS).contains(cloakName)) {
return IdentifierRef.ofSaturn("textures/cloaks/" + cloakName + ".gif");
} else {
src/main/java/org/saturnclient/cosmetics/Emotes.java
+1 -1
View File
@@ -17,7 +17,7 @@ import org.saturnclient.ui.Utils;
*/
public class Emotes {
private static final List<String> IDS = List.of("tpose", "back_flip", "facepalm", "cry", "giga_chad",
"twerk");
"twerk", "get_the_griddy", "take_the_l", "dab", "wave", "salute", "shrug", "67");
private static final EmoteRegistry REGISTRY = new EmoteRegistry();
src/main/java/org/saturnclient/ui/components/Sidebar.java
+5 -4
View File
@@ -22,9 +22,9 @@ public class Sidebar extends Element {
// Values for the constructor's `active`
public static final int MODS = 0;
public static final int COSMETICS = 1;
public static final int HUD_EDITOR = 2;
public static final int SETTINGS = 3;
public static final int SETTINGS = 1;
public static final int COSMETICS = 2;
public static final int HUD_EDITOR = 3;
private static final int LOGO = 32;
private static final int BUTTON = 44;
@@ -35,11 +35,12 @@ public class Sidebar extends Element {
private record Item(IdentifierRef icon, Runnable onClick) {
}
// In the order of the constants above
private final Item[] items = {
new Item(Textures.ICON_MODS, () -> Providers.saturn.getClient().setScreen(new ModMenu())),
new Item(Textures.ICON_SETTINGS, () -> Providers.saturn.getClient().setScreen(new ClientSettings())),
new Item(Textures.ICON_COSMETICS, () -> Providers.saturn.getClient().setScreen(new CosmeticsMenu())),
new Item(Textures.ICON_HUD_EDITOR, () -> Providers.saturn.getClient().setScreen(new HudEditor())),
new Item(Textures.ICON_SETTINGS, () -> Providers.saturn.getClient().setScreen(new ClientSettings())),
};
private final int active;
src/main/java/org/saturnclient/ui/screens/TitleMenu.java
+4 -4
View File
@@ -26,8 +26,8 @@ import org.saturnclient.ui.resources.Textures;
/**
* Saturn's title screen: the logo over the game's menus in the middle, the
* player and a quit button in the top corners, and along the bottom a dock of
* Saturn's screens, the shift menu and Minecraft's options, and the version.
* player and a quit button in the top corners, and along the bottom a dock
* (Saturn's settings, its mods and cosmetics, then Minecraft's options) and the version.
*/
public class TitleMenu extends SaturnScreen {
// The logo and wordmark as the shift menu has them: the wordmark over the logo's foot
@@ -106,12 +106,12 @@ public class TitleMenu extends SaturnScreen {
.position(width - TOP_EDGE - QUIT_SIZE, TOP_EDGE)
.animation(step(new SlideFade(AnimationConfig.mainMenu, 8), STEP_QUIT)));
// Along the bottom: the dock of Saturn's screens, the shift menu and Minecraft's options, and the version
// Along the bottom: the dock, Saturn first (its settings) and Minecraft's options last, and the version
Dock dock = new Dock(List.of(
new Dock.Item(Textures.LOGO, () -> Providers.saturn.getClient().setScreen(new ClientSettings())),
new Dock.Item(Textures.ICON_MODS, () -> Providers.saturn.getClient().setScreen(new ModMenu())),
new Dock.Item(Textures.ICON_COSMETICS,
() -> Providers.saturn.getClient().setScreen(new CosmeticsMenu())),
new Dock.Item(Textures.LOGO, () -> Providers.saturn.getClient().setScreen(new ShiftMenu())),
new Dock.Item(Textures.ICON_SETTINGS,
() -> Providers.saturn.getClient().setScreen(MinecraftScreen.Options))));
draw(dock.position((width - dock.width) / 2, height - EDGE - Dock.HEIGHT)
src/main/resources/assets/saturnclient/player_animations/67.json
+1226
View File
File diff suppressed because it is too large Load Diff
src/main/resources/assets/saturnclient/player_animations/dab.json
+193
View File
@@ -0,0 +1,193 @@
{
"version": 3,
"name": "\u0414\u044d\u0431",
"description": "\u0414\u044d\u0431\u043d\u0438 \u0441\u043e \u0432\u0441\u0435\u043c \u0432\u043a\u0443\u0441\u043e\u043c",
"author": "SPEmotes",
"emote": {
"beginTick": 0,
"endTick": 30,
"stopTick": 31,
"isLoop": false,
"returnTick": 1,
"easeBeforeKeyframe": false,
"degrees": false,
"moves": [
{
"tick": 4,
"easing": "EASEINOUTQUAD",
"rightLeg": {
"x": -1.873698,
"y": 11.100854,
"z": 0.104908,
"pitch": -0.01179,
"yaw": 0.000183,
"roll": 0.037555
}
},
{
"tick": 7,
"easing": "EASEINOUTQUAD",
"rightArm": {
"x": -5.06384,
"y": 3.129459,
"z": -0.028821,
"pitch": 1.006445,
"yaw": 0.326442,
"roll": 1.238234
},
"leftArm": {
"x": 5.0,
"y": 2.0,
"z": 0.0,
"pitch": -1.859405,
"yaw": 0.56235,
"roll": -1.6982
}
},
{
"tick": 8,
"easing": "EASEINOUTQUAD",
"head": {
"x": 0.0,
"y": 0.0,
"z": 0.0,
"pitch": 0.14541,
"yaw": 0.336522,
"roll": -0.066829
},
"body": {
"x": 0.0,
"y": 0.010776,
"z": 0.0,
"pitch": -0.007742,
"yaw": -0.304674,
"roll": -0.059173
},
"rightArm": {
"bend": -1.042365
},
"leftArm": {
"bend": -1.205889
},
"rightLeg": {
"x": -1.9,
"y": 12.0,
"z": 0.1,
"pitch": -0.023581,
"yaw": 0.001468,
"roll": 0.075111
},
"leftLeg": {
"x": 1.9,
"y": 12.0,
"z": -0.1,
"pitch": 0.025482,
"yaw": -0.467862,
"roll": 0.006087
}
},
{
"tick": 12,
"easing": "EASEINOUTQUAD",
"leftLeg": {
"x": 1.933101,
"y": 11.441392,
"z": -0.084124,
"pitch": 0.021479,
"yaw": -0.538523,
"roll": -0.038416
}
},
{
"tick": 16,
"easing": "EASEINOUTQUAD",
"body": {
"x": 0.0,
"y": 0.010776,
"z": 0.0,
"pitch": -0.043213,
"yaw": 0.303575,
"roll": -0.059152
},
"rightArm": {
"bend": -1.396377
},
"leftArm": {
"bend": 0.0
},
"rightLeg": {
"x": -1.9,
"y": 12.0,
"z": 0.1,
"pitch": -0.018974,
"yaw": 0.303724,
"roll": 0.068059
},
"leftLeg": {
"x": 1.9,
"y": 12.0,
"z": -0.1,
"pitch": 0.017477,
"yaw": -0.548618,
"roll": -0.082919
}
},
{
"tick": 18,
"easing": "EASEINOUTQUAD",
"head": {
"x": 0.0,
"y": 0.0,
"z": 0.0,
"pitch": 0.291391,
"yaw": 0.542094,
"roll": -0.159259
},
"rightArm": {
"x": -5.06384,
"y": 3.129459,
"z": -0.028821,
"pitch": -1.265057,
"yaw": 0.037433,
"roll": 1.364253
},
"leftArm": {
"x": 5.0,
"y": 2.0,
"z": 0.0,
"pitch": -0.438223,
"yaw": -0.045192,
"roll": -1.798213
}
},
{
"tick": 21,
"easing": "EASEINOUTQUAD",
"head": {
"x": 0.0,
"y": 0.0,
"z": 0.0,
"pitch": 0.291391,
"yaw": 0.542094,
"roll": -0.159259
},
"rightArm": {
"x": -5.06384,
"y": 3.129459,
"z": -0.028821,
"pitch": -1.265057,
"yaw": 0.037433,
"roll": 1.364253
},
"leftArm": {
"x": 5.0,
"y": 2.0,
"z": 0.0,
"pitch": -0.438223,
"yaw": -0.045192,
"roll": -1.798213
}
}
]
}
}
src/main/resources/assets/saturnclient/player_animations/get_the_griddy.json
+825
View File
@@ -0,0 +1,825 @@
{
"version": 3,
"name": "Get the Griddy",
"description": "fortnite battlepass",
"author": "SeroRonin",
"emote": {
"beginTick": 0,
"endTick": 91,
"stopTick": 91,
"isLoop": true,
"returnTick": 2,
"easeBeforeKeyframe": false,
"degrees": false,
"moves": [
{
"tick": 1,
"easing": "LINEAR",
"head": {
"x": 0.0,
"y": 0.0,
"z": 0.0,
"pitch": 0.261799,
"yaw": 0.0,
"roll": 0.0
},
"rightArm": {
"pitch": -0.872665,
"yaw": -0.436332,
"roll": 0.349066
},
"leftLeg": {
"x": 1.9,
"y": 12.0,
"z": -0.1,
"pitch": -0.523599,
"yaw": 0.0,
"roll": 0.0,
"bend": 0.436332
},
"rightLeg": {
"x": -1.9,
"y": 12.0,
"z": 0.1,
"pitch": -0.174533,
"yaw": 0.0,
"roll": 0.0,
"bend": 0.523599
},
"leftArm": {
"x": 5.0,
"y": 2.0,
"z": 0.0,
"pitch": -0.872674,
"yaw": 0.436332,
"roll": -0.349066
},
"body": {
"x": 0.0,
"y": 0.0,
"z": 0.0,
"pitch": 0.077608,
"yaw": 0.0,
"roll": 0.0
},
"torso": {
"bend": 0.395397
}
},
{
"tick": 4,
"easing": "LINEAR",
"leftLeg": {
"pitch": -0.610865
}
},
{
"tick": 5,
"easing": "LINEAR",
"body": {
"x": 0.0,
"y": 0.0375,
"z": 0.0,
"pitch": 0.033951,
"yaw": 0.0,
"roll": 0.0
},
"torso": {
"bend": 0.377793
}
},
{
"tick": 6,
"easing": "LINEAR",
"head": {
"pitch": 0.191986
},
"leftLeg": {
"bend": 0.959931
},
"rightLeg": {
"bend": 0.523599
}
},
{
"tick": 9,
"easing": "LINEAR",
"head": {
"x": 0.0,
"y": 0.0,
"z": 0.0,
"pitch": 0.261799,
"yaw": 0.0,
"roll": 0.0
},
"rightArm": {
"pitch": 0.523599,
"yaw": -0.436332,
"roll": 0.226893
},
"leftLeg": {
"pitch": -0.178507,
"bend": 0.523599
},
"rightLeg": {
"pitch": -0.523599,
"bend": 0.436332
},
"leftArm": {
"x": 5.0,
"y": 2.0,
"z": 0.0,
"pitch": 0.52359,
"yaw": 0.436332,
"roll": -0.226893
},
"body": {
"y": 0.0,
"pitch": 0.077608
},
"torso": {
"bend": 0.395397
}
},
{
"tick": 12,
"easing": "LINEAR",
"rightLeg": {
"x": -1.9,
"y": 12.0,
"z": 0.1,
"pitch": -0.610865,
"yaw": 0.0,
"roll": 0.0
},
"body": {
"y": 0.0375,
"pitch": 0.033951
},
"torso": {
"bend": 0.377793
}
},
{
"tick": 13,
"easing": "LINEAR",
"head": {
"pitch": 0.191986
},
"leftLeg": {
"bend": 0.523599
},
"rightLeg": {
"bend": 0.959931
}
},
{
"tick": 16,
"easing": "LINEAR",
"head": {
"pitch": 0.261799,
"yaw": 0.0,
"roll": 0.0
},
"rightArm": {
"pitch": -0.872665,
"roll": 0.349066
},
"leftLeg": {
"x": 1.9,
"y": 12.0,
"z": -0.1,
"pitch": -0.523599,
"yaw": 0.0,
"roll": 0.0,
"bend": 0.436332
},
"rightLeg": {
"pitch": -0.174533,
"bend": 0.523599
},
"leftArm": {
"pitch": -0.872674,
"roll": -0.349066
},
"body": {
"y": 0.0,
"pitch": 0.077608
},
"torso": {
"bend": 0.395397
}
},
{
"tick": 19,
"easing": "LINEAR",
"leftLeg": {
"pitch": -0.610865
}
},
{
"tick": 20,
"easing": "LINEAR",
"body": {
"y": 0.0375,
"pitch": 0.033951
},
"torso": {
"bend": 0.377793
}
},
{
"tick": 21,
"easing": "LINEAR",
"leftLeg": {
"bend": 0.959931
},
"rightLeg": {
"bend": 0.523599
}
},
{
"tick": 24,
"easing": "LINEAR",
"head": {
"pitch": -0.416877,
"yaw": -0.519655,
"roll": 0.21801
},
"rightArm": {
"pitch": 0.523599,
"roll": 0.226893
},
"leftLeg": {
"pitch": -0.178507,
"bend": 0.523599
},
"rightLeg": {
"pitch": -0.523599,
"bend": 0.436332
},
"leftArm": {
"pitch": 0.52359,
"roll": -0.226893
},
"body": {
"y": 0.0,
"pitch": 0.077608
},
"torso": {
"bend": 0.395397
}
},
{
"tick": 27,
"easing": "LINEAR",
"rightLeg": {
"pitch": -0.610865
},
"body": {
"y": 0.0375,
"pitch": 0.033951
},
"torso": {
"bend": 0.377793
}
},
{
"tick": 28,
"easing": "LINEAR",
"head": {
"pitch": -0.457451,
"roll": 0.21801
},
"leftLeg": {
"bend": 0.523599
},
"rightLeg": {
"bend": 0.959931
}
},
{
"tick": 31,
"easing": "LINEAR",
"head": {
"pitch": -0.416877,
"roll": 0.21801
},
"rightArm": {
"pitch": -0.872665,
"roll": 0.349066
},
"leftLeg": {
"pitch": -0.523599,
"bend": 0.436332
},
"rightLeg": {
"pitch": -0.174533,
"bend": 0.523599
},
"leftArm": {
"pitch": -0.872674,
"roll": -0.349066
},
"body": {
"y": 0.0,
"pitch": 0.077608
},
"torso": {
"bend": 0.395397
}
},
{
"tick": 34,
"easing": "LINEAR",
"leftLeg": {
"pitch": -0.610865
}
},
{
"tick": 35,
"easing": "LINEAR",
"body": {
"y": 0.0375,
"pitch": 0.033951
},
"torso": {
"bend": 0.377793
}
},
{
"tick": 36,
"easing": "LINEAR",
"head": {
"pitch": -0.457451,
"roll": 0.21801
},
"leftLeg": {
"bend": 0.959931
},
"rightLeg": {
"bend": 0.523599
}
},
{
"tick": 39,
"easing": "LINEAR",
"head": {
"pitch": -0.416877,
"roll": 0.21801
},
"rightArm": {
"pitch": 0.523599,
"roll": 0.226893
},
"leftLeg": {
"pitch": -0.178507,
"bend": 0.523599
},
"rightLeg": {
"pitch": -0.523599,
"bend": 0.436332
},
"leftArm": {
"pitch": 0.52359,
"roll": -0.226893
},
"body": {
"y": 0.0,
"pitch": 0.077608
},
"torso": {
"bend": 0.395397
}
},
{
"tick": 42,
"easing": "LINEAR",
"rightLeg": {
"pitch": -0.610865
},
"body": {
"y": 0.0375,
"pitch": 0.033951
},
"torso": {
"bend": 0.377793
}
},
{
"tick": 43,
"easing": "LINEAR",
"head": {
"pitch": -0.457451,
"roll": 0.21801
},
"leftLeg": {
"bend": 0.523599
},
"rightLeg": {
"bend": 0.959931
}
},
{
"tick": 46,
"easing": "LINEAR",
"head": {
"pitch": -0.416877,
"yaw": -0.519655,
"roll": 0.21801
},
"rightArm": {
"pitch": -0.872665,
"roll": 0.349066,
"bend": 0.0
},
"leftLeg": {
"pitch": -0.523599,
"bend": 0.436332
},
"rightLeg": {
"pitch": -0.174533,
"bend": 0.523599
},
"leftArm": {
"pitch": -0.872674,
"roll": -0.349066,
"bend": 0.0
},
"body": {
"y": 0.0,
"pitch": 0.077608
},
"torso": {
"bend": 0.395397
}
},
{
"tick": 49,
"easing": "LINEAR",
"leftLeg": {
"pitch": -0.610865
}
},
{
"tick": 50,
"easing": "LINEAR",
"body": {
"y": 0.0375,
"pitch": 0.033951
},
"torso": {
"bend": 0.377793
}
},
{
"tick": 51,
"easing": "LINEAR",
"leftLeg": {
"bend": 0.959931
},
"rightLeg": {
"bend": 0.523599
}
},
{
"tick": 54,
"easing": "LINEAR",
"head": {
"pitch": -0.000488,
"yaw": -0.272548,
"roll": -0.027396
},
"rightArm": {
"pitch": 0.523599,
"roll": 0.226893,
"bend": -0.872665
},
"leftLeg": {
"pitch": -0.178507,
"bend": 0.523599
},
"rightLeg": {
"pitch": -0.523599,
"bend": 0.436332
},
"leftArm": {
"pitch": 0.52359,
"roll": -0.226893,
"bend": -0.872665
},
"body": {
"y": 0.0,
"pitch": 0.077608
},
"torso": {
"bend": 0.395397
}
},
{
"tick": 57,
"easing": "LINEAR",
"rightLeg": {
"pitch": -0.610865
},
"body": {
"y": 0.0375,
"pitch": 0.033951
},
"torso": {
"bend": 0.377793
}
},
{
"tick": 58,
"easing": "LINEAR",
"leftLeg": {
"bend": 0.523599
},
"rightLeg": {
"bend": 0.959931
}
},
{
"tick": 61,
"easing": "LINEAR",
"rightArm": {
"pitch": -0.872665,
"yaw": -0.436332,
"roll": 0.349066
},
"leftLeg": {
"pitch": -0.523599,
"bend": 0.436332
},
"rightLeg": {
"pitch": -0.174533,
"bend": 0.523599
},
"leftArm": {
"pitch": -0.872674,
"yaw": 0.436332,
"roll": -0.349066
},
"body": {
"y": 0.0,
"pitch": 0.077608
},
"torso": {
"bend": 0.395397
}
},
{
"tick": 64,
"easing": "LINEAR",
"leftLeg": {
"pitch": -0.610865
}
},
{
"tick": 65,
"easing": "LINEAR",
"body": {
"y": 0.0375,
"pitch": 0.033951
},
"torso": {
"bend": 0.377793
}
},
{
"tick": 66,
"easing": "LINEAR",
"leftLeg": {
"bend": 0.959931
},
"rightLeg": {
"bend": 0.523599
}
},
{
"tick": 69,
"easing": "LINEAR",
"head": {
"pitch": -0.523599,
"yaw": 0.0,
"roll": 0.0
},
"rightArm": {
"pitch": -2.356194,
"yaw": 0.087266,
"roll": 0.523599
},
"leftLeg": {
"pitch": -0.178507,
"bend": 0.523599
},
"rightLeg": {
"pitch": -0.523599,
"bend": 0.436332
},
"leftArm": {
"pitch": -2.338528,
"yaw": -0.087266,
"roll": -0.523599
},
"body": {
"y": 0.0,
"pitch": 0.077608
},
"torso": {
"bend": 0.395397
}
},
{
"tick": 72,
"easing": "LINEAR",
"rightLeg": {
"pitch": -0.610865
},
"body": {
"y": 0.0375,
"pitch": 0.033951
},
"torso": {
"bend": 0.377793
}
},
{
"tick": 73,
"easing": "LINEAR",
"leftLeg": {
"bend": 0.523599
},
"rightLeg": {
"bend": 0.959931
}
},
{
"tick": 76,
"easing": "LINEAR",
"rightArm": {
"bend": -0.959931
},
"leftLeg": {
"pitch": -0.523599,
"bend": 0.436332
},
"rightLeg": {
"pitch": -0.174533,
"bend": 0.523599
},
"leftArm": {
"bend": -0.959931
},
"body": {
"y": 0.0,
"pitch": 0.077608
},
"torso": {
"bend": 0.395397
}
},
{
"tick": 79,
"easing": "LINEAR",
"leftLeg": {
"pitch": -0.610865
}
},
{
"tick": 80,
"easing": "LINEAR",
"body": {
"y": 0.0375,
"pitch": 0.033951
},
"torso": {
"bend": 0.377793
}
},
{
"tick": 81,
"easing": "LINEAR",
"head": {
"x": 0.0,
"y": 0.0,
"z": 0.0,
"pitch": -0.523599,
"yaw": 0.0,
"roll": 0.0
},
"rightArm": {
"pitch": -2.181662,
"yaw": 0.0,
"roll": 0.436332
},
"leftLeg": {
"bend": 0.959931
},
"rightLeg": {
"bend": 0.523599
},
"leftArm": {
"pitch": -2.185317,
"yaw": 0.0,
"roll": -0.436332
}
},
{
"tick": 84,
"easing": "LINEAR",
"leftLeg": {
"pitch": -0.178507,
"bend": 0.523599
},
"rightLeg": {
"pitch": -0.523599,
"bend": 0.436332
},
"body": {
"y": 0.0,
"pitch": 0.077608
},
"torso": {
"bend": 0.395397
}
},
{
"tick": 87,
"easing": "LINEAR",
"rightLeg": {
"pitch": -0.610865
},
"body": {
"y": 0.0375,
"pitch": 0.033951
},
"torso": {
"bend": 0.377793
}
},
{
"tick": 88,
"easing": "LINEAR",
"leftLeg": {
"bend": 0.523599
},
"rightLeg": {
"bend": 0.959931
}
},
{
"tick": 91,
"easing": "LINEAR",
"head": {
"pitch": 0.261799
},
"rightArm": {
"pitch": -0.872665,
"yaw": -0.436332,
"roll": 0.349066,
"bend": 0.0
},
"leftLeg": {
"x": 1.9,
"y": 12.0,
"z": -0.1,
"pitch": -0.523599,
"yaw": 0.0,
"roll": 0.0,
"bend": 0.436332
},
"rightLeg": {
"x": -1.9,
"y": 12.0,
"z": 0.1,
"pitch": -0.174533,
"yaw": 0.0,
"roll": 0.0,
"bend": 0.523599
},
"leftArm": {
"x": 5.0,
"y": 2.0,
"z": 0.0,
"pitch": -0.872674,
"yaw": 0.436332,
"roll": -0.349066,
"bend": 0.0
},
"body": {
"x": 0.0,
"y": 0.0,
"z": 0.0,
"pitch": 0.077608,
"yaw": 0.0,
"roll": 0.0
},
"torso": {
"bend": 0.395397
}
}
]
}
}
src/main/resources/assets/saturnclient/player_animations/salute.json
+121
View File
@@ -0,0 +1,121 @@
{
"version": 3,
"name": "Salute",
"description": "Hand behind back",
"author": "Wah0o",
"emote": {
"beginTick": 0,
"endTick": 30,
"stopTick": 30,
"isLoop": true,
"returnTick": 12,
"easeBeforeKeyframe": false,
"degrees": false,
"moves": [
{
"tick": 10,
"easing": "EASEINOUTQUAD",
"head": {
"x": 0.0,
"y": 0.0,
"z": 0.0,
"pitch": 0.0,
"yaw": 0.0,
"roll": 0.0
},
"body": {
"x": 0.0,
"y": 0.0,
"z": 0.0,
"pitch": 0.0,
"yaw": 0.0,
"roll": 0.0
},
"rightArm": {
"x": -5.0,
"y": 2.0,
"z": 0.0,
"pitch": 0.484846,
"yaw": 0.0,
"roll": -0.576996
},
"leftArm": {
"x": 5.0,
"y": 2.0,
"z": 0.0,
"pitch": -2.604544,
"yaw": 0.0,
"roll": -0.400639
},
"rightLeg": {
"x": -1.9,
"y": 12.0,
"z": 0.1,
"pitch": 0.0,
"yaw": 0.0,
"roll": 0.0
},
"leftLeg": {
"x": 1.9,
"y": 12.0,
"z": -0.1,
"pitch": 0.0,
"yaw": 0.0,
"roll": 0.0
}
},
{
"tick": 30,
"easing": "EASEINOUTQUAD",
"head": {
"x": 0.0,
"y": 0.0,
"z": 0.0,
"pitch": 0.0,
"yaw": 0.0,
"roll": 0.0
},
"body": {
"x": 0.0,
"y": 0.0,
"z": 0.0,
"pitch": 0.0,
"yaw": 0.0,
"roll": 0.0
},
"rightArm": {
"x": -5.0,
"y": 2.0,
"z": 0.0,
"pitch": 0.484846,
"yaw": 0.0,
"roll": -0.576996
},
"leftArm": {
"x": 5.0,
"y": 2.0,
"z": 0.0,
"pitch": -2.604544,
"yaw": 0.0,
"roll": -0.400639
},
"rightLeg": {
"x": -1.9,
"y": 12.0,
"z": 0.1,
"pitch": 0.0,
"yaw": 0.0,
"roll": 0.0
},
"leftLeg": {
"x": 1.9,
"y": 12.0,
"z": -0.1,
"pitch": 0.0,
"yaw": 0.0,
"roll": 0.0
}
}
]
}
}
src/main/resources/assets/saturnclient/player_animations/shrug.json
+90
View File
@@ -0,0 +1,90 @@
{
"version": 3,
"name": "Shrug",
"description": "don't care",
"author": "Wah0o",
"emote": {
"beginTick": 0,
"endTick": 30,
"stopTick": 31,
"isLoop": false,
"returnTick": 1,
"easeBeforeKeyframe": false,
"degrees": false,
"moves": [
{
"tick": 10,
"easing": "EASEINOUTQUAD",
"head": {
"x": 0.0,
"y": 0.0,
"z": 0.0,
"pitch": 0.0,
"yaw": 0.537013,
"roll": 0.0
}
},
{
"tick": 20,
"easing": "EASEINOUTQUAD",
"head": {
"yaw": -0.449322
},
"rightArm": {
"x": -5.0,
"y": 2.0,
"z": 0.0,
"pitch": 0.0,
"yaw": 0.0,
"roll": 0.0
},
"leftArm": {
"x": 5.0,
"y": 2.0,
"z": 0.0,
"pitch": 0.0,
"yaw": 0.0,
"roll": 0.0
}
},
{
"tick": 25,
"easing": "EASEINOUTQUAD",
"rightArm": {
"y": 0.673667
},
"leftArm": {
"y": 0.738915
}
},
{
"tick": 30,
"easing": "EASEINOUTQUAD",
"head": {
"x": 0.0,
"y": 0.0,
"z": 0.0,
"pitch": 0.0,
"yaw": 0.0,
"roll": 0.0
},
"rightArm": {
"x": -5.0,
"y": 2.0,
"z": 0.0,
"pitch": 0.0,
"yaw": 0.0,
"roll": 0.0
},
"leftArm": {
"x": 5.0,
"y": 2.0,
"z": 0.0,
"pitch": 0.0,
"yaw": 0.0,
"roll": 0.0
}
}
]
}
}
src/main/resources/assets/saturnclient/player_animations/take_the_l.json
+307
View File
@@ -0,0 +1,307 @@
{
"version": 3,
"name": "Take The L",
"description": "Savor the W",
"author": "Landro",
"emote": {
"beginTick": 0,
"endTick": 30,
"stopTick": 30,
"isLoop": true,
"returnTick": 10,
"easeBeforeKeyframe": false,
"degrees": false,
"moves": [
{
"tick": 5,
"easing": "EASEINOUTQUAD",
"head": {
"x": 0.0,
"y": 0.0,
"z": 0.0,
"pitch": 0.0,
"yaw": 0.0,
"roll": 0.0
},
"body": {
"y": 0.25,
"roll": 0.0
},
"leftArm": {
"x": 5.76,
"y": 3.28,
"z": -0.64,
"pitch": -1.294932,
"yaw": 0.991577,
"roll": -1.205874,
"bend": -1.057819
},
"rightLeg": {
"x": -1.9,
"y": 12.0,
"z": 0.1,
"pitch": 0.0,
"yaw": 0.261799,
"roll": 0.0,
"bend": 0.0
},
"leftLeg": {
"x": 1.9,
"y": 12.0,
"z": -0.1,
"pitch": 0.0,
"yaw": -0.523599,
"roll": -0.785398
}
},
{
"tick": 8,
"easing": "EASEINOUTQUAD",
"leftLeg": {
"x": 2.9,
"y": 11.0,
"z": -1.1,
"yaw": -0.959931,
"roll": -1.396263,
"bend": 0.785398
}
},
{
"tick": 10,
"easing": "EASEINOUTQUAD",
"head": {
"x": 0.0,
"y": 0.0,
"z": 0.0,
"pitch": 0.030844,
"yaw": 0.0,
"roll": -0.059719
},
"body": {
"x": 0.0,
"y": 0.0,
"z": 0.0,
"pitch": 0.0,
"yaw": 0.0,
"roll": -0.087266
},
"rightArm": {
"x": -7.0,
"y": -2.0,
"z": -2.0,
"pitch": -1.416631,
"yaw": -0.785398,
"roll": 4.110391,
"bend": 1.308997
},
"leftArm": {
"x": 5.76,
"y": 3.28,
"z": -0.64,
"pitch": -1.294932,
"yaw": 0.991577,
"roll": -1.205874,
"bend": -1.057819
},
"rightLeg": {
"x": -1.9,
"y": 12.0,
"z": -0.9,
"pitch": -0.174533,
"yaw": 0.261799,
"roll": 0.174533,
"bend": 0.261799
},
"leftLeg": {
"x": 2.9,
"y": 11.0,
"z": -1.1,
"pitch": 0.0,
"yaw": -0.959931,
"roll": -1.570796,
"bend": 0.0
}
},
{
"tick": 12,
"easing": "EASEINOUTQUAD",
"leftLeg": {
"bend": 0.785398
}
},
{
"tick": 15,
"easing": "EASEINOUTQUAD",
"head": {
"pitch": 0.0,
"yaw": 0.0,
"roll": 0.0
},
"body": {
"y": 0.25,
"roll": 0.0
},
"rightLeg": {
"x": -1.9,
"y": 12.0,
"z": 0.1,
"pitch": 0.0,
"yaw": 0.261799,
"roll": 0.0,
"bend": 0.0
},
"leftLeg": {
"x": 1.9,
"y": 12.0,
"z": -0.1,
"pitch": 0.0,
"yaw": -0.261799,
"roll": 0.0,
"bend": 0.0
}
},
{
"tick": 18,
"easing": "EASEINOUTQUAD",
"rightLeg": {
"x": -2.9,
"y": 11.0,
"z": -0.9,
"yaw": 0.959931,
"roll": 1.396263,
"bend": 0.785398
}
},
{
"tick": 20,
"easing": "EASEINOUTQUAD",
"head": {
"pitch": 0.105365,
"yaw": 0.000794,
"roll": 0.055846
},
"body": {
"y": 0.0,
"roll": 0.087266
},
"rightArm": {
"pitch": -1.132143
},
"rightLeg": {
"x": -2.9,
"y": 11.0,
"z": -0.9,
"yaw": 0.959931,
"roll": 1.570796,
"bend": 0.0
},
"leftLeg": {
"pitch": -0.174533,
"roll": -0.174533,
"bend": 0.261799
}
},
{
"tick": 22,
"easing": "EASEINOUTQUAD",
"rightLeg": {
"bend": 0.785398
}
},
{
"tick": 25,
"easing": "EASEINOUTQUAD",
"head": {
"pitch": 0.0,
"yaw": 0.0,
"roll": 0.0
},
"body": {
"y": 0.25
},
"rightLeg": {
"x": -1.9,
"y": 12.0,
"z": 0.1,
"pitch": 0.0,
"yaw": 0.261799,
"roll": 0.0,
"bend": 0.0
},
"leftLeg": {
"x": 1.9,
"y": 12.0,
"z": -0.1,
"pitch": 0.0,
"yaw": -0.261799,
"roll": 0.0,
"bend": 0.0
}
},
{
"tick": 28,
"easing": "EASEINOUTQUAD",
"leftLeg": {
"x": 2.9,
"y": 11.0,
"z": -1.1,
"yaw": -0.959931,
"roll": -1.396263,
"bend": 0.785398
}
},
{
"tick": 30,
"easing": "EASEINOUTQUAD",
"head": {
"x": 0.0,
"y": 0.0,
"z": 0.0,
"pitch": 0.030844,
"yaw": 0.0,
"roll": -0.059719
},
"body": {
"y": 0.0,
"roll": -0.087266
},
"rightArm": {
"x": -7.0,
"y": -2.0,
"z": -2.0,
"pitch": -1.416631,
"yaw": -0.785398,
"roll": 4.110391,
"bend": 1.308997
},
"leftArm": {
"x": 5.76,
"y": 3.28,
"z": -0.64,
"pitch": -1.294932,
"yaw": 0.991577,
"roll": -1.205874,
"bend": -1.057819
},
"rightLeg": {
"x": -1.9,
"y": 12.0,
"z": -0.9,
"pitch": -0.174533,
"yaw": 0.261799,
"roll": 0.174533,
"bend": 0.261799
},
"leftLeg": {
"x": 2.9,
"y": 11.0,
"z": -1.1,
"pitch": 0.0,
"yaw": -0.959931,
"roll": -1.570796,
"bend": 0.0
}
}
]
}
}
src/main/resources/assets/saturnclient/player_animations/twerk.json
+12 -12
View File
@@ -32,7 +32,7 @@
"pitch": 43.8857,
"yaw": -0.2748,
"roll": -0.5704,
"bend": -32.4225,
"bend": 32.4225,
"axis": 178.4861
},
"rightArm": {
@@ -88,7 +88,7 @@
"z": -3.9546,
"pitch": 44.2163,
"roll": -1.2208,
"bend": -31.983
"bend": 31.983
},
"rightArm": {
"y": 8.8595,
@@ -132,7 +132,7 @@
"torso": {
"x": -0.8055,
"y": 8.1689,
"bend": -38.1002
"bend": 38.1002
},
"rightArm": {
"x": -5.6879,
@@ -175,7 +175,7 @@
"z": -4.854,
"pitch": 51.4994,
"roll": -5.723,
"bend": -46.2958,
"bend": 46.2958,
"axis": 171.0835
},
"rightArm": {
@@ -227,7 +227,7 @@
"pitch": 52.4228,
"yaw": 3.8511,
"roll": -5.9949,
"bend": -49.0159,
"bend": 49.0159,
"axis": 172.2434
},
"rightArm": {
@@ -275,7 +275,7 @@
"x": -1.4047,
"y": 9.9389,
"yaw": 3.7305,
"bend": -43.4407
"bend": 43.4407
},
"rightArm": {
"x": -6.2198,
@@ -321,7 +321,7 @@
"z": -4.1286,
"pitch": 44.9959,
"roll": -0.1331,
"bend": -35.1937
"bend": 35.1937
},
"rightArm": {
"x": -5.5003,
@@ -367,7 +367,7 @@
"z": -3.8955,
"pitch": 43.6308,
"yaw": -0.6674,
"bend": -31.2968
"bend": 31.2968
},
"rightArm": {
"y": 8.7024,
@@ -418,7 +418,7 @@
"z": -4.1189,
"pitch": 45.5567,
"roll": 1.9,
"bend": -34.3817,
"bend": 34.3817,
"axis": 185.8808
},
"rightArm": {
@@ -499,7 +499,7 @@
"z": -4.9963,
"pitch": 52.5511,
"roll": 6.3235,
"bend": -48.7324,
"bend": 48.7324,
"axis": 188.7341
},
"rightArm": {
@@ -551,7 +551,7 @@
"z": -4.8864,
"pitch": 51.13,
"yaw": -4.0928,
"bend": -47.0625
"bend": 47.0625
},
"rightArm": {
"x": -3.4451,
@@ -636,7 +636,7 @@
"pitch": 43.8857,
"yaw": -0.2748,
"roll": -0.5704,
"bend": -32.4225,
"bend": 32.4225,
"axis": 178.4861
},
"rightArm": {
src/main/resources/assets/saturnclient/player_animations/wave.json
+353
View File
@@ -0,0 +1,353 @@
{
"version": 3,
"name": "smooth wave",
"description": "my first animation",
"author": "operatordoge739",
"emote": {
"beginTick": 0,
"endTick": 80,
"stopTick": 81,
"isLoop": false,
"returnTick": 1,
"easeBeforeKeyframe": false,
"degrees": false,
"moves": [
{
"tick": 8,
"easing": "EASEINOUTQUAD",
"body": {
"pitch": -0.040079,
"yaw": -0.062839,
"roll": 0.013404
}
},
{
"tick": 16,
"easing": "EASEINOUTQUAD",
"head": {
"pitch": 0.079561,
"yaw": 0.00633,
"roll": 0.104675
},
"body": {
"pitch": 0.015338,
"yaw": -0.101444,
"roll": 0.071169
},
"rightArm": {
"x": -5.642361,
"y": 3.445788,
"z": -0.219398,
"pitch": -2.739643,
"yaw": 1.23244,
"roll": 0.274965
},
"leftArm": {
"x": 5.348845,
"y": 2.06144,
"z": 0.456518,
"pitch": -0.071698,
"yaw": -0.032049,
"roll": -0.245309
},
"rightLeg": {
"x": -2.024828,
"y": 12.367789,
"z": 0.062098,
"pitch": 0.005119,
"yaw": 0.188187,
"roll": 0.013892
},
"leftLeg": {
"pitch": -0.015376,
"yaw": -0.018557,
"roll": -0.147605
}
},
{
"tick": 23,
"easing": "EASEINOUTQUAD",
"body": {
"pitch": 0.015075,
"yaw": -0.096037,
"roll": 0.011298
},
"rightArm": {
"x": -5.569975,
"y": 3.783614,
"z": -0.392365,
"pitch": -2.998378,
"yaw": 0.910442,
"roll": -0.644675
},
"rightLeg": {
"x": -2.022849,
"y": 12.008524,
"z": 0.109452,
"pitch": 0.007948,
"yaw": 0.194292,
"roll": 0.061405
},
"leftLeg": {
"x": 1.828612,
"y": 11.783937,
"z": -0.067588
}
},
{
"tick": 25,
"easing": "EASEINOUTQUAD",
"head": {
"pitch": 0.03656,
"yaw": -0.056306,
"roll": -0.010938
}
},
{
"tick": 26,
"easing": "EASEINOUTQUAD",
"leftArm": {
"x": 5.232569,
"y": 2.037472,
"z": 0.40348,
"pitch": -0.120718,
"yaw": -0.007399,
"roll": -0.1239
}
},
{
"tick": 30,
"easing": "EASEINOUTQUAD",
"body": {
"pitch": 0.019292,
"yaw": -0.103782,
"roll": 0.055881
},
"rightArm": {
"pitch": -2.902291,
"yaw": 1.150272,
"roll": -0.061632
}
},
{
"tick": 31,
"easing": "EASEINOUTQUAD",
"rightLeg": {
"x": -1.991897,
"y": 12.157447,
"z": 0.059089,
"pitch": 0.005119,
"yaw": 0.188187,
"roll": 0.013892
},
"leftLeg": {
"pitch": -0.015376,
"yaw": -0.018557,
"roll": -0.147605
}
},
{
"tick": 32,
"easing": "EASEINOUTQUAD",
"head": {
"pitch": 0.075163,
"yaw": -0.055531,
"roll": -0.039248
}
},
{
"tick": 36,
"easing": "EASEINOUTQUAD",
"leftArm": {
"x": 5.232738,
"y": 2.536962,
"z": 0.337457,
"pitch": -0.123332,
"yaw": -0.017768,
"roll": -0.198156
}
},
{
"tick": 37,
"easing": "EASEINOUTQUAD",
"rightArm": {
"pitch": -2.802795,
"yaw": 1.020531,
"roll": -0.376307
}
},
{
"tick": 39,
"easing": "EASEINOUTQUAD",
"body": {
"pitch": 0.01081,
"yaw": -0.089193,
"roll": 0.004038
}
},
{
"tick": 41,
"easing": "EASEINOUTQUAD",
"head": {
"pitch": 0.10722,
"yaw": -0.023033,
"roll": 0.072739
}
},
{
"tick": 44,
"easing": "EASEINOUTQUAD",
"leftLeg": {
"x": 2.093371,
"y": 12.180333,
"z": -0.403448,
"pitch": 0.017084,
"yaw": -0.010917,
"roll": -0.023916
}
},
{
"tick": 46,
"easing": "EASEINOUTQUAD",
"leftArm": {
"x": 5.094209,
"y": 2.963737,
"z": 0.290066,
"pitch": -0.130177,
"yaw": 0.00407,
"roll": -0.014502
}
},
{
"tick": 49,
"easing": "EASEINOUTQUAD",
"body": {
"pitch": -0.035429,
"yaw": -0.084483,
"roll": 0.015859
}
},
{
"tick": 56,
"easing": "EASEINOUTQUAD",
"head": {
"x": 0.0,
"y": 0.0,
"z": 0.0,
"pitch": 0.0,
"yaw": 0.0,
"roll": 0.0
}
},
{
"tick": 57,
"easing": "EASEINOUTQUAD",
"body": {
"pitch": 0.015473,
"yaw": -0.095783,
"roll": 0.000252
}
},
{
"tick": 59,
"easing": "EASEINOUTQUAD",
"leftArm": {
"x": 5.211452,
"y": 2.287216,
"z": 0.189115,
"pitch": 0.007903,
"yaw": -0.010692,
"roll": -0.024953
}
},
{
"tick": 60,
"easing": "EASEINOUTQUAD",
"rightArm": {
"x": -5.0,
"y": 2.0,
"z": 0.0,
"pitch": 0.093257,
"yaw": 0.058088,
"roll": 0.082813
}
},
{
"tick": 68,
"easing": "EASEINOUTQUAD",
"rightArm": {
"x": -5.0,
"y": 2.0,
"z": 0.0,
"pitch": 0.0,
"yaw": 0.0,
"roll": 0.0
},
"rightLeg": {
"x": -1.9,
"y": 12.0,
"z": 0.1,
"pitch": 0.000513,
"yaw": 0.10914,
"roll": -0.004835
},
"leftLeg": {
"x": 1.9,
"y": 12.0,
"z": -0.1,
"pitch": 0.000177,
"yaw": -0.167171,
"roll": -0.002612
}
},
{
"tick": 72,
"easing": "EASEINOUTQUAD",
"leftArm": {
"x": 5.0,
"y": 2.0,
"z": 0.0,
"pitch": 0.053822,
"yaw": -0.009281,
"roll": -0.012456
}
},
{
"tick": 77,
"easing": "EASEINOUTQUAD",
"leftLeg": {
"x": 1.9,
"y": 12.0,
"z": -0.1,
"pitch": 0.0,
"yaw": 0.0,
"roll": 0.0
}
},
{
"tick": 78,
"easing": "EASEINOUTQUAD",
"leftArm": {
"x": 5.0,
"y": 2.0,
"z": 0.0,
"pitch": 0.0,
"yaw": 0.0,
"roll": 0.0
}
},
{
"tick": 80,
"easing": "EASEINOUTQUAD",
"rightLeg": {
"x": -1.9,
"y": 12.0,
"z": 0.1,
"pitch": 0.0,
"yaw": 0.0,
"roll": 0.0
}
}
]
}
}